Merge branch 'master' of https://github.com/Raibaz/sigma.js into devel

jacomyal · jacomyal · commit ebc05e1a9c50 · 2012-03-27T21:17:45.000+02:00
diff --git a/plugins/sigma.parseGexf.js b/plugins/sigma.parseGexf.js
@@ -131,6 +131,7 @@ 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 attvalueNodes = edgeNode.getElementsByTagName('attvalue');
       for(k=0; k<attvalueNodes.length; k++){
@@ -140,7 +141,7 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {
         edge.attributes.push({attr:attr, val:val});
       }
 
-      sigmaInstance.addEdge(edgeId++,source,target,edge);
+      sigmaInstance.addEdge(edgeId++,source,target,edge,weight_val);
     }
   }
 };
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) {
+  function addEdge(id, source, target, params, weight) {
     if (self.edgesIndex[id]) {
       throw new Error('Edge "' + id + '" already exists.');
     }
@@ -238,16 +238,21 @@ 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': 1,
+      'weight': weight,
       'displaySize': 0.5,
       'label': id.toString(),
       'id': id.toString(),
-      'attr': {}
+      'attr': {},
+      'hidden': false
     };
 
     e['source']['degree']++;
@@ -261,6 +266,9 @@ function Graph() {
         case 'source':
         case 'target':
           break;
+        case 'hidden':          
+          e[k] = !!params[k];
+          break;
         case 'size':
           e[k] = +params[k];
           break;
@@ -328,6 +336,9 @@ function Graph() {
         case 'target':
           edge[k] = self.nodesIndex[k] || edge[k];
           break;
+        case 'hidden':
+          edge[k] = !!copy[k];
+          break;
         case 'color':
         case 'label':
         case 'type':
diff --git a/src/core/plotter.js b/src/core/plotter.js
@@ -207,9 +207,11 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
     var s, t, i = 0;
 
     while (i++< self.p.edgesSpeed && self.currentEdgeIndex < c) {
-      s = graph.edges[self.currentEdgeIndex]['source'];
-      t = graph.edges[self.currentEdgeIndex]['target'];
-      if (s['hidden'] ||
+      e = graph.edges[self.currentEdgeIndex];      
+      s = e['source'];
+      t = e['target'];            
+      if (e['hidden'] ||
+          s['hidden'] ||
           t['hidden'] ||
           (!self.isOnScreen(s) && !self.isOnScreen(t))) {
         self.currentEdgeIndex++;
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) {
-    s.graph.addEdge(id, source, target, params);
+  this.addEdge = function(id, source, target, params, weight) {
+    s.graph.addEdge(id, source, target, params, weight);
     return self;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {`
`131`	`131`	`var source = edgeNode.getAttribute('source');`
`132`	`132`	`var target = edgeNode.getAttribute('target');`
`133`	`133`	`var label = edgeNode.getAttribute('label');`
	`134`	`+ var weight_val = parseFloat(edgeNode.getAttribute('weight'));`
`134`	`135`	`var edge = {id:j, sourceID:source, targetID:target,label:label, attributes:[]};`
`135`	`136`	`var attvalueNodes = edgeNode.getElementsByTagName('attvalue');`
`136`	`137`	`for(k=0; k<attvalueNodes.length; k++){`
`@@ -140,7 +141,7 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {`
`140`	`141`	`edge.attributes.push({attr:attr, val:val});`
`141`	`142`	`}`
`142`	`143`
`143`		`- sigmaInstance.addEdge(edgeId++,source,target,edge);`
	`144`	`+ sigmaInstance.addEdge(edgeId++,source,target,edge,weight_val);`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`	`};`
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) {`
`128`		`- s.graph.addEdge(id, source, target, params);`
	`127`	`+ this.addEdge = function(id, source, target, params, weight) {`
	`128`	`+ s.graph.addEdge(id, source, target, params, weight);`
`129`	`129`	`return self;`
`130`	`130`	`}`
`131`	`131`