From 5ff8b5cea067f6f9123c9e081062b959cd8178ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Thu, 3 Oct 2024 17:50:41 +0200 Subject: [PATCH 1/6] [nodes] `Publish`: Exposed the input list of files --- meshroom/nodes/aliceVision/Publish.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meshroom/nodes/aliceVision/Publish.py b/meshroom/nodes/aliceVision/Publish.py index 05024aa94b..2d41ef1336 100644 --- a/meshroom/nodes/aliceVision/Publish.py +++ b/meshroom/nodes/aliceVision/Publish.py @@ -28,6 +28,7 @@ class Publish(desc.Node): name="inputFiles", label="Input Files", description="Input files or folders' content to publish.", + exposed=True, group="", ), desc.File( From 56eebcbb9c78d21922fd093cf23a789736ef330d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Thu, 3 Oct 2024 18:03:32 +0200 Subject: [PATCH 2/6] [ui] Application: Fill window horizontally The content of the application was filling the window's size vertically, but not horizontally. --- meshroom/ui/qml/Application.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/ui/qml/Application.qml b/meshroom/ui/qml/Application.qml index ab06b9b347..155bbdd517 100644 --- a/meshroom/ui/qml/Application.qml +++ b/meshroom/ui/qml/Application.qml @@ -991,7 +991,7 @@ Page { MSplitView { id: topBottomSplit Layout.fillHeight: true - width: parent.width + Layout.fillWidth: true orientation: Qt.Vertical From 9b72d66fc194add614581235d28ffde71259b85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Thu, 3 Oct 2024 18:03:59 +0200 Subject: [PATCH 3/6] [ui] Homepage: Adjust the minimum width to correctly fit logos --- meshroom/ui/qml/Homepage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/ui/qml/Homepage.qml b/meshroom/ui/qml/Homepage.qml index 66e9bf8b2d..f036d7f340 100644 --- a/meshroom/ui/qml/Homepage.qml +++ b/meshroom/ui/qml/Homepage.qml @@ -22,7 +22,7 @@ Page { Item { - SplitView.minimumWidth: 100 + SplitView.minimumWidth: 250 SplitView.preferredWidth: 330 SplitView.maximumWidth: 500 From 4d2aa795f1ea40970316afa2b1563b546f5b51c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Thu, 3 Oct 2024 18:10:48 +0200 Subject: [PATCH 4/6] [GraphEditor] AttributePin: Fix condition for the highlight pin display --- meshroom/ui/qml/GraphEditor/AttributePin.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meshroom/ui/qml/GraphEditor/AttributePin.qml b/meshroom/ui/qml/GraphEditor/AttributePin.qml index d9eee14241..a4e710822f 100755 --- a/meshroom/ui/qml/GraphEditor/AttributePin.qml +++ b/meshroom/ui/qml/GraphEditor/AttributePin.qml @@ -236,7 +236,8 @@ RowLayout { anchors.fill: parent anchors.margins: 2 color: { - if ((!object.hasOutputConnections && object.enabled) && outputConnectMA.containsMouse || outputConnectMA.drag.active || (outputDropArea.containsDrag && outputDropArea.acceptableDrop)) + if (object.enabled && (outputConnectMA.containsMouse || outputConnectMA.drag.active || + (outputDropArea.containsDrag && outputDropArea.acceptableDrop))) return Colors.sysPalette.highlight return Colors.sysPalette.text } From e5189fbca29d8867999fd0738aeb197f508cf89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Fri, 4 Oct 2024 18:06:23 +0200 Subject: [PATCH 5/6] [Viewer] SequencePlayer: Prevent null accesses When the SequencePlayer isn't available (when QtAliceVision has not been loaded), the `viewer` element is null. All accesses to properties of this object should thus be prevented. --- meshroom/ui/qml/Viewer/SequencePlayer.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshroom/ui/qml/Viewer/SequencePlayer.qml b/meshroom/ui/qml/Viewer/SequencePlayer.qml index 54c435f84b..d9b765d760 100644 --- a/meshroom/ui/qml/Viewer/SequencePlayer.qml +++ b/meshroom/ui/qml/Viewer/SequencePlayer.qml @@ -385,7 +385,7 @@ FloatingPane { verticalAlignment: Text.AlignVCenter text: { // number of cached frames is the difference between the first and last frame of all intervals in the cache - let cachedFrames = viewer.cachedFrames + let cachedFrames = viewer ? viewer.cachedFrames : [] let cachedFramesCount = 0 for (let i = 0; i < cachedFrames.length; i++) { cachedFramesCount += cachedFrames[i].y - cachedFrames[i].x + 1 @@ -420,7 +420,7 @@ FloatingPane { ProgressBar { id: occupiedCacheProgressBar - property string occupiedCache: viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0 + property string occupiedCache: viewer && viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0 width: parent.width From dcece1d0c2ea3ffb6b879fee09a432831cf26112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Fri, 4 Oct 2024 18:08:16 +0200 Subject: [PATCH 6/6] [GraphEditor] Stop manually editing pins based on the edge's visibility Editing the pins manually was useful when trying to hide fully the connection whenever there was an edge connected to an attribute that was disabled. Disabled attributes now have a special display if they are connected, meaning both ends of the edge do not need artificial updates. --- meshroom/ui/qml/GraphEditor/GraphEditor.qml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/meshroom/ui/qml/GraphEditor/GraphEditor.qml b/meshroom/ui/qml/GraphEditor/GraphEditor.qml index 3f400da525..7467e83ab9 100755 --- a/meshroom/ui/qml/GraphEditor/GraphEditor.qml +++ b/meshroom/ui/qml/GraphEditor/GraphEditor.qml @@ -521,22 +521,6 @@ Item { } } } - onVisibleChanged: { - if (visible) { - // Enable the pins on both sides - src.updatePin(true, true) // isSrc = true, isVisible = true - dst.updatePin(false, true) // isSrc = false, isVisible = true - } else { - // One of the attributes is visible, we do not need to handle the case where both attributes are hidden - if (isValidEdge && (src.visible || dst.visible)) { - if (src.visible) { - src.updatePin(true, false) // isSrc = true, isVisible = false - } else { - dst.updatePin(false, false) // isSrc = false, isVisible = false - } - } - } - } Component.onDestruction: { // Handles the case where the edge is destroyed while hidden because it is replaced: the pins should be re-enabled