No layout after operation does not work #32

iVis-at-Bilkent · Oct 11, 2023 · 4865b78 · 4865b78
1 parent 17a2f1b
commit 4865b78
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 15 deletions.
diff --git a/demo/main.js b/demo/main.js
@@ -1159,7 +1159,7 @@ function onLoaded() {
           // FOR GENERAL USE from API FOllowing line is to be used instead of above one.
           // instance.expandGraph(node.data().id, cy)
 
-            instance.expandNodes(cy.nodes(':selected'), true, runLayout = document.getElementById("cbk-run-layout3").checked, pngImage);
+            instance.expandNodes(cy.nodes(':selected'), true, runLayout = document.getElementById("cbk-run-layout3").checked, pngImage,setLabelPosition);
 
             setTimeout(() => {
               pngBeforeFinalGraph = cy.png({
@@ -1175,7 +1175,7 @@ function onLoaded() {
             }, document.getElementById("cbk-run-layout3").checked?700:0);
 
         }else{
-          instance.expandNodes(cy.nodes(':selected'), true, runLayout = document.getElementById("cbk-run-layout3").checked, pngImage);
+          instance.expandNodes(cy.nodes(':selected'), true, runLayout = document.getElementById("cbk-run-layout3").checked, pngImage,setLabelPosition);
           cy.fit();
           initializer(cy);
         }
@@ -1194,7 +1194,7 @@ function onLoaded() {
               scale:2,
               full:true
             });
-            instance.expandNodes(cy.nodes(':selected'), false, document.getElementById("cbk-run-layout3").checked, pngImage);
+            instance.expandNodes(cy.nodes(':selected'), false, document.getElementById("cbk-run-layout3").checked, pngImage, setLabelPosition);
 
             setTimeout(() => {
               pngBeforeFinalGraph = cy.png({
@@ -1210,7 +1210,7 @@ function onLoaded() {
             }, document.getElementById("cbk-run-layout3").checked?700:0);
 
         }else{
-          instance.expandNodes(cy.nodes(':selected'),false,document.getElementById("cbk-run-layout3").checked, pngImage);
+          instance.expandNodes(cy.nodes(':selected'),false,document.getElementById("cbk-run-layout3").checked, pngImage,setLabelPosition);
           cy.fit();
           initializer(cy);
         }

diff --git a/dist/cytoscape-complexity-management.cjs.js b/dist/cytoscape-complexity-management.cjs.js
@@ -566,12 +566,13 @@ function complexityManagement(cy) {
     var isRecursive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var runLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     var pngImage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    var setLabelPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     var nodeIDList = [];
     nodes.forEach(function (node) {
       if (compMgrInstance.isExpandable(node.id())) {
         nodeIDList.push(node.id());
         if (runLayout) {
-          expandGraph(node.data().id, cy, pngImage);
+          expandGraph(node.data().id, cy, pngImage, setLabelPosition);
         }
         node.removeClass("cy-expand-collapse-collapsed-node");
         node.removeData("position-before-collapse");
@@ -769,7 +770,7 @@ function complexityManagement(cy) {
   api.isExpandable = function (node) {
     return compMgrInstance.isExpandable(node.id());
   };
-  var expandGraph = function expandGraph(focusID, cy, pngImage) {
+  var expandGraph = function expandGraph(focusID, cy, pngImage, setLabelPosition) {
     var descendants = getDescendantsInorder(instance.getCompMgrInstance('get').mainGraphManager.nodesMap.get(focusID));
     cyLayout.remove(cyLayout.elements());
     var fNode = cyLayout.add({
@@ -870,6 +871,12 @@ function complexityManagement(cy) {
     cyLayout.nodes().forEach(function (node) {
       node.style('label', node.id());
     });
+    var radioButtons = document.getElementsByName('cbk-flag-display-node-label-pos');
+    radioButtons.forEach(function (radio) {
+      if (radio.checked) {
+        setLabelPosition(radio.value);
+      }
+    });
     if (pngImage != null) {
       pngImage.pngSizeProxyGraph = cyLayout.png({
         scale: 2,

diff --git a/dist/cytoscape-complexity-management.esm.js b/dist/cytoscape-complexity-management.esm.js
@@ -564,12 +564,13 @@ function complexityManagement(cy) {
     var isRecursive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var runLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     var pngImage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    var setLabelPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     var nodeIDList = [];
     nodes.forEach(function (node) {
       if (compMgrInstance.isExpandable(node.id())) {
         nodeIDList.push(node.id());
         if (runLayout) {
-          expandGraph(node.data().id, cy, pngImage);
+          expandGraph(node.data().id, cy, pngImage, setLabelPosition);
         }
         node.removeClass("cy-expand-collapse-collapsed-node");
         node.removeData("position-before-collapse");
@@ -767,7 +768,7 @@ function complexityManagement(cy) {
   api.isExpandable = function (node) {
     return compMgrInstance.isExpandable(node.id());
   };
-  var expandGraph = function expandGraph(focusID, cy, pngImage) {
+  var expandGraph = function expandGraph(focusID, cy, pngImage, setLabelPosition) {
     var descendants = getDescendantsInorder(instance.getCompMgrInstance('get').mainGraphManager.nodesMap.get(focusID));
     cyLayout.remove(cyLayout.elements());
     var fNode = cyLayout.add({
@@ -868,6 +869,12 @@ function complexityManagement(cy) {
     cyLayout.nodes().forEach(function (node) {
       node.style('label', node.id());
     });
+    var radioButtons = document.getElementsByName('cbk-flag-display-node-label-pos');
+    radioButtons.forEach(function (radio) {
+      if (radio.checked) {
+        setLabelPosition(radio.value);
+      }
+    });
     if (pngImage != null) {
       pngImage.pngSizeProxyGraph = cyLayout.png({
         scale: 2,

diff --git a/dist/cytoscape-complexity-management.umd.js b/dist/cytoscape-complexity-management.umd.js
@@ -4928,12 +4928,13 @@
       var isRecursive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var runLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var pngImage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+      var setLabelPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
       var nodeIDList = [];
       nodes.forEach(function (node) {
         if (compMgrInstance.isExpandable(node.id())) {
           nodeIDList.push(node.id());
           if (runLayout) {
-            expandGraph(node.data().id, cy, pngImage);
+            expandGraph(node.data().id, cy, pngImage, setLabelPosition);
           }
           node.removeClass("cy-expand-collapse-collapsed-node");
           node.removeData("position-before-collapse");
@@ -5131,7 +5132,7 @@
     api.isExpandable = function (node) {
       return compMgrInstance.isExpandable(node.id());
     };
-    var expandGraph = function expandGraph(focusID, cy, pngImage) {
+    var expandGraph = function expandGraph(focusID, cy, pngImage, setLabelPosition) {
       var descendants = getDescendantsInorder(instance.getCompMgrInstance('get').mainGraphManager.nodesMap.get(focusID));
       cyLayout.remove(cyLayout.elements());
       var fNode = cyLayout.add({
@@ -5232,6 +5233,12 @@
       cyLayout.nodes().forEach(function (node) {
         node.style('label', node.id());
       });
+      var radioButtons = document.getElementsByName('cbk-flag-display-node-label-pos');
+      radioButtons.forEach(function (radio) {
+        if (radio.checked) {
+          setLabelPosition(radio.value);
+        }
+      });
       if (pngImage != null) {
         pngImage.pngSizeProxyGraph = cyLayout.png({
           scale: 2,

diff --git a/src/complexity-management.js b/src/complexity-management.js
@@ -539,15 +539,15 @@ export function complexityManagement(cy) {
     actOnVisibleForMetaEdge(IDsToAdd, cy);
   };
 
-  api.expandNodes = (nodes, isRecursive = false, runLayout = true, pngImage = null) => {
+  api.expandNodes = (nodes, isRecursive = false, runLayout = true, pngImage = null, setLabelPosition = null) => {
 
     let nodeIDList = [];
 
     nodes.forEach( (node) => {
       if (compMgrInstance.isExpandable(node.id())) {
         nodeIDList.push(node.id());
         if(runLayout){
-          expandGraph(node.data().id, cy, pngImage)
+          expandGraph(node.data().id, cy, pngImage, setLabelPosition)
         }
         node.removeClass("cy-expand-collapse-collapsed-node");
         node.removeData("position-before-collapse");
@@ -562,7 +562,7 @@ export function complexityManagement(cy) {
         scale:2,
         full:true
       });
-      
+
     let returnedElements = compMgrInstance.expandNodes(nodeIDList, isRecursive);
     // Add required elements to cy instance
     actOnVisible([...returnedElements.nodeIDListForVisible], cy, true);
@@ -787,7 +787,7 @@ export function complexityManagement(cy) {
     return compMgrInstance.isExpandable(node.id());
   };
 
-  let expandGraph = (focusID,cy,pngImage) => {
+  let expandGraph = (focusID,cy,pngImage,setLabelPosition) => {
 
     let descendants = getDescendantsInorder(instance.getCompMgrInstance('get').mainGraphManager.nodesMap.get(focusID));
 
@@ -893,7 +893,12 @@ export function complexityManagement(cy) {
     var fcousNodeHeight = boundingBox.h;
 
     cyLayout.nodes().forEach(node => {node.style('label', node.id());})
-
+    var radioButtons = document.getElementsByName('cbk-flag-display-node-label-pos');
+    radioButtons.forEach(function(radio) {
+      if(radio.checked){
+        setLabelPosition(radio.value);
+      }
+    });
     if(pngImage!= null){
       pngImage.pngSizeProxyGraph = cyLayout.png({
         scale:2,