[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/core/node.py

@@ -556,15 +556,6 @@ def getColor(self):
             return self.internalAttribute("color").value.strip()
         return ""
 
-    def setColor(self, color: str):
-        """ Sets the color of the Node.
-
-        Args:
-            color (str): The hex of the color to set on the node.
-        """
-        if self.hasInternalAttribute("color"):
-            self.internalAttribute("color").value = color
-
     def getInvalidationMessage(self):
         """
         Returns:
@@ -976,7 +967,7 @@ def _onAttributeChanged(self, attr: Attribute):
         if attr.value is None:
             # Discard dynamic values depending on the graph processing.
             return
-
+        
         if self.graph and self.graph.isLoading:
             # Do not trigger attribute callbacks during the graph loading.
             return
@@ -1365,7 +1356,7 @@ def hasSequenceOutputAttribute(self):
         False otherwise.
         """
         for attr in self._attributes:
-            if attr.enabled and attr.isOutput and (attr.desc.semantic == "sequence" or
+            if attr.enabled and attr.isOutput and (attr.desc.semantic == "sequence" or 
                                                    attr.desc.semantic == "imageList"):
                 return True
         return False
@@ -1395,7 +1386,7 @@ def has3DOutputAttribute(self):
     internalAttributes = Property(BaseObject, getInternalAttributes, constant=True)
     internalAttributesChanged = Signal()
     label = Property(str, getLabel, notify=internalAttributesChanged)
-    color = Property(str, getColor, setColor, notify=internalAttributesChanged)
+    color = Property(str, getColor, notify=internalAttributesChanged)
     invalidation = Property(str, getInvalidationMessage, notify=internalAttributesChanged)
     comment = Property(str, getComment, notify=internalAttributesChanged)
     internalFolderChanged = Signal()
@@ -1918,7 +1909,7 @@ def nodeFactory(nodeDict, name=None, template=False, uidConflict=False):
             # do not perform that check for internal attributes because there is no point in
             # raising compatibility issues if their number differs: in that case, it is only useful
             # if some internal attributes do not exist or are invalid
-            if not template and (sorted([attr.name for attr in nodeDesc.inputs
+            if not template and (sorted([attr.name for attr in nodeDesc.inputs 
                                          if not isinstance(attr, desc.PushButtonParam)]) != sorted(inputs.keys()) or
                                  sorted([attr.name for attr in nodeDesc.outputs if not attr.isDynamicValue]) !=
                                  sorted(outputs.keys())):

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: str):
         """ 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))
+        with self.groupedGraphModification("Set Nodes 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)
                 }
             }
         }