Revize 88f8fe07

Group search

sources/src/main/webapp/css/main.css

@@ -312 +312 @@
 	stroke-width: 1;
 }
 
-.viewport .vertex--found > rect {
+.viewport .node--found > rect {
 	fill: orange;
 }
 

sources/src/main/webapp/js/app.js

@@ -188 +188 @@
 
 			var found = 0;
 			
-			var vertexList = self.viewportComponent.getVertexList();
-			vertexList.forEach(function(vertex) {
-				if (!vertex.name.toLowerCase().includes(term.toLowerCase())) {
-					vertex.setFound(false);
-					return;
-				}
+			var nodeList = self.viewportComponent.getNodeList();
+			nodeList.forEach(function(node) {
+				if (!node.name.toLowerCase().includes(term.toLowerCase())) {
+					node.setFound(false);
 
-				found++;
+				} else {
+					node.setFound(true);
 
-				vertex.setFound(true);
+					found++;
+				}
 			});
 			
 			document.getElementById('countOfFound').innerText = found;
 		}
 
 		function resetSearch(e) {
-			var vertexList = self.viewportComponent.getVertexList();
-			vertexList.forEach(function(vertex) {
-				vertex.setFound(false);
+			var nodeList = self.viewportComponent.getNodeList();
+			nodeList.forEach(function(node) {
+				node.setFound(false);
 			});
 
 			document.getElementById('searchText').value = '';

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

@@ -25 +25 @@
 
 	var pan = false;
 	var excluded = false;
-	var dimmed = false;
+
 	var highlighted = false;
 	var highlightedRequired = false;
 	var highlightedProvided = false;
 	var highlightedRequiredNeighbours = false;
 	var highlightedProvidedNeighbours = false;
+	var found = false;
+	var dimmed = false;
 
 	var vertexList = [];
 
@@ -215 +217 @@
 		}, this);
 	};
 
+	/**
+	 * Sets the group as found. Highlighting is skipped when the group is excluded.
+	 * @param {boolean} newValue True to mark the group as found, otherwise false.
+	 */
+	this.setFound = function(newValue) {
+		found = newValue;
+
+		if (excluded) return;
+		
+		if (newValue) {
+			rootElement.classList.add('node--found');
+		} else {
+			rootElement.classList.remove('node--found');
+		}
+	};
+
 	/**
 	 * Toggles transparency of the group.
 	 * @param {boolean} newValue True to set the group semitransparent, false to display it normally.

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

@@ -26 +26 @@
 
 	var pan = false;
 	var excluded = false;
-	var found = false;
-	var dimmed = false;
+	var iconsDisplayed = false;
+
 	var highlighted = false;
 	var highlightedRequired = false;
 	var highlightedProvided = false;
 	var highlightedRequiredNeighbours = false;
 	var highlightedProvidedNeighbours = false;
-	var iconsDisplayed = false;
+	var found = false;
+	var dimmed = false;
 
 	var inEdgeList = [];
 	var outEdgeList = [];
@@ -195 +196 @@
 		if (excluded) return;
 		
 		if (newValue) {
-			rootElement.classList.add('vertex--found');
+			rootElement.classList.add('node--found');
 		} else {
-			rootElement.classList.remove('vertex--found');
+			rootElement.classList.remove('node--found');
 		}
 	};