implicit-clusters experiment

tinawebJS/enviroment.js

@@ -279,8 +279,8 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type ,  criteria) {
                                             sid = Edges[ID].sourceID
                                             tid = Edges[ID].targetID
                                             if (sid==n || tid==n) {
-                                                if(isUndef(getn(sid))  && !Nodes[sid].hidden ) unHide(sid)
-                                                if(isUndef(getn(tid))  && !Nodes[tid].hidden ) unHide(tid)
+                                                if(isUndef(getn(sid))) unHide(sid)
+                                                if(isUndef(getn(tid))) unHide(tid)
                                                 add1Edge(ID)
                                                 // pr("\tADD "+ID)
                                             }
@@ -399,7 +399,7 @@ function NodeWeightFilter(sliderDivID , type_attrb , type ,  criteria) {
                         for(var id in ids) {
                             ID = ids[id]
                             Nodes[ID].lock = false;
-                            if(partialGraph._core.graph.nodesIndex[ID] && !Nodes[ID].hidden)
+                            if(partialGraph._core.graph.nodesIndex[ID])
                                 partialGraph._core.graph.nodesIndex[ID].hidden = false;
                         }
                     } else {

tinawebJS/methods.js

@@ -1426,19 +1426,20 @@ function unHide(id){
         //visibleEdges.push(id);
         if(!isUndef(gete(id))) return;
         if(Edges[id] && !Edges[id].lock){
-            if (!Nodes[Edges[id].sourceID].hidden && !Nodes[Edges[id].targetID].hidden) {
+            //if (!Nodes[Edges[id].sourceID].hidden && !Nodes[Edges[id].targetID].hidden) {
                 var anedge = {
                     id:         id,
                     sourceID:   Edges[id].sourceID,
                     targetID:   Edges[id].targetID,
                     lock : false,
+                    iscluster: (!Nodes[Edges[id].sourceID].iscluster && !Nodes[Edges[id].targetID].iscluster)?false:true ,
                     label:      Edges[id].label,
                     weight: (swMacro && (iwantograph=="sociosemantic"))?Edges[id].bweight:Edges[id].weight
                 };
 
             	partialGraph.addEdge(id , anedge.sourceID , anedge.targetID , anedge);
                 return;
-            }
+            //}
         }
     }
 }

tinawebJS/sigma.parseCustom.js

@@ -669,8 +669,8 @@ function parseSimpleJSON( data , seed ) {
         label = (isUndef(nodesNodes[i].label)) ? ("node_"+i): nodesNodes[i].label;
         size = (isUndef(nodesNodes[i].size))?1:nodesNodes[i].size;
         group = (isUndef(nodesNodes[i].group))?1:nodesNodes[i].group;
-        ishidden = (isUndef(nodesNodes[i].hidden))?false:nodesNodes[i].hidden;
-        if (ishidden==1) ishidden=true;
+        iscluster = (isUndef(nodesNodes[i].hidden))?false:nodesNodes[i].hidden;
+        if (iscluster==1) iscluster=true;
 
         var node = ({
             id: i ,
@@ -682,7 +682,7 @@ function parseSimpleJSON( data , seed ) {
             htmlCont:"",
             group:group,
             color:color,
-            hidden: false
+            iscluster: iscluster
         });  // The graph node
         
         Nodes[i] = node;
@@ -698,7 +698,7 @@ function parseSimpleJSON( data , seed ) {
 
         partialGraph.addNode(i,Nodes[i]); 
 
-        if(!Nodes[i].hidden)
+        if(!Nodes[i].iscluster)
             updateSearchLabels(i,Nodes[i].label,Nodes[i].type);
     }
 
@@ -716,6 +716,7 @@ function parseSimpleJSON( data , seed ) {
                 targetID:   target,
                 lock : false,
                 label:      "",
+                iscluster:(!Nodes[source].iscluster && !Nodes[target].iscluster)?false:true ,
                 weight: (edgesNodes[i].w)?edgesNodes[i].w:1
         };