both edge filters ok

php/PySQlite/extractData.py

@@ -773,7 +773,7 @@ class extract:
 		edge["t"] = n[1]
 		edge["w"] = str(wr)
 		edge["type"] = GG[n[0]][n[1]]['type']
-		if edge["type"]=="nodes1": print wr
+#		if edge["type"]=="nodes1": print wr
 		edges[str(e)] = edge
 		e+=1
 		#if e%1000 == 0:

settings_explorerjs.js

@@ -30,6 +30,7 @@ var startingNodeId = "1";
 var minLengthAutoComplete = 1;
 var maxSearchResults = 10;
 var strSearchBar = "Search";
+
 var cursor_size_min= 0;
 var cursor_size= 0;
 var cursor_size_max= 100;
@@ -52,6 +53,7 @@ var seed=999999999;//defaultseed
 
 
 var showLabelsIfZoom=2.0;
+var greyColor = "#9b9e9e";
 
 // ============ < SIGMA.JS PROPERTIES > ============
 
@@ -113,7 +115,10 @@ var constantNGramFilter;
 // var nodeFilterB_past = ""
 // var nodeFilterB_now = ""
 
-var lastEdgeFilterA = "-"
+var lastFilter = []
+    lastFilter["#sliderBNodeWeight"] = "-"
+    lastFilter["#sliderAEdgeWeight"] = "-"
+    lastFilter["#sliderBEdgeWeight"] = "-"
 
 // var edgeFilterB_past = ""
 // var edgeFilterB_now = ""

tinawebJS/js/main.js

@@ -34,6 +34,7 @@ if (mainfile) {
     if(isUndef(getUrlParam.nodeidparam)) {
         pr("doing something 'cause i'm a doer"); mainfile=true;
 	    bringTheNoise("data/pkmn_types.gexf","mono");
+        scanCategories();
     } else {
 
 	    if(getUrlParam.nodeidparam.indexOf("__")===-1){
@@ -202,8 +203,6 @@ function bringTheNoise(pathfile,type){
         // < === DATA EXTRACTED!! === >
 
                             if(fa2enabled==="off") $("#edgesButton").hide();
-                            // updateEdgeFilter("social");
-                            // updateNodeFilter("social");
                             pushSWClick("social");
 
         // < === ASYNCHRONOUS FA2.JS === >
@@ -362,7 +361,7 @@ function theListeners(){
     });
     /******************* /SEARCH ***********************/
 
-    
+    // button CENTER
     $("#lensButton").click(function () {
         partialGraph.position(0,0,1);
         partialGraph.zoomTo(partialGraph._core.width / 2, partialGraph._core.height / 2, 0.8);
@@ -462,7 +461,10 @@ function theListeners(){
         }
     });
     
-    //finished
+
+
+    //  finished but not used
+    //  NodeWeightFilter ( "#sliderANodeWeight" ,  "Document" , "type" , "size")
     $("#sliderANodeWeight").freshslider({
         range: true,
         step:1,
@@ -473,59 +475,10 @@ function theListeners(){
         }
     });
 
+    //  finished
+    EdgeWeightFilter("#sliderAEdgeWeight", "label" , "nodes1", "weight");
 
 
-
-
-
-
-
-    var filterparams = OrganizeEdgeWeightsForSlider ( "nodes1" ) 
-    var steps = filterparams["steps"]
-    var finalarray = filterparams["finalarray"]
-    //finished
-    $("#sliderAEdgeWeight").freshslider({
-        range: true,
-        step: 1,
-        min:0,
-        max:steps-1,
-        onchange:function(low, high){    
-            var filtervalue = low+"-"+high
-            // pr("filterNOW: "+filtervalue+" | filterPAST: "+lastEdgeFilterA+"  => "+(filtervalue!=lastEdgeFilterA))
-            if(filtervalue!=lastEdgeFilterA) {
-                if(lastEdgeFilterA=="-") {
-                    pushEdgesFilterA(filtervalue)
-                    return false
-                }
-                // $.doTimeout(300,function (){
-
-                for(var i in finalarray) {
-                    ids = finalarray[i]
-                    if(i>=low && i<=high){
-                        for(var id in ids) {
-                            edgeid = ids[id]
-                            add1Edge(edgeid)
-                            // partialGraph.addEdge(edgeid,Edges[edgeid].source,target,edge);
-
-                            // unHideElem(edgeid)
-                        }
-                    } else {
-                        for(var id in ids) {
-                            edgeid = ids[id]
-                            remove1Edge(edgeid)
-                            // hideElem(edgeid)
-                        }
-                    }
-                }
-                pushEdgesFilterA(filtervalue)
-                partialGraph.refresh()
-                partialGraph.draw()
-                // });
-            }
-            // pr("filterNOW: "+filtervalue+" | filterPAST: "+lastEdgeFilterA+"  => "+(filtervalue!=lastEdgeFilterA))
-        }
-    });
-
     //finished
     $("#sliderANodeSize").freshslider({
         step:1,
@@ -542,26 +495,8 @@ function theListeners(){
                    partialGraph.draw();
             });
         }
-    });
-    
-    $("#sliderBNodeWeight").freshslider({
-        range: true,
-        step:1,
-        value:[20, 60],
-        onchange:function(low, high){
-            console.log(low, high);
-        }
-    });
+    }); 
 
-    $("#sliderBEdgeWeight").freshslider({
-        range: true,
-        step:1,
-        value:[20, 100],
-        onchange:function(low, high){
-            console.log(low, high);
-        }
-    });
-    
     //finished
     $("#sliderBNodeSize").freshslider({
         step:1,
@@ -578,7 +513,13 @@ function theListeners(){
                    partialGraph.draw();
             });
         }
-    });
+    }); 
+
+
+    //NodeWeightFilter ( "#sliderBNodeWeight" ,  "NGram" , "type" , "size") 
+
+    // EdgeWeightFilter("#sliderBEdgeWeight", "label" , "nodes2", "weight");
+    
     
     //finished
     $("#unranged-value").freshslider({
@@ -594,54 +535,5 @@ function theListeners(){
     });
 
 
-
-    //    $("#sliderSelectionZone").slider({
-    //        value: cursor_size,
-    //        min: parseFloat(cursor_size_min),
-    //        max: parseFloat(cursor_size_max),
-    //        animate: true,
-    //        change: function(event, ui) {
-    //            cursor_size= ui.value;
-    //            //if(cursor_size==0) updateDownNodeEvent(false);
-    //            //else updateDownNodeEvent(true); 
-    //        //return callSlider("#sliderSelectionZone", "selectionRadius");
-    //        }
-    //    });
-
-
-    //   
-    //    $("#sliderANodeSize").slider({
-    //        value: 1,
-    //        min: 1,
-    //        max: 25,
-    //        animate: true,
-    //        slide: function(event, ui) {
-    //            $.doTimeout(100,function (){
-    //                partialGraph.iterNodes(function (n) {
-    //                    pr();
-    //                    if(Nodes[n.id].type==catSoc) {
-    //                        n.size = parseFloat(Nodes[n.id].size) + parseFloat((ui.value-1))*0.3;
-    //                    }
-    //                });
-    //                partialGraph.draw();
-    //            });
-    //        }
-    //    });
-    //    $("#sliderBNodeSize").slider({
-    //        value: 1,
-    //        min: 1,
-    //        max: 25,
-    //        animate: true,
-    //        slide: function(event, ui) {
-    //            $.doTimeout(100,function (){
-    //                partialGraph.iterNodes(function (n) {
-    //                    if(Nodes[n.id].type==catSem) {
-    //                        n.size = parseFloat(Nodes[n.id].size) + parseFloat((ui.value-1))*0.3;
-    //                    }
-    //                });
-    //                partialGraph.draw();
-    //            });
-    //        }
-    //    });
 }
 

tinawebJS/js/sigma.min.js

@@ -1137,7 +1137,8 @@ sigma.classes.Cascade = function() {
          */
         function addEdge(id, source, target, params) {
             if (self.edgesIndex[id]) {
-            //console.log('Edge "' + id + '" already exists.');
+                //console.log('Edge "' + id + '" already exists.');
+                return;
             }
 
             if (!self.nodesIndex[source]) {
@@ -1150,7 +1151,8 @@ sigma.classes.Cascade = function() {
                 throw new Error(s);
             }
               
-            var ident = params.sourceID.charAt(0)+params.targetID.charAt(0); 
+            // var ident = params.sourceID.charAt(0)+params.targetID.charAt(0);
+ 
             var color;
             //pr(params.label);
             if(params.label=="nodes1") {
@@ -1161,13 +1163,13 @@ sigma.classes.Cascade = function() {
             }
             if(params.label=="bipartite") {
                 color = "#7e9bc2";
-            }            
+            }
+
             params = params || {};
             var e = {
                 'source': self.nodesIndex[source],
                 'target': self.nodesIndex[target],
                 'size': 1,
-                'dead':false,
                 'weight': 1,
                 'displaySize': 0.5,
                 'color': color,
@@ -1184,7 +1186,6 @@ sigma.classes.Cascade = function() {
             for (var k in params) {
                 switch (k) {
                     case 'id':
-                    case 'dead':
                     case 'source':
                     case 'target':
                         break;
@@ -1209,6 +1210,18 @@ sigma.classes.Cascade = function() {
                         e['attr'][k] = params[k];
                 }
             }
+
+            // var colS = self.nodesIndex[source].color
+            // var colT = self.nodesIndex[target].color
+
+            // e.attr['true_color'] = color
+            // e.attr['grey'] = 0
+            // // if node source and target are inactive, grey edge
+            // if ( colS==greyColor || colT==greyColor ) {
+            //     e.attr['grey'] = 1
+            //     e.color = greyColor
+            // }
+
             self.edges.push(e);
             self.edgesIndex[id.toString()] = e;
 
@@ -1228,7 +1241,6 @@ sigma.classes.Cascade = function() {
                 'size': edge['size'],
                 'type': edge['type'],
                 'weight': edge['weight'],
-                'dead' : edge['dead'],
                 'displaySize': edge['displaySize'],
                 'label': edge['label'],
                 'hidden': edge['hidden'],
@@ -1251,7 +1263,6 @@ sigma.classes.Cascade = function() {
             for (var k in copy) {
                 switch (k) {
                     case 'id':
-                    case 'dead':
                     case 'displaySize':
                         break;
                     case 'weight':
@@ -2379,7 +2390,7 @@ sigma.classes.Cascade = function() {
                 case 'curve':
                     ctx.strokeStyle = color;
                     if(overNodes==false) {
-                        if(color == '#9b9e9e') {
+                        if(color == greyColor) {
                             ctx.lineWidth = edge['displaySize'] / 16;
                         }
                         else {
@@ -2387,7 +2398,7 @@ sigma.classes.Cascade = function() {
                         }                        
                     }
                     else {
-                        if(color == '#9b9e9e') {
+                        if(color == greyColor) {
                             ctx.lineWidth = edge['displaySize'] / 16;
                         }
                         else {

tinawebJS/js/sigma.parseCustom.js

@@ -647,6 +647,7 @@ function extractFromJson(data,seed){
             partialGraph.addNode(i,Nodes[i]);  
             unHide(i);
         }
+        // pr(Nodes[i])
     }
     
     var edgeId = 0;