[ui] Graph: Updating the way how color gets set on the selected nodes

Coloring the nodes now uses setAttribute command instead of relying on refrences to Nodes within the graph.

Author: waaake

meshroom/ui/commands.py

@@ -205,54 +205,6 @@ def undoImpl(self):
             self.graph.removeNode(duplicate)
 
 
-class UpdateNodeColorCommand(GraphCommand):
-    """ Command representing the work for Coloring nodes in the Graph.
-    """
-
-    def __init__(self, graph, nodes, color, parent=None):
-        """ Command Constructor.
-
-        Args:
-            graph (meshroom.core.Graph): Current Graph instance.
-            nodes (list<Node>): Array of nodes.
-            color (str): Hex code for the color.
-
-        Keyword Args:
-            parent (QObject): Parent QObject instance.
-        """
-        super(UpdateNodeColorCommand, self).__init__(graph, parent)
-        self._nodes = nodes
-        self._color = color
-
-        # Existing colors
-        # Map <Node: str>
-        # Holds the existing color of the node which can be applied on the node back in case of an undo
-        self._colorMap = {}
-
-        self.setText("Update Selected Node Color")
-
-    def redoImpl(self) -> bool:
-        """ Redo implementation.
-        """
-        for node in self._nodes:
-            # Update the existing color for the node in the map
-            self._colorMap[node] = node.color
-
-            # Now update the color of the node with the provided one
-            node.color = self._color
-
-        return True
-
-    def undoImpl(self):
-        """ Undo Implementation.
-        """
-        with GraphModification(self.graph):
-            # Revert the color for the nodes
-            for node in self._nodes:
-                # Get the color which was saved for the node
-                node.color = self._colorMap.get(node)
-
-
 class PasteNodesCommand(GraphCommand):
     """
     Handle node pasting in a Graph.

meshroom/ui/graph.py

@@ -953,15 +953,18 @@ def selectFollowing(self, node):
         self.selectNodes(self._graph.dfsOnDiscover(startNodes=[node], reverse=True, dependenciesOnly=True)[0])
 
     @Slot(str)
-    def updateNodeColor(self, color):
+    def setSelectedNodesColor(self, color):
         """ Sets the Provided color on the selected Nodes.
 
         Args:
             color (str): Hex code of the color to be set on the nodes.
         """
         # Update the color attribute of the nodes which are currently selected
         with self.groupedGraphModification("Update Color for Select Nodes"):
-            self.push(commands.UpdateNodeColorCommand(self._graph, list(self._selectedNodes), color))
+            # For each of the selected nodes -> Check if the node has a color -> Apply the color if it has
+            for node in self._selectedNodes:
+                if node.hasInternalAttribute("color"):
+                    self.setAttribute(node.internalAttribute("color"), color)
 
     @Slot(QObject, QObject)
     def boxSelect(self, selection, draggable):

meshroom/ui/qml/GraphEditor/GraphEditor.qml

@@ -1065,7 +1065,7 @@ Item {
 
                 // When a Color is selected
                 onColorSelected: (color)=> {
-                    uigraph.updateNodeColor(color)
+                    uigraph.setSelectedNodesColor(color)
                 }
             }
         }