update

Zipexpo · Zipexpo · commit fc775f996a10 · 2021-04-12T00:41:11.000-05:00
diff --git a/JobSqueue/src/script/main.js b/JobSqueue/src/script/main.js
@@ -706,7 +706,6 @@ function initFunc() {
     data = object2DataPrallel(sampleS);
 
     // network
-    debugger
     graphicopt={margin: {top: 20, right: 100, bottom: 20, left: 20}};
     graphicopt.width = Math.round($("#network").width());
     graphicopt.height = d3.max([document.body.clientHeight-150, 300]);
@@ -716,6 +715,7 @@ function initFunc() {
         .attr('width',graphicopt.width)
         .style('height',graphicopt.height+'px').node().getContext('2d');
     linkcanvas.strokeStyle = "rgba(0,100,160,0.1)";
+    linkcanvas.globalCompositeOperation = "destination-over";
     linkcanvas.lineWidth = 1.7;
 
     linkcanvas_highlight = d3.select('#networkconnect_highlight')
@@ -725,8 +725,6 @@ function initFunc() {
     linkcanvas_highlight.strokeStyle = "rgba(0,100,160,0.1)";
     linkcanvas_highlight.lineWidth = 4;
 
-
-
     netControl.graphicopt(graphicopt);
     const force = d3.forceSimulation()
         .force("charge", d3.forceManyBody().strength(-20))
@@ -747,12 +745,13 @@ function initFunc() {
             d.data.root.forEach(e=>
                 unhighlight(e))
             net_unhighlight()
-        }).clickAdd('pp',function(d,isFreeze){
+        }).clickAdd('pp',function(d){
             debugger
-            if (userfilter)
+            if (userfilter){
                 userfilter = undefined;
-            else
+            }else{
                 userfilter = d.data.root[0].USER;
+            }
             brush()
         });
     netControl
@@ -934,6 +933,9 @@ function resetRequest() {
         .selectAll('tr')
         .filter(d=>d.arr==selectedService).select('input[type="radio"]').property("checked", true);
     _.bind(selecteds.on("change"),selecteds.node())();
+
+    netControl.data(data2net(data))
+    netControl.draw();
 }
 let coloraxis ={};
 let opaaxis ={};
@@ -1751,7 +1753,7 @@ function resetSize() {
 // Background canvas
     background.lineWidth = 1.7;
 
-    xscale = d3.scalePoint().range([0, w]).padding(0.5).domain(dimensions);
+    xscale = d3.scalePoint().range([0, w]).padding(0).domain(dimensions);
     dimensions.forEach(function (d) {
         yscale[d].range([h, 0]);
     });
diff --git a/JobSqueue/src/script/network.js b/JobSqueue/src/script/network.js
@@ -55,7 +55,9 @@ let DynamicNetViz = function(){
     let createRadar = _.partial(createRadar_func,_,_,_,_,'radar',graphicopt.radaropt,color);
     let simulation,node,link,label,removedLinks=[],enterLinks=[];
     let radius;
-    let transform={k:1,x:0,y:0}
+    let transform={k:1,x:0,y:0};
+    let mapPosById={};
+    let updatePos = true;
     createEventHandle('onBrush');
     createEventHandle('offBrush');
     createEventHandle('mouseover');
@@ -99,8 +101,11 @@ let DynamicNetViz = function(){
         let jobArr = {};
         if (node&&link) // new
         {
-            const olds = new Map(node.data().map(d => [d.id, d]));
-            nodes = nodes.map(d => { const old = olds.get(d.id)||{};
+            if (updatePos)
+                node.data().forEach(d =>{
+                    mapPosById[d.id] = d;
+                });
+            nodes = nodes.map(d => { const old = mapPosById[d.id]||{};
                 d.vx = old.vx;
                 d.vy = old.vy;
                 if (datamap[d.id]){
@@ -650,6 +655,9 @@ let DynamicNetViz = function(){
     master.getDrawData = function(_data) {
         return arguments.length?(getDrawData=_data,master):getDrawData;
     };
+    master.updatePos = function(_data) {
+        return arguments.length?(updatePos=_data,master):updatePos;
+    };
     master.onFinishDraw = function(_data) {
         onFinishDraw.push(_data)
         return master;
