[ui] AttributeEditor: Feature/attribute navigation buttons

meshroom/core/attribute.py

@@ -12,6 +12,11 @@
 from meshroom.common import BaseObject, Property, Variant, Signal, ListModel, DictModel, Slot
 from meshroom.core import desc, hashValue
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from meshroom.core.graph import Edge
+
 
 def attributeFactory(description, value, isOutput, node, root=None, parent=None):
     """
@@ -326,6 +331,33 @@
                 any(attr.hasOutputConnections for attr in self._value if hasattr(attr, 'hasOutputConnections'))
         return next((edge for edge in self.node.graph.edges.values() if edge.src == self), None) is not None
 
+    def getInputConnections(self) -> list["Edge"]:
+        """ Retrieve the upstreams connected edges """
+
+        if not self.node.graph or not self.node.graph.edges:
+            return []
+
+        return [edge for edge in self.node.graph.edges.values() if edge.dst == self]
+
+    def getOutputConnections(self) -> list["Edge"]:
+        """ Retrieve all the edges connected to this attribute """
+
+        if not self.node.graph or not self.node.graph.edges:
+            return []
+
+        return [edge for edge in self.node.graph.edges.values() if edge.src == self]
+
+    def getInputAttributes(self) -> list["Edge"]:
+        """ Return the upstreams connected attributes  """
+
+        return [edge.src for edge in self.getInputConnections()]
+
+
+    def getOutputAttributes(self):
+        """ Return the downstreams connected attributes """
+
+        return [edge.dst for edge in self.getOutputConnections()]
+
     def _applyExpr(self):
         """
         For string parameters with an expression (when loaded from file),
@@ -449,6 +481,8 @@
     isLinkNested = isLink
     hasOutputConnectionsChanged = Signal()
     hasOutputConnections = Property(bool, hasOutputConnections.fget, notify=hasOutputConnectionsChanged)
+    inputAttributes = Property(Variant, getInputAttributes)
+    outputAttributes = Property(Variant, getOutputAttributes)
     isDefault = Property(bool, _isDefault, notify=valueChanged)
     linkParam = Property(BaseObject, getLinkParam, notify=isLinkChanged)
     rootLinkParam = Property(BaseObject, lambda self: self.getLinkParam(recursive=True), notify=isLinkChanged)

meshroom/ui/qml/Application.qml

@@ -1342,7 +1342,33 @@ Page {
                     onUpgradeRequest: {
                         var n = _reconstruction.upgradeNode(node)
                         _reconstruction.selectedNode = n
+                    }                   
+
+                    onInAttributeClicked: function(mouse, inAttributes) {
+                        selectNodesFromAttributes(inAttributes)
+                    }
+
+                    onOutAttributeClicked: function(mouse, outAttributes) {                        
+                        selectNodesFromAttributes(outAttributes)
                     }
+
+                    function selectNodesFromAttributes(attributes) {
+                        /*
+                            Retrieve the nodes from given attributes, and select its 
+                        */
+
+                        if ( !attributes || attributes.length == 0) { return }
+
+                        graphEditor.uigraph.clearNodeSelection()
+
+                        const nodes = attributes.map( attr => attr.node)
+
+                        if (attributes.length == 1) {
+                            _reconstruction.selectedNode = attributes[0].node
+                        }
+                        graphEditor.uigraph.selectNodes(nodes)
+                    } 
+
                 }
             }
         }

meshroom/ui/qml/GraphEditor/AttributeEditor.qml

@@ -16,6 +16,8 @@ ListView {
 
     signal upgradeRequest()
     signal attributeDoubleClicked(var mouse, var attribute)
+    signal inAttributeClicked(var mouse, var inAttributes)
+    signal outAttributeClicked(var mouse, var outAttributes)
 
     implicitHeight: contentHeight
 
@@ -40,9 +42,17 @@ ListView {
             filterText: root.filterText
             objectsHideable: root.objectsHideable
             attribute: object
+
             onDoubleClicked: function(mouse, attr) {
                 root.attributeDoubleClicked(mouse, attr)
             }
+            onInAttributeClicked: function(mouse, inAttributes) {
+                root.inAttributeClicked(mouse, inAttributes)
+            }
+            onOutAttributeClicked: function(mouse, outAttributes) {
+                root.outAttributeClicked(mouse, outAttributes)
+            }
+
         }
 
         onActiveChanged: height = active ? item.implicitHeight : -spacing

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -26,6 +26,8 @@ RowLayout {
     readonly property bool editable: !attribute.isOutput && !attribute.isLink && !readOnly
 
     signal doubleClicked(var mouse, var attr)
+    signal inAttributeClicked(var mouse, var inAttributes)
+    signal outAttributeClicked(var mouse, var outAttributes)
 
     spacing: 2
 
@@ -56,6 +58,24 @@ RowLayout {
             width: parent.width
             height: parent.height
 
+            // In connection
+            MaterialToolButton {
+                property var shouldBeVisible: (object != undefined && object.isLink)
+
+                text: shouldBeVisible ? MaterialIcons.login : " "
+                enabled: shouldBeVisible
+                font.pointSize: 8
+                anchors.top: parent.top
+                anchors.left: parent.left
+                topPadding: 7
+                ToolTip.text: shouldBeVisible ? object.linkParam.label : ""
+
+                onClicked: function(mouse) {
+                    root.inAttributeClicked(mouse, object.inputAttributes)               
+                }
+
+            }
+
             Label {
                 id: parameterLabel
 
@@ -167,6 +187,23 @@ RowLayout {
                     }
                 }
             }
+
+            MaterialToolButton {
+                property var shouldBeVisible: (attribute != undefined && attribute.hasOutputConnections)
+
+                text: shouldBeVisible ? MaterialIcons.logout : ""
+                font.pointSize: 8
+                enabled: shouldBeVisible
+                anchors.top: parent.top
+                anchors.right: parent.right
+                topPadding: 7
+
+                onClicked: function(mouse) {
+                    root.outAttributeClicked(mouse, attribute.outputAttributes)               
+                }
+
+            }
+
             MaterialLabel {
                 visible: attribute.desc.advanced
                 text: MaterialIcons.build
@@ -666,6 +703,8 @@ RowLayout {
                                 obj.label.horizontalAlignment = Text.AlignHCenter
                                 obj.label.verticalAlignment = Text.AlignVCenter
                                 obj.doubleClicked.connect(function(attr) { root.doubleClicked(attr) })
+                                obj.inAttributeClicked.connect(function(mouse, inAttributes) { root.inAttributeClicked(mouse, inAttributes) })
+                                obj.outAttributeClicked.connect(function(mouse, outAttributes) { root.outAttributeClicked(mouse, outAttributes) })
                             }
                             ToolButton {
                                 enabled: root.editable

meshroom/ui/qml/GraphEditor/NodeEditor.qml

@@ -21,6 +21,8 @@ Panel {
     property string nodeStartDateTime: ""
 
     signal attributeDoubleClicked(var mouse, var attribute)
+    signal inAttributeClicked(var mouse, var inAttributes)
+    signal outAttributeClicked(var mouse, var outAttributes)
     signal upgradeRequest()
 
     title: "Node" + (node !== null ? " - <b>" + node.label + "</b>" + (node.label !== node.defaultLabel ? " (" + node.defaultLabel + ")" : "") : "")
@@ -301,6 +303,13 @@ Panel {
                             onAttributeDoubleClicked: function(mouse, attribute) { root.attributeDoubleClicked(mouse, attribute) }
                             onUpgradeRequest: root.upgradeRequest()
                             filterText: searchBar.text
+
+                            onInAttributeClicked: function(mouse, inAttributes) {
+                                root.inAttributeClicked(mouse, inAttributes)
+                            }
+                            onOutAttributeClicked: function(mouse, outAttributes) {
+                                root.outAttributeClicked(mouse, outAttributes)
+                            }
                         }
 
                         Loader {

tests/test_attributes.py

@@ -0,0 +1,29 @@
+from meshroom.core.graph import Graph
+
+
+def test_attribute_retrieve_linked_input_and_output_attributes():
+    """
+    Check that an attribute can retrieve the linked input and output attributes
+    """
+
+    # n0 -- n1 -- n2
+    #   \          \
+    #    ---------- n3
+
+    g = Graph('')
+    n0 = g.addNewNode('Ls', input='')
+    n1 = g.addNewNode('Ls', input=n0.output)
+    n2 = g.addNewNode('Ls', input=n1.output)
+    n3 = g.addNewNode('AppendFiles', input=n1.output, input2=n2.output)
+
+    # check that the attribute can retrieve its linked input attributes
+    assert len(n0.input.getInputAttributes()) == 0
+    assert len(n1.input.getInputAttributes()) == 1
+    assert n1.input.getInputAttributes()[0] == n0.output
+
+    assert len(n1.output.getOutputAttributes()) == 2
+
+    assert n1.output.getOutputAttributes()[0] == n2.input
+    assert n1.output.getOutputAttributes()[1] == n3.input
+
+