WIP bi colors in bipa cases

explorerjs.html

@@ -159,8 +159,8 @@
             <li>
                <a>
                 <select id="aselector" onchange="console.log('salut monde')" class="selectpicker"  data-style="btn btn-success btn-sm"  data-width="auto">
-                  <option value="Document" selected>Scholars</option>
-                  <option value="NGram">Keywords</option>
+                  <option value="Scholars" selected>Scholars</option>
+                  <option value="Keywords">Keywords</option>
                 </select>
                </a>
             </li>
@@ -430,9 +430,9 @@
         </div><!-- /row -->
       </div>
 
-
-      <!-- class="my-legend" (absolute position bottom left) -->
-      <div id="legend-for-clusters" class="over-panels"></div>
+      <!-- attributes' legends (absolute position bottom left)
+           (contains one div of class "my-legend" per colored nodetype) -->
+      <div id="legend-for-facets" class="over-panels"></div>
 
       <!-- to reopen the panel -->
       <div id="sideunfold">

settings_explorerjs.js

@@ -21,7 +21,7 @@ TW.conf = (function(TW){
 
   // ...or remote bridge to default source api ajax queries
   TWConf.sourceAPI={}
-  TWConf.sourceAPI["nodetypes"] = {"node0": "NGram", "node1": "Document" }
+  TWConf.sourceAPI["nodetypes"] = {"node0": "Keywords", "node1": "Scholars" }
   TWConf.sourceAPI["forNormalQuery"] = "services/api/graph"
   TWConf.sourceAPI["forFilteredQuery"] = "services/api/graph"
 
@@ -114,8 +114,8 @@ TW.conf = (function(TW){
   // =============
 
   // Node typology: categories (resp. 0 and 1) will get these default labels
-  TWConf.catSem = "NGram";
-  TWConf.catSoc = "Document";
+  TWConf.catSem = "Keywords";
+  TWConf.catSoc = "Scholars";
   // NB: these labels may be superseded by:
   //   - the input data's node types values cf. sortNodeTypes()
   //   - in servermenu mode, by the node0 & node1 properties

twlibs/css/selection-panels-mobile.css

@@ -49,8 +49,8 @@
   }
 
   /* legend re-positioned */
-  .my-legend {
-    bottom: calc(40% - 105px);
+  #legend-for-facets {
+    bottom: calc(40% - 100px);
     /* bot just above #sidebar which has top at calc(105px + 60%); */
   }
 
@@ -97,17 +97,20 @@
   }
 
   /* legend reduction */
+  #legend-for-facets {
+    max-width: 25%;
+  }
+
   .my-legend {
-    max-width: 27%;
     max-height: 25%;
-    padding: 0 2px;
     font-size: 85%;
-    margin: 0 0 5px 0;
+    margin: 0;
+    padding: 0 1px 3px 1px;
   }
 
   .my-legend .legend-title {
       margin-bottom: 0;
-      font-size: 90%;
+      font-size: 85%;
    }
   .my-legend .legend-scale ul {
     margin-bottom: 0;

twlibs/css/selection-panels.css

@@ -33,44 +33,55 @@
 }
 
 /* LEGEND PANEL */
-.my-legend {
-    position:fixed;
-    /* width: we set it equal or smaller than #lefttopbox width */
-    max-width:20%;
-    max-height: 30%;
-    padding: 0 5px;
-    overflow-y:scroll;
-    bottom:18px;
+#legend-for-facets {
+  bottom: 10px;
   left:0;
-    border:solid 1px black;
-    background-color:white;
-    opacity: 0.8;
-    color:#250587;
-    margin: 7px;
+  position:fixed;
+  /* width: we set it a bit more than #lefttopbox width */
+  max-width: 20%;
+  max-height: 40%;
   font-size:120%;
   cursor: default;
+  overflow-y:auto;
+  overflow-x: hidden;
+}
+
+.my-legend {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    margin: 0;
+    padding: 0 5px 5px 5px;
+    opacity:1;
+    background-color: white;
+    color:#250587;
+    overflow: hidden;
+    z-index: 5;
 }
 
 .my-legend .legend-title {
     text-align: left;
     margin-bottom: 5px;
     font-weight: bold;
-    font-size: 90%;
-    }
+    font-size: 75%;
+}
+
 .my-legend .legend-scale ul {
   margin: 0;
   margin-bottom: 5px;
   padding: 0;
   float: left;
   list-style: none;
-  }
+}
+
 .my-legend .legend-scale ul li {
   font-size: 80%;
   list-style: none;
   margin-left: 0;
   line-height: 16px;
   margin-bottom: 2px;
-  }
+}
+
 .my-legend ul.legend-labels li span.lgdcol {
   display: block;
   float: left;

twmain/enviroment.js

@@ -23,8 +23,8 @@ TW.gui.checkBox=false;
 TW.gui.shiftKey=false;
 TW.gui.foldedSide=false;
 TW.gui.manuallyChecked = false;
-TW.gui.handpickedcolor = false;     // <= changes edge rendering strategy
-TW.gui.lastFilters = {}
+TW.gui.handpickedcolor = {};        // <= changes rendering, by nodetype
+TW.gui.lastFilters = {}             // <= last values, by slider id
 TW.gui.reldocTabs = [{}, {}]        // <= by nodetype and then dbtype
 
 TW.gui.sizeRatios = [1,1]           // sizeRatios per nodetype
@@ -519,7 +519,7 @@ function changeType(optionaltypeFlag) {
 
 
     // update the gui (POSS could be handled by TW.pushGUIState)
-    TW.gui.handpickedcolor = false
+    TW.gui.handpickedcolor = {}  // <=> none
     updateDynamicFacets()
     changeGraphAppearanceByFacets( getActivetypesNames() )
 

twmain/extras_explorerjs.js

@@ -71,7 +71,7 @@ function changeGraphAppearanceByFacets(actypes) {
     let currentNbNodes = TW.partialGraph.graph.nNodes()
 
     // create colormenu and 1st default entry
-    var color_menu_info = '<li><a href="#" onclick="TW.gui.handpickedcolor = false ; graphResetLabelsAndSizes() ; TW.partialGraph.refresh()">By Default</a></li>';
+    var color_menu_info = '<li><a href="#" onclick="TW.gui.handpickedcolor = {} ; graphResetLabelsAndSizes() ; TW.partialGraph.refresh()">By Default</a></li>';
 
     let gotPreviousLouvain = false
     if( $( "#colorgraph-menu" ).length>0 ) {
@@ -130,7 +130,7 @@ function changeGraphAppearanceByFacets(actypes) {
           }
           else attLabel = attTitle
 
-          color_menu_info += `<li><a href="#" onclick='${colMethod}("${attTitle}")'>By ${attLabel} (${attNbClasses} | ${attNbNodes})</a></li>`
+          color_menu_info += `<li><a href="#" onclick='${colMethod}("${attTitle}","${ty}")'>By ${attLabel} (${attNbClasses} | ${attNbNodes})</a></li>`
         }
 
         // POSS add cumulated degree via TW.partialGraph.graph.degree(nid)
@@ -151,8 +151,8 @@ function changeGraphAppearanceByFacets(actypes) {
 
 }
 
-
-function RunLouvain() {
+// @cb: optional callback
+function RunLouvain(cb) {
 
   var node_realdata = []
   var nodesV = getVisibleNodes()
@@ -216,6 +216,11 @@ function RunLouvain() {
       TW.facetOptions['clust_louvain'] = {'col': 'cluster'}
     }
     // NB the LouvainFait flag is updated by caller fun
+
+    // callback
+    if (cb && typeof cb == 'function') {
+      cb()
+    }
 }
 
 
@@ -269,25 +274,29 @@ function graphResetLabelsAndSizes(){
       n.size = TW.Nodes[n.id].size
     }
   }
-  set_ClustersLegend()
 }
 
+
 // @daclass: the name of a numeric/categorical attribute from node.attributes
+// @forTypes: optional array of which typenames are concerned
 // @groupingTicks: an optional threshold's array expressing ranges with their low/up bounds label and ref to matchin nodeIds
-function set_ClustersLegend ( daclass, groupedByTicks ) {
-    $("#legend-for-clusters").removeClass( "my-legend" )
-    $("#legend-for-clusters").html("")
-    if(daclass==null) return;
+function set_ClustersLegend ( daclass, forTypes, groupedByTicks ) {
 
-    var actypes = getActivetypesNames()
+    // shortcut to erase legends for all types
+    if(daclass == null) {
+      $("#legend-for-facets").html("")
+    };
 
-    // TODO test more for multiple types
-    // we have no specifications yet for colors (and legends) on multiple types
-    if (actypes.length > 1) {
-      console.warn("colors by bins will only color nodes of type 0")
+    // current display among TW.categories (ex: ['terms'])
+    if (typeof forTypes != 'array' || ! forTypes.length) {
+      forTypes = getActivetypesNames().filter(function(ty){
+        return daclass in TW.Facets[ty]
+      })
     }
-    // current display among TW.categories (ex: 'terms')
-    var curType = actypes[0]
+
+    for (var k in forTypes) {
+      let curType = forTypes[k]
+      var LegendDiv = "<div id=legend-for-"+curType+" class=\"over-panels my-legend\">"
 
       // all infos in a bin array
       var legendInfo = []
@@ -297,9 +306,7 @@ function set_ClustersLegend ( daclass, groupedByTicks ) {
 
       // passed as arg   or  prepared in parseCustom
       if (!groupedByTicks && (!TW.Facets[curType] || !TW.Facets[curType][daclass])) {
-      console.warn(`no class bins for ${daclass}, displaying no legend`)
-
-      $("#legend-for-clusters").hide()
+        console.warn(`no class bins for ${curType} ${daclass}`)
       }
       else {
         let daclassLabel = daclass
@@ -308,8 +315,8 @@ function set_ClustersLegend ( daclass, groupedByTicks ) {
           && TW.facetOptions[daclass].legend) {
             daclassLabel = TW.facetOptions[daclass].legend
         }
-      var LegendDiv = ""
-      LegendDiv += `    <div class="legend-title">${daclassLabel}</div>`
+
+        LegendDiv += `    <div class="legend-title">${curType}:${daclassLabel}</div>`
         LegendDiv += '    <div class="legend-scale">'
         LegendDiv += '      <ul class="legend-labels">'
 
@@ -397,11 +404,20 @@ function set_ClustersLegend ( daclass, groupedByTicks ) {
         }
         LegendDiv += '      </ul>'
         LegendDiv += '    </div>'
+        LegendDiv += '  </div>'
 
-      $("#legend-for-clusters").addClass( "my-legend" );
-      $("#legend-for-clusters").html( LegendDiv )
-      $("#legend-for-clusters").show()
+        let perhapsPreviousLegend = document.getElementById("legend-for-"+curType)
+        if (perhapsPreviousLegend) {
+          perhapsPreviousLegend.outerHTML = LegendDiv
+        }
+        else {
+          let newLegend = document.createElement('div')
+          document.getElementById("legend-for-facets").appendChild(newLegend)
+          newLegend.outerHTML = LegendDiv
+        }
+      }
     }
+    $("#legend-for-facets").show()
 }
 
 // = = = = = = = = = = = [ / Clusters Plugin ] = = = = = = = = = = = //

twmain/globalUtils.js

@@ -96,9 +96,11 @@ function isUndef(variable){
 
 function stringToSomeInt (anyString) {
   let charCodeSum = 0
+  if (anyString && anyString.length) {
     for (let i = 0 ; i < anyString.length ; i++) {
       charCodeSum += anyString.charCodeAt(i)
     }
+  }
   return charCodeSum
 }
 

twmain/methods.js

@@ -97,7 +97,7 @@ TW.resetGraph = function() {
 
   // reset rendering gui flags
   TW.gui.selectionActive = false
-  TW.gui.handpickedcolor = false
+  TW.gui.handpickedcolor = {}
 
   // reset circle size and cursor
   TW.gui.circleSize = 0
@@ -734,7 +734,7 @@ function prepareNodesRenderingProperties(nodesDict) {
       // default unselected color
       defgrey_color : "rgba("+rgbStr+","+TW.conf.sigmaJsDrawingProperties.twNodesGreyOpacity+")",
 
-      // will be used for repainting (read when TW.gui.handpickedcolor flag)
+      // will be used for repainting (read when TW.gui.handpickedcolor flags)
       alt_color: null,
       altgrey_color: null,
     }

twmain/sigma.parseCustom.js

@@ -211,8 +211,8 @@ function scanGexf(gexfContent) {
 // ex: terms
 // ex: ISItermsriskV2_140 & ISItermsriskV2_140
 // optional arg optionalNodeConf should contain keys of the form:
-//    "node0": "NGram",
-//    "node1": "Document"
+//    "node0": "Keywords",
+//    "node1": "Scholars"
 //     etc.
 // (it's read from project_conf.json)
 function sortNodeTypes(observedTypesDict, optionalNodeConf) {

twmain/sigmaUtils.js

@@ -118,7 +118,7 @@ var SigmaUtils = function () {
         context.beginPath();
 
         if (settings('twSelectedColor') == "node")
-          context.fillStyle = TW.gui.handpickedcolor? node.customAttrs.alt_color : node.color; // node's
+          context.fillStyle = TW.gui.handpickedcolor[node.type] ? node.customAttrs.alt_color : node.color; // node's
         else
           context.fillStyle = "#fff"; // default
 
@@ -180,7 +180,6 @@ var SigmaUtils = function () {
       var color, size,
         prefix = settings('prefix') || ''
 
-
       //debug
       // console.warn("rendering edge", edge)
 
@@ -188,7 +187,7 @@ var SigmaUtils = function () {
 
       // precomputed color with no opacity
       // cf. sigmaTools.edgeRGB
-      var baseRGB = TW.gui.handpickedcolor ? edge.customAttrs.alt_rgb : edge.customAttrs.rgb
+      var baseRGB = edge.customAttrs.useAltColor ? edge.customAttrs.alt_rgb : edge.customAttrs.rgb
 
       if (edge.customAttrs.activeEdge) {
         size = (defSize * 2) + 1
@@ -291,7 +290,7 @@ var SigmaUtils = function () {
 
 
         // mode variants 1: if a coloringFunction is active
-        if (! TW.gui.handpickedcolor) {
+        if (! TW.gui.handpickedcolor[node.type]) {
           nodeColor = node.color
         }
         else {
@@ -301,7 +300,6 @@ var SigmaUtils = function () {
         // mode variants 2: if node is selected, highlighted or unselected
         if (TW.gui.selectionActive) {
 
-
           // the selected node(s)
           if (node.customAttrs.active) {
             // called by label+background overlay cf. "subcall"
@@ -317,7 +315,7 @@ var SigmaUtils = function () {
           // passive nodes should blend in the grey of twEdgeGreyColor
           // cf settings_explorerjs, defgrey_color and deselectNodes()
           else {
-            if (! TW.gui.handpickedcolor) {
+            if (! TW.gui.handpickedcolor[node.type]) {
               nodeColor = node.customAttrs.defgrey_color
             }
             else {
@@ -656,11 +654,15 @@ function edgeInfos(anEdge) {
 }
 
 
+// FIXME this function could be optimized
 function gradientColoring(daclass) {
 
     graphResetLabelsAndSizes()    // full loop
 
-    TW.gui.handpickedcolor = true
+    // strategy on multiple types: color all types that have the attr
+    let forTypes = getActivetypesNames().filter(function (ty){
+      return daclass in TW.Facets[ty]
+    })
 
     // value getter
     let getVal
@@ -672,9 +674,12 @@ function gradientColoring(daclass) {
     }
 
     var min_pow = 0;
-    for(var nid in TW.Nodes) {
-        var the_node = TW.Nodes[ nid ]
-        var attval = getVal(the_node);
+    for (var k in forTypes) {
+      let nids = TW.partialGraph.graph.getNodesByType(
+        TW.catDict[forTypes[k]]
+      )
+      for (var j in nids) {
+        let attval = getVal(TW.Nodes[ nids[j] ]);
         if( !isNaN(parseFloat(attval)) ) { //is float
           while(true) {
               var themult = Math.pow(10,min_pow);
@@ -685,6 +690,7 @@ function gradientColoring(daclass) {
           }
         }
       }
+    }
 
     var NodeID_Val = {}
     var real_min = 1000000;
@@ -692,9 +698,13 @@ function gradientColoring(daclass) {
     var themult = Math.pow(10,min_pow);
     // console.log('themult', themult)
 
-    for(var nid in TW.Nodes) {
-        var the_node = TW.Nodes[ nid ]
-        var attval = getVal(the_node)
+    for (var k in forTypes) {
+      let nids = TW.partialGraph.graph.getNodesByType(
+        TW.catDict[forTypes[k]]   // unordered type names to type id
+      )
+      for (var j in nids) {
+        let nid = nids[j]
+        var attval = getVal(TW.Nodes[nid])
 
         var attnumber = Number(attval);
         if (isNaN(attnumber)) {
@@ -708,6 +718,7 @@ function gradientColoring(daclass) {
         if (round_number<real_min) real_min = round_number;
         if (round_number>real_max) real_max = round_number;
       }
+    }
 
     // console.log("NodeID_Val", NodeID_Val)
 
@@ -718,14 +729,21 @@ function gradientColoring(daclass) {
     // console.log("the mult: "+themult)
     // console.log(" - - - - - - - - -- - - ")
 
-
     //    [ Scaling node colours(0-255) and sizes(2-7) ]
     var Min_color = 0;
     var Max_color = 255;
     var Min_size = 1;
     var Max_size= 8;
+    var setSize = (TW.facetOptions[daclass] && TW.facetOptions[daclass].setsize)
     for(var nid in NodeID_Val) {
-        var newval_color = Math.round( ( Min_color+(NodeID_Val[nid]["round"]-real_min)*((Max_color-Min_color)/(real_max-real_min)) ) );
+        var newval_color
+        // special case: all nodes have the same size
+        if (real_min == real_max) {
+          newval_color = 0
+        }
+        else {
+          newval_color = Math.round( ( Min_color+(NodeID_Val[nid]["round"]-real_min)*((Max_color-Min_color)/(real_max-real_min)) ) );
+        }
         var hex_color = rgbToHex(255, (255-newval_color) , 0)
 
         let n = TW.partialGraph.graph.nodes(nid)
@@ -736,7 +754,7 @@ function gradientColoring(daclass) {
           n.customAttrs.altgrey_color = "rgba("+(hex2rgba(hex_color).slice(0,3).join(','))+",0.4)"
 
           // optionally changing size
-          if (TW.facetOptions[daclass] && TW.facetOptions[daclass].setsize) {
+          if (setSize) {
             var newval_size = Math.round( ( Min_size+(NodeID_Val[nid]["round"]-real_min)*((Max_size-Min_size)/(real_max-real_min)) ) );
             n.size = newval_size;
           }
@@ -752,8 +770,11 @@ function gradientColoring(daclass) {
     // Edge precompute alt_rgb by new source-target nodes-colours combination
     repaintEdges()
 
-    // remember in clusters
-    let bins = TW.Facets[getActivetypesNames()[0]][daclass]
+    // remember in clusters of each requested type
+    for (var k in forTypes) {
+      let ty = forTypes[k]
+      TW.gui.handpickedcolor[ty] = true
+      let bins = TW.Facets[ty][daclass]
       if (bins && bins.invIdx) {
         for (var i in bins.invIdx) {
           if (bins.invIdx[i].labl != '_non_numeric_') {
@@ -778,10 +799,11 @@ function gradientColoring(daclass) {
           }
         }
       }
+    }
 
     // NB legend will group different possible values using
-    //    precomputed ticks from TW.Facets.terms[daclass]
-    set_ClustersLegend ( daclass)
+    //    precomputed ticks from TW.Facets[type][daclass]
+    set_ClustersLegend (daclass, forTypes)
 
     TW.partialGraph.render();
 }
@@ -808,15 +830,27 @@ function repaintEdges() {
           if (src && tgt) {
             let src_color
             let tgt_color
-            if (TW.gui.handpickedcolor) {
+
+            // handpickedcolor on multiple types may or may not affect
+            // a given edge so we need the useAltColor individual flag
+            let useAlt = false
+
+            if (TW.gui.handpickedcolor[src.type]) {
               src_color = src.customAttrs.alt_color || '#555'
-              tgt_color = tgt.customAttrs.alt_color || '#555'
+              useAlt = true
             }
-            else {
+            else
               src_color = src.color || '#555'
-              tgt_color = tgt.color || '#555'
+
+            if (TW.gui.handpickedcolor[tgt.type]) {
+              tgt_color = tgt.customAttrs.alt_color || '#555'
+              useAlt = true
             }
+            else
+              tgt_color = tgt.color || '#555'
+
             e.customAttrs.alt_rgb = sigmaTools.edgeRGB(src_color,tgt_color)
+            e.customAttrs.useAltColor = useAlt
             // we don't set e.color because opacity may vary if selected or not
           }
         }
@@ -833,7 +867,9 @@ function repaintEdges() {
 function heatmapColoring(daclass) {
   var binColors
   var doModifyLabel = false
-  var actypes = getActivetypesNames()
+
+  // let's go
+  graphResetLabelsAndSizes()    // full loop
 
   // default value
   let nColors = TW.conf.legendsBins || 5
@@ -848,12 +884,16 @@ function heatmapColoring(daclass) {
     }
   }
 
-  // we have no specifications yet for colors and legends on multiple types
-  if (actypes.length > 1) {
-    console.warn("colors by bins will only color nodes of type 0")
-  }
+  // strategy on multiple types: color all types that have the attr
+  let forTypes = getActivetypesNames().filter(function (ty){
+    return daclass in TW.Facets[ty]
+  })
+
+  for (var k in forTypes) {
+    var ty = forTypes[k]
 
-  var ty = actypes[0]
+    // global flag
+    TW.gui.handpickedcolor[ty] = true
 
     // our binning
     var tickThresholds = TW.Facets[ty][daclass].invIdx
@@ -866,12 +906,6 @@ function heatmapColoring(daclass) {
 
     binColors = getHeatmapColors(nColors)
 
-  // let's go
-  graphResetLabelsAndSizes()    // full loop
-
-  // global flag
-  TW.gui.handpickedcolor = true
-
     // use our valueclass => ids mapping
     for (var k in tickThresholds) {
 
@@ -910,11 +944,12 @@ function heatmapColoring(daclass) {
       // remember
       tickThresholds[k].col = theColor
     }
+  }
 
   // Edge precompute alt_rgb by new source-target nodes-colours combination
   repaintEdges()
 
-  set_ClustersLegend ( daclass )
+  set_ClustersLegend ( daclass, forTypes )
 
   TW.partialGraph.render();
 }
@@ -924,18 +959,25 @@ function clusterColoring(daclass) {
 
     graphResetLabelsAndSizes()    // full loop
 
+    let forTypes = getActivetypesNames().filter(function (ty){
+      return daclass in TW.Facets[ty]
+    })
+
     // louvain needs preparation
     if(daclass=="clust_louvain") {
         if(!TW.SystemState().LouvainFait) {
             try {
-              RunLouvain()
+              RunLouvain(function() {
                 TW.SystemState().LouvainFait = true
+                clusterColoring("clust_louvain")
+              })
             }
             catch(e) {
               TW.SystemState().LouvainFait = false
               console.warn("skipped error on louvain, falling back to default colors")
               daclass == 'clust_default'
             }
+            return
         }
     }
 
@@ -949,10 +991,9 @@ function clusterColoring(daclass) {
         }
 
         // reset the global state
-        TW.gui.handpickedcolor = false
+        TW.gui.handpickedcolor = {}
     }
     else {
-
       let colList = []
       if (TW.conf.randomizeClusterColors) {
         // shuffle on entire array is better than random sorting function on each element
@@ -964,8 +1005,10 @@ function clusterColoring(daclass) {
 
       let nColors = TW.gui.colorList.length
 
+      for (var k in forTypes) {
+        let typeName = forTypes[k]
+        let facets = TW.Facets[typeName][daclass]
 
-      let facets = TW.Facets[getActivetypesNames()[0]][daclass]
         if (facets && facets.invIdx) {
           for (var i in facets.invIdx) {
             let valGroup = facets.invIdx[i]
@@ -1003,8 +1046,10 @@ function clusterColoring(daclass) {
         }
         // fallback on old, slower strategy if scanAttributes inactive
         else {
-        for(var nid in TW.Nodes) {
-            var the_node = TW.partialGraph.graph.nodes(nid)
+          let nids = TW.partialGraph.graph.getNodesByType(TW.catDict[typeName])
+          for (var j in nids) {
+            let nid = nids[j]
+            let the_node = TW.partialGraph.graph.nodes(nid)
 
             if (the_node) {
 
@@ -1033,15 +1078,15 @@ function clusterColoring(daclass) {
             }
           }
         }
-
         // set the global state
-      TW.gui.handpickedcolor = true
+        TW.gui.handpickedcolor[typeName] = true
+      }
     }
 
     // Edge precompute alt_rgb by new source-target nodes-colours combination
     repaintEdges()
 
-    set_ClustersLegend ( daclass )
+    set_ClustersLegend ( daclass, forTypes )
     TW.partialGraph.render();
 }
 

twpresets/settings_explorerjs.comex.js

@@ -21,7 +21,7 @@ TW.conf = (function(TW){
 
   // ...or remote bridge to default source api ajax queries
   TWConf.sourceAPI={}
-  TWConf.sourceAPI["nodetypes"] = {"node0": "NGram", "node1": "Document" }
+  TWConf.sourceAPI["nodetypes"] = {"node0": "Keywords", "node1": "Scholars" }
   TWConf.sourceAPI["forNormalQuery"] = "services/api/graph"
   TWConf.sourceAPI["forFilteredQuery"] = "services/api/graph"
 
@@ -59,7 +59,7 @@ TW.conf = (function(TW){
   TWConf.scanAttributes = true
 
   // use a facet for default color
-  TWConf.defaultColoring = "clust_louvain"
+  TWConf.defaultColoring = null
 
   // facetOptions: choose here the default visual result of your node attributes
   // ---------------------------------------------------------------------------

twpresets/settings_explorerjs.devdefault.js

@@ -21,7 +21,7 @@ TW.conf = (function(TW){
 
   // ...or remote bridge to default source api ajax queries
   TWConf.sourceAPI={}
-  TWConf.sourceAPI["nodetypes"] = {"node0": "NGram", "node1": "Document" }
+  TWConf.sourceAPI["nodetypes"] = {"node0": "Keywords", "node1": "Scholars" }
   TWConf.sourceAPI["forNormalQuery"] = "services/api/graph"
   TWConf.sourceAPI["forFilteredQuery"] = "services/api/graph"