Repository: openmeetings
Updated Branches:
refs/heads/master db57bb0ea -> 601ebd278
[OPENMEETINGS-1642] initial work on WB size
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/601ebd27
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/601ebd27
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/601ebd27
Branch: refs/heads/master
Commit: 601ebd27891cfe726e37f3b9a210fb4c30dbbce3
Parents: db57bb0
Author: Maxim Solodovnik
Authored: Sun Aug 6 00:36:54 2017 +0700
Committer: Maxim Solodovnik
Committed: Sun Aug 6 00:36:54 2017 +0700
--
.../openmeetings/db/dto/room/Whiteboard.java| 53
.../openmeetings/db/entity/file/FileItem.java | 8 +-
.../openmeetings/db/entity/room/Whiteboard.java | 135 ---
.../db/entity/room/WhiteboardItem.java | 72 --
.../org/apache/openmeetings/web/room/room.js| 2 +-
.../openmeetings/web/room/wb/WbPanel.java | 26 +++-
.../org/apache/openmeetings/web/room/wb/wb.js | 11 +-
.../classes/META-INF/db2_persistence.xml| 2 -
.../classes/META-INF/derby_persistence.xml | 2 -
.../classes/META-INF/mssql_persistence.xml | 2 -
.../classes/META-INF/mysql_persistence.xml | 2 -
.../classes/META-INF/oracle_persistence.xml | 2 -
.../classes/META-INF/postgresql_persistence.xml | 2 -
openmeetings-web/src/main/webapp/css/wb.css | 5 +
14 files changed, 69 insertions(+), 255 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/601ebd27/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
--
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 5c3e818..9919d44 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -35,11 +35,13 @@ import com.github.openjson.JSONObject;
public class Whiteboard implements Serializable {
private static final long serialVersionUID = 1L;
public static final String ITEMS_KEY = "roomItems";
+ private static final int DEFAULT_WIDTH = 1920;
+ private static final int DEFAULT_HEIGHT = 1080;
private long id;
- private Integer x = 0;
- private Integer y = 0;
- private Integer zoom = 100;
- private Boolean fullFit = true;
+ private double zoom = 1.;
+ private boolean fullFit = true;
+ private int width = DEFAULT_WIDTH;
+ private int height = DEFAULT_HEIGHT;
private Map roomItems = Collections.synchronizedMap(new
LinkedHashMap<>());
private Date created = new Date();
private int slide = 0;
@@ -49,6 +51,7 @@ public class Whiteboard implements Serializable {
public Whiteboard(String name) {
this.name = name;
+ this.created = new Date();
}
public long getId() {
@@ -59,22 +62,6 @@ public class Whiteboard implements Serializable {
this.id = id;
}
- public Integer getX() {
- return x;
- }
-
- public void setX(Integer x) {
- this.x = x;
- }
-
- public Integer getY() {
- return y;
- }
-
- public void setY(Integer y) {
- this.y = y;
- }
-
public Date getCreated() {
return created;
}
@@ -83,24 +70,26 @@ public class Whiteboard implements Serializable {
this.created = created;
}
- public Integer getZoom() {
+ public double getZoom() {
return zoom;
}
- public void setZoom(Integer zoom) {
+ public void setZoom(double zoom) {
this.zoom = zoom;
}
- public Boolean getFullFit() {
+ public boolean getFullFit() {
return fullFit;
}
- public void setFullFit(Boolean fullFit) {
+ public void setFullFit(boolean fullFit) {
this.fullFit = fullFit;
}
public void clear() {
roomItems.clear();
+ width = DEFAULT_WIDTH;
+ height = DEFAULT_HEIGHT;
}
public void put(String uid, JSONObject obj) {
@@ -159,6 +148,22 @@ public class Whiteboard implements Serializable {
this.slide = slide;
}
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getHeight() {
+
