Changeset 3815 for SMC

Timestamp:

10/19/13 11:10:25 (11 years ago)

Author:

vronk

Message:

added gravity-param and charge considers node size

File:

• SMC/trunk/SMC/src/web/scripts/js/smc-graph.js (modified) (4 diffs)

SMC/trunk/SMC/src/web/scripts/js/smc-graph.js

@@ -57 +57 @@
             "charge":{"value":250, "min":10, "max":1000, "widget":"slider" },
             "friction":{"value":75, "min":1, "max":100, "widget":"slider" },
+            "gravity":{"value":20, "min":1, "max":100, "widget":"slider" },
             "node-size": {"value":"count", "values":["1","4","8","16","count"], "widget":"selectone" },
             "labels": {"value":"show", "values":["show","hide"], "widget":"selectone" },                         
@@ -262 +263 @@
     var filtered_index_nodes = data_all.nodes.filter(function(d, i) { 
      //   console.log(d.name.indexOf(search_string));
-        return d.name.toLowerCase().indexOf(search_string) > -1; 
+        return d.name.toLowerCase().indexOf(search_string.toLowerCase()) > -1; 
     });
     
@@ -323 +324 @@
 
             .friction(parseInt(opt("friction")) / 100 )
-            .linkDistance(parseInt(opt("link-distance")))
-            .gravity(0.5)
+            
+            .gravity(parseInt(opt("gravity")) / 100 )
+            
+/*            .linkDistance(parseInt(opt("link-distance")))*/
+            
+            .linkDistance(function(d){return link_distance / (d.weight * d.value) })
             /* Profiles:           
             
-            .linkDistance(function(d){return link_distance / (d.weight * d.value) })
+            
             .linkStrength(function(d){return d.weight})*/
             //.charge(parseInt(opt("charge")) * -1)
-            .charge(function(d) { if (opt("node-size")=="count")
+          
+          if (parseInt(opt("charge"))==0) {
+            force.charge(0);
+          } else {
+            force.charge(function(d) { if (opt("node-size")=="count")
                             {var node_charge = (Math.sqrt(d.count)<=min_circle) ?  min_circle  : Math.sqrt(d.count) / data.node_size_ratio;
                             //console.log (node_charge + ':' + d.count);
@@ -337 +346 @@
                               //{ return -d.count * parseInt(opt("charge"));  }
                             else { return parseInt(opt("charge")) * -1} })
-            .on("tick", tick)
+          }
+         
+         force.on("tick", tick)
             .start();
+        
         if (opt("layout")=='freeze') {
                data.nodes.forEach(function(d) { d.fixed=true });