Revize b0664c78

move getUniqueId to Utils

sources/src/main/webapp/js/forceDirected.js

@@ -28 +28 @@
 			j = 0;
 
 		for (i = 0; i < visibleNodes.length; i++) {
-			forceField[getId(visibleNodes[i])] = [0, 0];
+			forceField[app.utils.getUniqueId(visibleNodes[i])] = [0, 0];
 		}
 
 		// calculate repulsive force
@@ -56 +56 @@
 				var distance = Math.sqrt(sum);
 
 				if (distance !== 0) {
-					forceField[getId(currNode)][0] += Math.floor(x * (repulsiveStrength / distance));
-					forceField[getId(currNode)][1] += Math.floor(y * (repulsiveStrength / distance));
+					forceField[app.utils.getUniqueId(currNode)][0] += Math.floor(x * (repulsiveStrength / distance));
+					forceField[app.utils.getUniqueId(currNode)][1] += Math.floor(y * (repulsiveStrength / distance));
 				}
 			}
 		}
@@ -79 +79 @@
 				var sum = Math.pow(x, 2) + Math.pow(y, 2);
 				var distance = Math.sqrt(sum);
 
-				forceField[getId(currNode)][0] += Math.round(-1 * x * (distance / attractiveStrength));
-				forceField[getId(currNode)][1] += Math.round(-1 * y * (distance / attractiveStrength));
+				forceField[app.utils.getUniqueId(currNode)][0] += Math.round(-1 * x * (distance / attractiveStrength));
+				forceField[app.utils.getUniqueId(currNode)][1] += Math.round(-1 * y * (distance / attractiveStrength));
 			}
 
 			for (j = 0; j < currNode.getOutEdgeList().length; j++) {
@@ -96 +96 @@
 				var sum = Math.pow(x, 2) + Math.pow(y, 2);
 				var distance = Math.sqrt(sum);
 
-				forceField[getId(currNode)][0] += Math.round(-1 * x * (distance / attractiveStrength));
-				forceField[getId(currNode)][1] += Math.round(-1 * y * (distance / attractiveStrength));
+				forceField[app.utils.getUniqueId(currNode)][0] += Math.round(-1 * x * (distance / attractiveStrength));
+				forceField[app.utils.getUniqueId(currNode)][1] += Math.round(-1 * y * (distance / attractiveStrength));
 			}
 		}
 
@@ -139 +139 @@
 			}
 
 			// force dampening
-			var forceX = Math.floor(forceField[getId(currNode)][0] / dampeningEffect),
-				forceY = Math.floor(forceField[getId(currNode)][1] / dampeningEffect);
+			var forceX = Math.floor(forceField[app.utils.getUniqueId(currNode)][0] / dampeningEffect),
+				forceY = Math.floor(forceField[app.utils.getUniqueId(currNode)][1] / dampeningEffect);
 
 			// adding a random effect
 			/*
@@ -161 +161 @@
 			}
 		}
 	};
-
-	/**
-	 * @param {(Vertex|Group)} node Graph node.
-	 * @returns {string} Unique identifier of a graph node (group or vertex).
-	 */
-	function getId(node) {
-		var prefix;
-		if (node instanceof Vertex) {
-			prefix = 'vertex-';
-		} else if (node instanceof Group) {
-			prefix = 'group-';
-		} else {
-			prefix = '';
-		}
-
-		return prefix + node.id;
-	}
-
 }

sources/src/main/webapp/js/utils/utils.js

@@ -93 +93 @@
 		}
 
 		return false;
-	}
+	};
+
+    /**
+     * @param {(Vertex|Group)} node Graph node.
+     * @returns {string} Unique identifier of a graph node (group or vertex).
+     */
+    this.getUniqueId = function(node) {
+        var prefix;
+        if (node instanceof Vertex) {
+            prefix = 'vertex-';
+        } else if (node instanceof Group) {
+            prefix = 'group-';
+        } else {
+            prefix = '';
+        }
 
+        return prefix + node.id;
+    };
 }