Commit 13f4853a authored by Romain Loth's avatar Romain Loth

clarify changeLevel + fix test order for adding selection source(s)

NB could benefit from SystemState().selectionRels
parent c6b45b4b
......@@ -447,35 +447,38 @@ function changeLevel() {
var voisinage = {}
// Dictionaries of: selection+neighbors
var nodes_2_colour = {}
var edges_2_colour = {}
var nodesToAdd = {}
var edgesToAdd = {}
for(var i in sels) {
s = sels[i];
neigh = TW.Relations[activetypesKey][s]
if(neigh) {
for(var j in neigh) {
t = neigh[j]
nodes_2_colour[t]=false;
edges_2_colour[s+";"+t]=true;
edges_2_colour[t+";"+s]=true;
if( !selsChecker[t] )
voisinage[ t ] = true;
}
nodesToAdd[s]=true;
if (TW.Relations[activetypesKey]) {
neigh = TW.Relations[activetypesKey][s]
if(neigh) {
for(var j in neigh) {
t = neigh[j]
nodesToAdd[t]=true;
edgesToAdd[s+";"+t]=true;
edgesToAdd[t+";"+s]=true;
if( !selsChecker[t] )
voisinage[ t ] = true;
}
}
}
else {
// case where no edges at all (ex: scholars have no common keywords)
console.log("no edges between these nodes")
}
nodes_2_colour[s]=true;
}
var futurelevel = null
if(present.level) { // [Change to Local] when level=Global(1)
for(var nid in nodes_2_colour)
add1Elem(nid)
for(var eid in edges_2_colour) {
console.log(eid)
let ns = eid.split(';')
add1Elem(eid)
}
for(var nid in nodesToAdd)
add1Elem(nid)
for(var eid in edgesToAdd)
add1Elem(eid)
// Adding intra-neighbors edges O(voisinage²)
voisinage = Object.keys(voisinage)
......@@ -485,7 +488,6 @@ function changeLevel() {
// console.log( "\t" + voisinage[i] + " vs " + voisinage[j] )
add1Elem( voisinage[i]+";"+voisinage[j] )
}
}
}
......@@ -513,11 +515,7 @@ function changeLevel() {
// Nodes Selection now:
if(sels.length>0) {
TW.instance.selNgn.MultipleSelection2({
nodes:sels,
// nodesDict:nodes_2_colour,
// edgesDict:edges_2_colour
});
TW.instance.selNgn.MultipleSelection2({nodes:sels});
TW.gui.selectionActive=true;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment