fixed an issue where a deleted node was not reflected on the export o…

…f the uploaded glm files
pnnl · Jan 29, 2025 · 87db5df · 87db5df
1 parent 3d68d81
commit 87db5df
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/glimpse/config/appConfig.json b/glimpse/config/appConfig.json
@@ -51,8 +51,8 @@
             "bold": "20px arial black"
          },
          "scaling": {
-            "min": 5,
-            "max": 75
+            "min": 10,
+            "max": 55
          }
       },
       "interaction": {
@@ -131,6 +131,10 @@
             "size": 30,
             "strokeWidth": 5,
             "strokeColor": "white"
+         },
+         "smooth": {
+            "enabled": false,
+            "type": "continuous"
          }
       },
       "interaction": {

diff --git a/glimpse/renderer/src/components/Graph.js b/glimpse/renderer/src/components/Graph.js
@@ -589,12 +589,21 @@ const Graph = ({ dataToVis, theme, isGlm }) => {
     * @param {string} nodeID the ID of a node to delete
     */
    const deleteNode = (nodeID) => {
+      // delete from file data
+      Object.keys(dataToVis).forEach((filename) => {
+         console.log(filename);
+         const objects = dataToVis[filename].objects;
+
+         dataToVis[filename].objects = objects.filter((obj) => obj.attributes.name !== nodeID);
+      });
+
       const nodeObject = graphData.nodes.get(nodeID);
       // get node obj and subtract from that node type's count
       objectTypeCount.nodes[nodeObject.group]--;
 
       const edgesToDelete = [];
-      for (let edge of graphData.edges.get()) {
+      const graphEdges = graphData.edges.get();
+      for (let edge of graphEdges) {
          if (edge.from === nodeID || edge.to === nodeID) {
             edgesToDelete.push(edge.id);
             objectTypeCount.edges[edge.type]--;
@@ -604,6 +613,8 @@ const Graph = ({ dataToVis, theme, isGlm }) => {
       graphData.nodes.remove(nodeID);
       graphData.edges.remove(edgesToDelete);
 
+      console.log("DELETED: " + nodeID);
+
       getLegendData(objectTypeCount, theme, edgeOptions, legendData);
    };
 

diff --git a/glimpse/renderer/src/utils/graphUtils.js b/glimpse/renderer/src/utils/graphUtils.js
@@ -122,7 +122,8 @@ export const getLegendData = (typeCounts, theme, edgeOptions, legendData) => {
    });
 
    let x_increment = null;
-   if (currentNodeTypes.length < 6) x_increment = 800 / 6;
+   if (currentNodeTypes.length === 5) x_increment = 800 / 5;
+   else if (currentNodeTypes.length === 2) x_increment = 400;
    else x_increment = 1100 / 6;
 
    let farthest_x = 0;