From 6a15ff563dd0fe79619b5b16afae586f42e35f41 Mon Sep 17 00:00:00 2001
From: PkSM3 <pokesam3@gmail.com>
Date: Tue, 30 Sep 2014 15:24:53 +0200
Subject: [PATCH] spatialization corrected
---
explorerjs.html | 3 ---
tinawebJS/js/main.js | 39 ++++++++++++++-----------------
tinawebJS/js/methods.js | 19 ++++++++-------
tinawebJS/js/sigma.parseCustom.js | 4 ++--
4 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/explorerjs.html b/explorerjs.html
index 74bc308..efb7767 100644
--- a/explorerjs.html
+++ b/explorerjs.html
@@ -184,11 +184,8 @@
<div style="visibility: hidden;" id="sigma-othergraph"></div>
-
-
<img id="semLoader" style="position:absolute; top:50%; left:40%; width:80px;" src="img2/loading-bar.gif"></img>
-
<ul id="ctlzoom">
<!-- <div class="content-header">
diff --git a/tinawebJS/js/main.js b/tinawebJS/js/main.js
index e30d06e..03efe45 100755
--- a/tinawebJS/js/main.js
+++ b/tinawebJS/js/main.js
@@ -211,11 +211,12 @@ function bringTheNoise(pathfile,type){
contentType: "application/json",
dataType: 'jsonp',
async: true,
- success : function(data){
+ success : function(data) {
if(!isUndef(getUrlParam.seed))seed=getUrlParam.seed;
extractFromJson(data,seed);
+ changeToMacro("social");
pr(getClientTime()+" : DataExt Fin");
- // < === DATA EXTRACTED!! === >
+ // < === DATA EXTRACTED!! === >
if(fa2enabled==="off") $("#edgesButton").hide();
pushSWClick("social");
@@ -234,14 +235,14 @@ function bringTheNoise(pathfile,type){
pr("iterationsFA2: "+iterationsFA2)
var netname = pathfile.replace(/\_/g, ' ').toUpperCase();
$("#network").html(netname);
- // < === ASYNCHRONOUS FA2.JS === >
-
-
+ // < === ASYNCHRONOUS FA2.JS === >
+ pr("prev first node:")
+ pr(partialGraph._core.graph.nodes[0])
pr(getClientTime()+" : Ini FA2");
var ForceAtlas2 = new Worker("FA2.js");
- ForceAtlas2.postMessage({
+ ForceAtlas2.postMessage({
"nodes": partialGraph._core.graph.nodes,
"edges": partialGraph._core.graph.edges,
"it":iterationsFA2
@@ -264,9 +265,12 @@ function bringTheNoise(pathfile,type){
pr(getClientTime()+" : Fin FA2");
console.log("Parsing and FA2 complete.");
pr("\n=================\n")
- // < === ASYNCHRONOUS FA2.JS DONE!! === >
+ // < === ASYNCHRONOUS FA2.JS DONE!! === >
+ pr("aft first node:")
+ pr(partialGraph._core.graph.nodes[0])
+ // [ calculate iterations for semanticgraph ]
pr(getClientTime()+" : Ini FA2 for SemanticGraph");
var cut1_,cut2_,iterationsFA2_=iterationsFA2;
pr(otherGraph._core.graph.nodes.length)
@@ -282,8 +286,10 @@ function bringTheNoise(pathfile,type){
}
if(nbnodes>=1000) iterationsFA2_ = 150;
pr("iterationsFA2 sem: "+iterationsFA2_)
+ // [ / calculate iterations for semanticgraph ]
+ // [ semantic layouting ]
var ForceAtlas2_ = new Worker("FA2.js");
ForceAtlas2_.postMessage({
"nodes": otherGraph._core.graph.nodes,
@@ -312,11 +318,14 @@ function bringTheNoise(pathfile,type){
semanticConverged = true;
$("#semLoader").hide();
- if( NOW=="B" ) changeToMacro("semantic");
+ if( NOW=="B" ) {
+ changeToMacro("semantic");
+ partialGraph.draw();
+ }
console.log("Parsing and FA2 complete for SemanticGraph.");
-
});
+ // [ / semantic layouting ]
@@ -405,18 +414,6 @@ function bringTheNoise(pathfile,type){
}
});
-
-
-
-
-
-
-
-
-
-
-
-
}
}
}
diff --git a/tinawebJS/js/methods.js b/tinawebJS/js/methods.js
index 323c1b0..7377530 100755
--- a/tinawebJS/js/methods.js
+++ b/tinawebJS/js/methods.js
@@ -273,6 +273,8 @@ function RefreshState(newNOW){
$("#colorGraph").hide();
}
+ partialGraph.draw();
+
}
function pushSWClick(arg){
@@ -1405,6 +1407,7 @@ function unHideElem(id){
function changeToMeso(iwannagraph) {
labels=[]
+ partialGraph.emptyGraph();
pr("changing to Meso-"+iwannagraph);
if(iwannagraph=="social") {
if(!is_empty(selections)){
@@ -1574,10 +1577,10 @@ function changeToMeso(iwannagraph) {
}
}
// highlightSelectedNodes(true);
- partialGraph.draw();
- // partialGraph.zoomTo(partialGraph._core.width / 2, partialGraph._core.height / 2, 0.8);
- partialGraph.refresh();
- partialGraph.startForceAtlas2();
+ // partialGraph.draw();
+ // // partialGraph.zoomTo(partialGraph._core.width / 2, partialGraph._core.height / 2, 0.8);
+ // partialGraph.refresh();
+ // partialGraph.startForceAtlas2();
$('.gradient').css({"background-size":"90px 90px"});
}
@@ -1659,10 +1662,10 @@ function changeToMacro(iwannagraph) {
}
// highlightSelectedNodes(true);
// // partialGraph.stopForceAtlas2();
- partialGraph.draw();
- // partialGraph.zoomTo(partialGraph._core.width / 2, partialGraph._core.height / 2, 0.8);
- partialGraph.refresh();
- partialGraph.startForceAtlas2();
+ // partialGraph.draw();
+ // // partialGraph.zoomTo(partialGraph._core.width / 2, partialGraph._core.height / 2, 0.8);
+ // partialGraph.refresh();
+ // partialGraph.startForceAtlas2();
$('.gradient').css({"background-size":"40px 40px"});
}
diff --git a/tinawebJS/js/sigma.parseCustom.js b/tinawebJS/js/sigma.parseCustom.js
index 7af06b0..e4240f8 100755
--- a/tinawebJS/js/sigma.parseCustom.js
+++ b/tinawebJS/js/sigma.parseCustom.js
@@ -612,8 +612,8 @@ function extractFromJson(data,seed){
size:1,
x:rand.getRandom(),
y:rand.getRandom(),
- //x:Math.random(),
- //y:Math.random(),
+ // x:Math.random(),
+ // y:Math.random(),
type:"",
htmlCont:"",
color:color
--
2.21.0