Commit 1e49df00 authored by pksm3's avatar pksm3

DataScanner,enviroment: ok

parent 6063efba
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function scanDataFolder(){ function scanDataFolder(){
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: twjs+'php/DirScan_main.php', url: 'php/DirScan_main.php',
//data: "type="+type+"&query="+jsonparams, //data: "type="+type+"&query="+jsonparams,
//contentType: "application/json", //contentType: "application/json",
//dataType: 'json', //dataType: 'json',
...@@ -31,12 +31,12 @@ function jsActionOnGexfSelector(gexfLegend){ ...@@ -31,12 +31,12 @@ function jsActionOnGexfSelector(gexfLegend){
} }
function listGexfs(){ function listGexfs(){
divlen=$("#gexf").length; divlen=$("#gexfs").length;
if(divlen>0) { if(divlen>0) {
param = JSON.stringify(gexfDict); param = JSON.stringify(gexfDict);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: twjs+'php/listFiles.php', url: 'php/listFiles.php',
//contentType: "application/json", //contentType: "application/json",
//dataType: 'json', //dataType: 'json',
success : function(data){ success : function(data){
......
...@@ -182,7 +182,6 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) { ...@@ -182,7 +182,6 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) {
// criteria = "size" // criteria = "size"
if(partialGraph._core.graph.edges.length==0) { if(partialGraph._core.graph.edges.length==0) {
$(sliderDivID).freshslider({ $(sliderDivID).freshslider({
range: true, range: true,
step:1, step:1,
...@@ -192,11 +191,10 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) { ...@@ -192,11 +191,10 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) {
console.log(low, high); console.log(low, high);
} }
}); });
return; return;
} }
var filterparams = AlgorithmForSliders ( partialGraph._core.graph.edges , type_attrb , type , criteria) var filterparams = AlgorithmForSliders ( Edges , type_attrb , type , criteria)
var steps = filterparams["steps"] var steps = filterparams["steps"]
var finalarray = filterparams["finalarray"] var finalarray = filterparams["finalarray"]
...@@ -369,7 +367,8 @@ function NodeWeightFilter(sliderDivID , type_attrb , type , criteria) { ...@@ -369,7 +367,8 @@ function NodeWeightFilter(sliderDivID , type_attrb , type , criteria) {
return; return;
} }
var filterparams = AlgorithmForSliders ( partialGraph._core.graph.nodes , type_attrb , type , criteria) var filterparams = AlgorithmForSliders ( Nodes , type_attrb , type , criteria) //swap
var steps = filterparams["steps"] var steps = filterparams["steps"]
var finalarray = filterparams["finalarray"] var finalarray = filterparams["finalarray"]
...@@ -440,13 +439,22 @@ function NodeWeightFilter(sliderDivID , type_attrb , type , criteria) { ...@@ -440,13 +439,22 @@ function NodeWeightFilter(sliderDivID , type_attrb , type , criteria) {
function AlgorithmForSliders( elements , type_attrb , type , criteria) { function AlgorithmForSliders( elements , type_attrb , type , criteria) {
// // ( 1 ) // // ( 1 )
// // get visible sigma nodes|edges // // get visible sigma nodes|edges
elems=elements.filter(function(e) {
return e[type_attrb]==type;
}); var elems = [];
// // ( 2 ) // // ( 2 )
// // extract [ "edgeID" : edgeWEIGHT ] | [ "nodeID" : nodeSIZE ] // // extract [ "edgeID" : edgeWEIGHT ] | [ "nodeID" : nodeSIZE ]
// // and save this into edges_weight | nodes_size // // and save this into edges_weight | nodes_size
for(var e in elements) {
// pr(elements[e])
// pr("\t"+type_attrb)
if( elements[e][type_attrb]==type )
elems.push(elements[e])
}
var elem_attrb=[] var elem_attrb=[]
for (var i in elems) { for (var i in elems) {
e = elems[i] e = elems[i]
...@@ -458,7 +466,7 @@ function AlgorithmForSliders( elements , type_attrb , type , criteria) { ...@@ -458,7 +466,7 @@ function AlgorithmForSliders( elements , type_attrb , type , criteria) {
// pr(elem_attrb) // pr(elem_attrb)
// // ( 3 ) // // ( 3 )
// // order dict edges_weight by edge weight | nodes_size by node size // // order dict edges_weight by edge weight | nodes_size by node size
var result = ArraySortByValue(elem_attrb, function(a,b){ var result = ArraySortByValue(elem_attrb, function(a,b){
return a-b return a-b
//ASCENDENT //ASCENDENT
......
...@@ -92,9 +92,6 @@ function sigmaLimits(){ ...@@ -92,9 +92,6 @@ function sigmaLimits(){
function bringTheNoise(pathfile,type){ function bringTheNoise(pathfile,type){
$("#semLoader").hide(); $("#semLoader").hide();
$('#modalloader').modal('show');
// $('.selectpicker').selectpicker(); // $('.selectpicker').selectpicker();
......
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