From 22695e53b809125c60f9a6d5ed820a64409aeaea Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 5 Nov 2014 15:47:43 -0500 Subject: [PATCH] restored graph plotting to normal --- app/assets/javascripts/src/JIT.js | 52 ++----------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/app/assets/javascripts/src/JIT.js b/app/assets/javascripts/src/JIT.js index faf1a8b1..743a7eef 100644 --- a/app/assets/javascripts/src/JIT.js +++ b/app/assets/javascripts/src/JIT.js @@ -7100,7 +7100,7 @@ Graph.Plot = { } //END METAMAPS CODE - function plot(node) { + aGraph.eachNode(function(node) { var nodeAlpha = node.getData('alpha'); node.eachAdjacency(function(adj) { var nodeTo = adj.nodeTo; @@ -7123,55 +7123,7 @@ Graph.Plot = { } } node.visited = !T; - } - - function stop() { - cancelAnimationFrame(requestAnimId); - } - stop(); // cancels any previous plot calls - - var i = 0; - var length = aGraph.nodes.length; - var keys = _.keys(aGraph.nodes); - function eachNode() { - var key = keys[i]; - var node = aGraph.nodes[key]; - - if (node) { - i += 1; - requestAnimId = requestAnimationFrame(eachNode); - plot(node); - } - else { - stop(); - } - } - - requestAnimId = requestAnimationFrame(eachNode); - /*aGraph.eachNode(function(node) { - var nodeAlpha = node.getData('alpha'); - node.eachAdjacency(function(adj) { - var nodeTo = adj.nodeTo; - if(!!nodeTo.visited === T && node.drawn && nodeTo.drawn) { - !animating && opt.onBeforePlotLine(adj); - that.plotLine(adj, canvas, animating); - !animating && opt.onAfterPlotLine(adj); - } - }); - if(node.drawn) { - !animating && opt.onBeforePlotNode(node); - that.plotNode(node, canvas, animating); - !animating && opt.onAfterPlotNode(node); - } - if(!that.labelsHidden && opt.withLabels) { - if(node.drawn && nodeAlpha >= 0.95) { - that.labels.plotLabel(canvas, node, opt); - } else { - that.labels.hideLabel(node, false); - } - } - node.visited = !T; - });*/ + }); }, /*