3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-30 23:08:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Attribute becomes grey in graph editor and attribute editor when connected but disabled

Browse source 
If attribute is disabled but has output connections, it becomes grey.
If the connection is removed while being disabled, it hides itself.

Both is working in GraphEditor on the nodes and in the AttributeEditor.
This commit is contained in:
Aurore LAFAURIE 2024-03-25 17:58:56 +01:00 • committed by Candice Bentéjac
parent 6f1ac9a06e
commit 1b55dc8649
5 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshroom/core/attribute.py
View file

@ -251,7 +251,7 @@ class Attribute(BaseObject):
@property
def isLink(self):
""" Whether the attribute is a link to another attribute. """
""" Whether the input attribute is a link to another attribute. """
# note: directly use self.node.graph._edges to avoid using the property that may become invalid at some point
return self.node.graph and self.isInput and self.node.graph._edges and self in self.node.graph._edges.keys()

2
meshroom/ui/qml/GraphEditor/AttributeEditor.qml
View file

@ -25,7 +25,7 @@ ListView {
ScrollBar.vertical: ScrollBar { id: scrollBar }
delegate: Loader {
active: object.enabled && (
active: (object.enabled || object.hasOutputConnections) && (
!objectsHideable
|| ((!object.desc.advanced || GraphEditorSettings.showAdvancedAttributes)
&& (object.isDefault && GraphEditorSettings.showDefaultAttributes || !object.isDefault && GraphEditorSettings.showModifiedAttributes)

5
meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml
View file

@ -65,6 +65,11 @@ RowLayout {
text: object.label
color: {
if (object.hasOutputConnections && !object.enabled) return "grey"
else return "white"
}
// Tooltip hint with attribute's description
ToolTip {
id: parameterTooltip

7
meshroom/ui/qml/GraphEditor/AttributePin.qml
View file

@ -200,7 +200,10 @@ RowLayout {
horizontalAlignment: attribute && attribute.isOutput ? Text.AlignRight : Text.AlignLeft
anchors.right: attribute && attribute.isOutput ? parent.right : undefined
rightPadding: 0
color: hovered ? palette.highlight : palette.text
color: {
if (object.hasOutputConnections && !object.enabled) return "grey"
return hovered ? palette.highlight : palette.text
}
}
}
@ -226,7 +229,7 @@ RowLayout {
anchors.fill: parent
anchors.margins: 2
color: {
if (outputConnectMA.containsMouse || outputConnectMA.drag.active || (outputDropArea.containsDrag && outputDropArea.acceptableDrop))
if ((!object.hasOutputConnections && object.enabled) && outputConnectMA.containsMouse || outputConnectMA.drag.active || (outputDropArea.containsDrag && outputDropArea.acceptableDrop))
return Colors.sysPalette.highlight
return Colors.sysPalette.text
}

2
meshroom/ui/qml/GraphEditor/Node.qml
View file

@ -394,7 +394,7 @@ Item {
delegate: Loader {
id: outputLoader
active: object.isOutput && isFileAttributeBaseType(object)
visible: object.enabled
visible: object.enabled || object.hasOutputConnections
anchors.right: parent.right
width: outputs.width