mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-05-23 14:06:28 +02:00
[ui] GraphEditor: visualize edges between params (non File attributes)
This commit is contained in:
Fabien Castan
parent
b75ccdb02f
commit
ecf10a65f7
3 changed files with 254 additions and 158 deletions
|
|
@ -137,7 +137,7 @@ class Attribute(BaseObject):
|
|||
self.valueChanged.emit()
|
||||
|
||||
def resetValue(self):
|
||||
self._value = ""
|
||||
self._value = self.attributeDesc.value
|
||||
|
||||
def requestGraphUpdate(self):
|
||||
if self.node.graph:
|
||||
|
|
|
|||
|
|
@ -236,10 +236,10 @@ Item {
|
|||
model: nodeRepeater.loaded && root.graph ? root.graph.edges : undefined
|
||||
|
||||
delegate: Edge {
|
||||
property var src: edge ? root._attributeToDelegate[edge.src] : undefined
|
||||
property var dst: edge ? root._attributeToDelegate[edge.dst] : undefined
|
||||
property var srcAnchor: src.nodeItem.mapFromItem(src, src.outputAnchorPos.x, src.outputAnchorPos.y)
|
||||
property var dstAnchor: dst.nodeItem.mapFromItem(dst, dst.inputAnchorPos.x, dst.inputAnchorPos.y)
|
||||
property var src: root._attributeToDelegate[edge.src]
|
||||
property var dst: root._attributeToDelegate[edge.dst]
|
||||
property bool isValidEdge: src != undefined && dst != undefined
|
||||
visible: isValidEdge
|
||||
|
||||
property bool inFocus: containsMouse || (edgeMenu.opened && edgeMenu.currentEdge == edge)
|
||||
|
||||
|
|
@ -247,10 +247,10 @@ Item {
|
|||
color: inFocus ? activePalette.highlight : activePalette.text
|
||||
thickness: inFocus ? 2 : 1
|
||||
opacity: 0.7
|
||||
point1x: src.nodeItem.x + srcAnchor.x
|
||||
point1y: src.nodeItem.y + srcAnchor.y
|
||||
point2x: dst.nodeItem.x + dstAnchor.x
|
||||
point2y: dst.nodeItem.y + dstAnchor.y
|
||||
point1x: isValidEdge ? src.globalX + src.outputAnchorPos.x : 0
|
||||
point1y: isValidEdge ? src.globalY + src.outputAnchorPos.y : 0
|
||||
point2x: isValidEdge ? dst.globalX + dst.inputAnchorPos.x : 0
|
||||
point2y: isValidEdge ? dst.globalY + dst.inputAnchorPos.y : 0
|
||||
onPressed: {
|
||||
const canEdit = !edge.dst.node.locked
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,11 @@ Item {
|
|||
readonly property color defaultColor: isCompatibilityNode ? "#444" : activePalette.base
|
||||
property color baseColor: defaultColor
|
||||
|
||||
Item {
|
||||
id: m
|
||||
property bool displayParams: false
|
||||
}
|
||||
|
||||
// Mouse interaction related signals
|
||||
signal pressed(var mouse)
|
||||
signal doubleClicked(var mouse)
|
||||
|
|
@ -60,7 +65,7 @@ Item {
|
|||
}
|
||||
|
||||
// Whether an attribute can be displayed as an attribute pin on the node
|
||||
function isDisplayableAsPin(attribute) {
|
||||
function isFileAttributeBaseType(attribute) {
|
||||
// ATM, only File attributes are meant to be connected
|
||||
// TODO: review this if we want to connect something else
|
||||
return attribute.type == "File"
|
||||
|
|
@ -110,7 +115,7 @@ Item {
|
|||
|
||||
// Selection border
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
anchors.fill: nodeContent
|
||||
anchors.margins: -border.width
|
||||
visible: root.selected || root.hovered
|
||||
border.width: 2.5
|
||||
|
|
@ -120,10 +125,9 @@ Item {
|
|||
color: "transparent"
|
||||
}
|
||||
|
||||
// Background
|
||||
Rectangle {
|
||||
id: background
|
||||
anchors.fill: parent
|
||||
anchors.fill: nodeContent
|
||||
color: Qt.lighter(activePalette.base, 1.4)
|
||||
layer.enabled: true
|
||||
layer.effect: DropShadow { radius: 3; color: shadowColor }
|
||||
|
|
@ -131,6 +135,12 @@ Item {
|
|||
opacity: 0.7
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: nodeContent
|
||||
width: parent.width
|
||||
height: childrenRect.height
|
||||
color: "transparent"
|
||||
|
||||
// Data Layout
|
||||
Column {
|
||||
id: body
|
||||
|
|
@ -263,6 +273,7 @@ Item {
|
|||
enabled: !root.readOnly && !root.isCompatibilityNode
|
||||
|
||||
Column {
|
||||
id: attributesColumn
|
||||
width: parent.width
|
||||
spacing: 5
|
||||
bottomPadding: 2
|
||||
|
|
@ -276,7 +287,7 @@ Item {
|
|||
|
||||
delegate: Loader {
|
||||
id: outputLoader
|
||||
active: object.isOutput && isDisplayableAsPin(object)
|
||||
active: object.isOutput && isFileAttributeBaseType(object)
|
||||
anchors.right: parent.right
|
||||
width: outputs.width
|
||||
|
||||
|
|
@ -285,6 +296,9 @@ Item {
|
|||
nodeItem: root
|
||||
attribute: object
|
||||
|
||||
property real globalX: root.x + nodeAttributes.x + outputs.x + outputLoader.x + outPin.x
|
||||
property real globalY: root.y + nodeAttributes.y + outputs.y + outputLoader.y + outPin.y
|
||||
|
||||
readOnly: root.readOnly
|
||||
onPressed: root.pressed(mouse)
|
||||
Component.onCompleted: attributePinCreated(object, outPin)
|
||||
|
|
@ -301,13 +315,79 @@ Item {
|
|||
Repeater {
|
||||
model: node ? node.attributes : undefined
|
||||
delegate: Loader {
|
||||
active: !object.isOutput && isDisplayableAsPin(object)
|
||||
id: inputLoader
|
||||
active: !object.isOutput && isFileAttributeBaseType(object)
|
||||
width: inputs.width
|
||||
|
||||
sourceComponent: AttributePin {
|
||||
id: inPin
|
||||
nodeItem: root
|
||||
attribute: object
|
||||
|
||||
property real globalX: root.x + nodeAttributes.x + inputs.x + inputLoader.x + inPin.x
|
||||
property real globalY: root.y + nodeAttributes.y + inputs.y + inputLoader.y + inPin.y
|
||||
|
||||
readOnly: root.readOnly
|
||||
Component.onCompleted: attributePinCreated(attribute, inPin)
|
||||
Component.onDestruction: attributePinDeleted(attribute, inPin)
|
||||
onPressed: root.pressed(mouse)
|
||||
onChildPinCreated: attributePinCreated(childAttribute, inPin)
|
||||
onChildPinDeleted: attributePinDeleted(childAttribute, inPin)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Vertical Spacer
|
||||
Rectangle {
|
||||
height: inputParams.height > 0 ? 3 : 0
|
||||
visible: (height == 3)
|
||||
Behavior on height { PropertyAnimation {easing.type: Easing.Linear} }
|
||||
width: parent.width
|
||||
color: Colors.sysPalette.mid
|
||||
MaterialToolButton {
|
||||
text: " "
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
padding: 0
|
||||
spacing: 0
|
||||
anchors.margins: 0
|
||||
font.pointSize: 6
|
||||
onClicked: {
|
||||
m.displayParams = ! m.displayParams
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: inputParamsRect
|
||||
width: parent.width
|
||||
height: childrenRect.height
|
||||
color: "transparent"
|
||||
|
||||
Column {
|
||||
id: inputParams
|
||||
width: parent.width
|
||||
spacing: 3
|
||||
Repeater {
|
||||
id: inputParamsRepeater
|
||||
model: node ? node.attributes : undefined
|
||||
delegate: Loader {
|
||||
id: paramLoader
|
||||
active: !object.isOutput && !isFileAttributeBaseType(object)
|
||||
property bool isFullyActive: (m.displayParams || object.isLink || object.hasOutputConnections)
|
||||
width: parent.width
|
||||
|
||||
sourceComponent: AttributePin {
|
||||
id: inPin
|
||||
nodeItem: root
|
||||
property real globalX: root.x + nodeAttributes.x + inputParamsRect.x + paramLoader.x + inPin.x
|
||||
property real globalY: root.y + nodeAttributes.y + inputParamsRect.y + paramLoader.y + inPin.y
|
||||
|
||||
height: isFullyActive ? childrenRect.height : 0
|
||||
Behavior on height { PropertyAnimation {easing.type: Easing.Linear} }
|
||||
visible: (height == childrenRect.height)
|
||||
attribute: object
|
||||
readOnly: root.readOnly
|
||||
Component.onCompleted: attributePinCreated(attribute, inPin)
|
||||
Component.onDestruction: attributePinDeleted(attribute, inPin)
|
||||
|
|
@ -319,6 +399,22 @@ Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
MaterialToolButton {
|
||||
text: root.hovered ? (m.displayParams ? MaterialIcons.arrow_drop_up : MaterialIcons.arrow_drop_down) : " "
|
||||
Layout.alignment: Qt.AlignBottom
|
||||
width: parent.width
|
||||
height: 5
|
||||
padding: 0
|
||||
spacing: 0
|
||||
anchors.margins: 0
|
||||
font.pointSize: 10
|
||||
onClicked: {
|
||||
m.displayParams = ! m.displayParams
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue