Revize 6fd72b91

symbol display bug fixes

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/UploadFiles.java

@@ -2 +2 @@
 
 import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.storage.FileLoader;
-import cz.zcu.kiv.offscreen.storage.FileManager;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
 

sources/src/main/webapp/js/components/edge.js

@@ -6 +6 @@
 function Edge(props) {
 	/** @prop {integer} id Unique identifier of the edge. */
 	this.id = props.id;
-	/** @prop {integer} archetype Archetype of the edge. TODO: why is there multiple subedgeInfo for one edge? */
-	this.archetype = -1;
 
 	var rootElement;
 

sources/src/main/webapp/js/components/group.js

@@ -48 +48 @@
 			position = vertex.getPosition();
 		}
 
+		var isIconShown = this.isIconsDisplayed();
+		if(isIconShown) showIconClick.bind(this)(null);
+
+		vertex.removeIcon();
 		vertex.setGroup(this);
 		vertex.setExcluded(this.isExcluded());
 		vertex.remove(this.isExcluded());	// edges of the vertex should be removed from DOM only if group is excluded
@@ -84 +88 @@
 		}
 
 		vertexList.push(vertex);
+        if(isIconShown) showIconClick.bind(this)(null);
 	};
 
 	/**
@@ -408 +413 @@
 	this.include = function() {
 		this.removeFromSidebarList();
 
-		this.setExcluded(false);
-		this.remove(false);
-
         if(iconsDisplayed) {
             showIconClick.bind(this)(null);
         }
+        	
+        this.setExcluded(false);
+		this.remove(false);
 
 		app.viewportComponent.addGroup(this);
 

sources/src/main/webapp/js/components/vertex.js

@@ -263 +263 @@
 		return iconsDisplayed;
     };
 
+	this.removeIcon = function () {
+		if(iconsDisplayed) {
+			showIconClick.bind(this)(null)
+		}
+    };
 
 	/**
 	 * @returns true if the vertex is currently highlighted (in any way), otherwise false
@@ -410 +415 @@
 	this.include = function() {
 		this.removeFromSidebarList();
 
-		this.setExcluded(false);
+        this.removeIcon();
+        this.setExcluded(false);
         this.remove(false);
 
-        if(iconsDisplayed) {
-            showIconClick.bind(this)(null);
-        }
-
 		app.viewportComponent.addVertex(this);
 
 		// set edges' ends