fixed edge weight and adapted Raibaz updates (just restored addEdge publi/private signatures)

jacomyal · jacomyal · commit 8331c7e4eeb0 · 2012-03-27T22:19:11.000+02:00
diff --git a/plugins/sigma.parseGexf.js b/plugins/sigma.parseGexf.js
@@ -131,8 +131,19 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {
       var source = edgeNode.getAttribute('source');
       var target = edgeNode.getAttribute('target');
       var label = edgeNode.getAttribute('label');
-      var weight_val = parseFloat(edgeNode.getAttribute('weight')); 
-      var edge = {id:j, sourceID:source, targetID:target,label:label, attributes:[]};
+      var edge = {
+        id:         j,
+        sourceID:   source,
+        targetID:   target,
+        label:      label,
+        attributes: []
+      };
+
+      var weight = edgeNode.getAttribute('weight');
+      if(weight!=undefined){
+        edge['weight'] = weight;
+      }
+
       var attvalueNodes = edgeNode.getElementsByTagName('attvalue');
       for(k=0; k<attvalueNodes.length; k++){
         var attvalueNode = attvalueNodes[k];
@@ -141,7 +152,7 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {
         edge.attributes.push({attr:attr, val:val});
       }
 
-      sigmaInstance.addEdge(edgeId++,source,target,edge,weight_val);
+      sigmaInstance.addEdge(edgeId++,source,target,edge);
     }
   }
 };
diff --git a/src/core/graph.js b/src/core/graph.js
@@ -223,7 +223,7 @@ function Graph() {
    *                        of the edge.
    * @return {Graph} Returns itself.
    */
-  function addEdge(id, source, target, params, weight) {
+  function addEdge(id, source, target, params) {
     if (self.edgesIndex[id]) {
       throw new Error('Edge "' + id + '" already exists.');
     }
@@ -238,21 +238,17 @@ function Graph() {
       throw new Error(s);
     }
 
-    if(!weight) {
-      weight = 1;
-    }
-
     params = params || {};
     var e = {
       'source': self.nodesIndex[source],
       'target': self.nodesIndex[target],
       'size': 1,
-      'weight': weight,
+      'weight': 1,
       'displaySize': 0.5,
       'label': id.toString(),
       'id': id.toString(),
-      'attr': {},
-      'hidden': false
+      'hidden': false,
+      'attr': {}
     };
 
     e['source']['degree']++;
@@ -266,10 +262,11 @@ function Graph() {
         case 'source':
         case 'target':
           break;
-        case 'hidden':          
+        case 'hidden':
           e[k] = !!params[k];
           break;
         case 'size':
+        case 'weight':
           e[k] = +params[k];
           break;
         case 'color':
@@ -307,6 +304,7 @@ function Graph() {
       'weight': edge['weight'],
       'displaySize': edge['displaySize'],
       'label': edge['label'],
+      'hidden': edge['hidden'],
       'id': edge['id'],
       'attr': edge['attr'],
       'color': edge['color']
@@ -326,9 +324,9 @@ function Graph() {
     for (var k in copy) {
       switch (k) {
         case 'id':
-        case 'weight':
         case 'displaySize':
           break;
+        case 'weight':
         case 'size':
           edge[k] = +copy[k];
           break;
diff --git a/src/core/plotter.js b/src/core/plotter.js
@@ -207,9 +207,9 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
     var s, t, i = 0;
 
     while (i++< self.p.edgesSpeed && self.currentEdgeIndex < c) {
-      e = graph.edges[self.currentEdgeIndex];      
+      e = graph.edges[self.currentEdgeIndex];
       s = e['source'];
-      t = e['target'];            
+      t = e['target'];
       if (e['hidden'] ||
           s['hidden'] ||
           t['hidden'] ||
diff --git a/src/core/sigmapublic.js b/src/core/sigmapublic.js
@@ -124,8 +124,8 @@ function SigmaPublic(sigmaInstance) {
     return self;
   };
 
-  this.addEdge = function(id, source, target, params, weight) {
-    s.graph.addEdge(id, source, target, params, weight);
+  this.addEdge = function(id, source, target, params) {
+    s.graph.addEdge(id, source, target, params);
     return self;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,8 @@ function SigmaPublic(sigmaInstance) {`
`124`	`124`	`return self;`
`125`	`125`	`};`
`126`	`126`
`127`		`- this.addEdge = function(id, source, target, params, weight) {`
`128`		`- s.graph.addEdge(id, source, target, params, weight);`
	`127`	`+ this.addEdge = function(id, source, target, params) {`
	`128`	`+ s.graph.addEdge(id, source, target, params);`
`129`	`129`	`return self;`
`130`	`130`	`}`
`131`	`131`