Fixed Copy/Paste wrong nodes

blockout22 · Sep 17, 2023 · 2fb1ea1 · 2fb1ea1
1 parent d852de4
commit 2fb1ea1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/main/java/ovs/graph/Graph.java b/src/main/java/ovs/graph/Graph.java
@@ -56,6 +56,17 @@ public AdvancedArrayList<Node> getNodes()
         return nodes;
     }
 
+    public Node findNodeById(long id){
+        Node returnNode = null;
+        for (Node n : getNodes().getList()) {
+            if(n.getID() == id){
+                returnNode = n;
+            }
+        }
+
+        return returnNode;
+    }
+
     public void update(){
         for(Integer q : queuedForRemoval){
             Node n = null;

diff --git a/src/main/java/ovs/graph/NodeEditorRenderer.java b/src/main/java/ovs/graph/NodeEditorRenderer.java
@@ -392,11 +392,13 @@ public void show(ImVec2 cursorPos, boolean isLoading) {
 
             if(ImGui.beginPopup("node_menu" + id)){
                 //TODO Duplicate all info attatched to this node
-                if(ImGui.menuItem("Duplicate Node " + graph.getNodes().get(targetNode).getName()))
+                Node selectedNode = graph.findNodeById(targetNode);
+                if(ImGui.menuItem("Duplicate Node " + selectedNode.getName()))
                 {
                     Node newInstance = null;
                     try{
-                        Node target = graph.getNodes().get(targetNode);
+//                        Node target = graph.getNodes().get(targetNode);
+                        Node target = graph.findNodeById(targetNode);
                         newInstance = target.getClass().getDeclaredConstructor(Graph.class).newInstance(graph);
                         graph.addNode(newInstance);
                         NodeEditor.setNodePosition(newInstance.getID(), NodeEditor.toCanvasX(ImGui.getCursorScreenPosX()), NodeEditor.toCanvasY(ImGui.getCursorScreenPosY()));
@@ -421,7 +423,7 @@ public void show(ImVec2 cursorPos, boolean isLoading) {
 
                 ImGui.separator();
 
-                if(ImGui.menuItem("Delete " + graph.getNodes().get(targetNode).getName())){
+                if(ImGui.menuItem("Delete " + selectedNode.getName())){
                     NodeEditor.deleteNode(targetNode);
                     ImGui.closeCurrentPopup();
                 }
@@ -496,8 +498,18 @@ public void show(ImVec2 cursorPos, boolean isLoading) {
 
                 ArrayList<Node> nodeList = new ArrayList<>();
                 for (int i = 0; i < list.length; i++) {
-                    Node node = graph.getNodes().get((int)list[i]);
-                    nodeList.add(node);
+//                    Node node = graph.getNodes().get((int)list[i]);
+                    Node node = null;
+                    //Find Node with ID == list[id]
+                    for (Node n : graph.getNodes().getList()) {
+                        if(n.getID() == ((int)list[i])){
+                            node = n;
+                            break;
+                        }
+                    }
+                    if(node != null) {
+                        nodeList.add(node);
+                    }
                 }
                 NodeCopyPasteHandler.copy(nodeList);
             }

diff --git a/src/main/resources/build b/src/main/resources/build
@@ -1 +1 @@
-937
+953