Revize 0111d95d

sideBar correct save and load from database

- distribution of groups and vertices
- neighbors symbol save and load

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

@@ -23 +23 @@
 
 	var pan = false;
 	var excluded = false;
+    var iconsDisplayed = false;
 
 	var highlighted = false;
 	var highlightedRequiredNeighbours = false;
@@ -264 +265 @@
 		}
 	};
 
+    /**
+     * @returns {boolean} true if icon in all neighbours should be displayed, false otherwise
+     */
+    this.isIconsDisplayed = function () {
+        return iconsDisplayed;
+    };
+
 	/**
 	 * @returns true if the group is currently highlighted (in any way), otherwise false
 	 */
@@ -379 +387 @@
 	};
 
 	/**
-	 * Excludes the group from the viewport. Removes group DOM element and hides its edges.
+	 * Excludes the group from the viewport. Removes group DOM element and hides its edges. If showIcon is set to True
+     * display icon in all neighbour vertices.
+     * @param {boolean} showIcon True to display icon in all neighbours, False otherwise
 	 */
-	this.exclude = function() {
+	this.exclude = function(showIcon) {
 		this.setExcluded(true);
 		this.remove(true);
 
 		app.viewportComponent.removeGroup(this);
+
+        if(showIcon){
+            //showIconClick.bind(this)(null) // TODO implement
+        }
 	};
 
 	/**
@@ -466 +480 @@
 			id: this.id,
 			name: this.name,
 			verticesId: verticesId,
-			verticesEdgeFromId: [],	// TODO: what to put in here?
-			verticesEdgeToId: [],	// TODO: what to put in here?
+			verticesEdgeFromId: [],	// TODO: what to put in here? ids of vertices which outgoing edges are visible in graph
+			verticesEdgeToId: [],	// TODO: what to put in here? ids of vertices which incoming edges are visible in graph
 			position: position,
 		};
 	};

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

@@ -256 +256 @@
 		}
 	};
 
+    /**
+     * @returns {boolean} true if icon in all neighbours should be displayed, false otherwise
+     */
+	this.isIconsDisplayed = function () {
+		return iconsDisplayed;
+    };
+
+
 	/**
 	 * @returns true if the vertex is currently highlighted (in any way), otherwise false
 	 */
@@ -381 +389 @@
 	};
 
 	/**
-	 * Excludes the vertex from the viewport. Removes vertex DOM element and hides its edges.
+	 * Excludes the vertex from the viewport. Removes vertex DOM element and hides its edges. If showIcon is set to True
+	 * display icon in all neighbour vertices.
+	 * @param {boolean} showIcon True to display icon in all neighbours, False otherwise
 	 */
-	this.exclude = function() {
+	this.exclude = function(showIcon = false) {
 		this.setExcluded(true);
 		this.remove(true);
 
 		app.viewportComponent.removeVertex(this);
+
+		if(showIcon){
+			showIconClick.bind(this)(null)
+		}
 	};
 
 	/**
@@ -747 +761 @@
 			return !edge.getFrom().isExcluded();
 		}).forEach(function(edge) {
 			if(!neighbourList.includes(edge.getFrom())) {
-                neighbourList.push(edge.getFrom());
-            }
+				neighbourList.push(edge.getFrom());
+			}
 		});
 
 		outEdgeList.filter(function(edge) {
 			return !edge.getTo().isExcluded();
 		}).forEach(function(edge) {
 			if(!neighbourList.includes(edge.getTo())) {
-                neighbourList.push(edge.getTo());
-            }
+				neighbourList.push(edge.getTo());
+			}
 		});
 
 		neighbourList.forEach(function(node) {

sources/src/main/webapp/js/graphExporter.js

@@ -26 +26 @@
 		var excludedNodeList = app.sidebarComponent.excludedNodeListComponent.getNodeList();
 		var sideBar = excludedNodeList.map(function(node) {
 			return {
-				id: node.id,
-				isHighlighted: node.isHighlighted(),
+				id: app.utils.getUniqueId(node),
+				isHighlighted: node.isIconsDisplayed(),
 			};
 		});
 

sources/src/main/webapp/js/graphLoader.js

@@ -99 +99 @@
 			});
 
 			// position
-			var position = component.position
+			var position = component.position;
 			if (position === null || app.utils.isUndefined(position)) {
                 // set random
                 group.setPosition(new Coordinates(
@@ -119 +119 @@
 
 		// exclude nodes
 		data.sideBar.forEach(function(excludedNode) {
+            if(typeof excludedNode.id !== 'string' && !(excludedNode.id instanceof String)) {
+            	return;
+            }
+            var idArr = excludedNode.id.split("-");
+            if(idArr.length !== 2){
+				return;
+            }
+            idArr[1] = parseInt(idArr[1], 10);
+
 			var node = app.nodeList.find(function(node) {
-				return node.id === excludedNode.id;
+				var prefix = '';
+				if (node instanceof Vertex) {
+					prefix = 'vertex';
+				} else if (node instanceof Group) {
+					prefix = 'group';
+				}
+				return idArr[0] === prefix && node.id === idArr[1];
 			});
 
 			if (app.utils.isDefined(node)) {
-				node.exclude();
+				node.exclude(excludedNode.isHighlighted);
 
 				app.sidebarComponent.excludedNodeListComponent.add(node);
 			}