[Viewer3D] Display resection IDs of the active 3D model

Instead of displaying the resection IDs of the 3D model that was loaded last, update the display whenever the active model selection changes.
alicevision · Nov 6, 2023 · 80b9f81 · 80b9f81
1 parent 08404f1
commit 80b9f81
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/meshroom/ui/qml/Viewer3D/Inspector3D.qml b/meshroom/ui/qml/Viewer3D/Inspector3D.qml
@@ -381,12 +381,25 @@ FloatingPane {
                                 if(mouse.button == Qt.RightButton)
                                     contextMenu.popup();
                                 mediaListView.currentIndex = index;
+
+                                // Update the resection ID-related objects based on the active model
+                                Viewer3DSettings.resectionIdCount = model.resectionIdCount
+                                Viewer3DSettings.resectionGroups = model.resectionGroups
+                                Viewer3DSettings.resectionId = model.resectionId
+                                resectionIdSlider.value = model.resectionId
                             }
                             onDoubleClicked: {
                                 model.visible = true;
                                 nodeActivated(model.attribute.node);
                             }
 
+                            Connections {
+                                target: resectionIdSlider
+                                function onValueChanged() {
+                                    model.resectionId = resectionIdSlider.value
+                                }
+                            }
+
                             RowLayout {
                                 width: parent.width
                                 spacing: 2

diff --git a/meshroom/ui/qml/Viewer3D/MediaLibrary.qml b/meshroom/ui/qml/Viewer3D/MediaLibrary.qml
@@ -58,6 +58,9 @@ Entity {
             "faceCount": 0,
             "cameraCount": 0,
             "textureCount": 0,
+            "resectionIdCount": 0,
+            "resectionId": 0,
+            "resectionGroups": [],
             "status": SceneLoader.None
         })
     }
@@ -309,7 +312,7 @@ Entity {
                     if(object) {
                         // bind media info to corresponding model roles
                         // (test for object validity to avoid error messages right after object has been deleted)
-                        var boundProperties = ["vertexCount", "faceCount", "cameraCount", "textureCount"];
+                        var boundProperties = ["vertexCount", "faceCount", "cameraCount", "textureCount", "resectionIdCount", "resectionId", "resectionGroups"];
                         boundProperties.forEach( function(prop){
                             model[prop] = Qt.binding(function() { return object ? object[prop] : 0; });
                         })

diff --git a/meshroom/ui/qml/Viewer3D/MediaLoader.qml b/meshroom/ui/qml/Viewer3D/MediaLoader.qml
@@ -111,6 +111,9 @@ import Utils 1.0
                     }
                     Viewer3DSettings.resectionIdCount = obj.countResectionIds();
                     Viewer3DSettings.resectionGroups = obj.countResectionGroups(Viewer3DSettings.resectionIdCount + 1);
+                    resectionIdCount = Viewer3DSettings.resectionIdCount
+                    resectionGroups = Viewer3DSettings.resectionGroups
+                    resectionId = Viewer3DSettings.resectionIdCount
                     root.status = obj.status;
                 })
             }

diff --git a/meshroom/ui/qml/Viewer3D/MediaLoaderEntity.qml b/meshroom/ui/qml/Viewer3D/MediaLoaderEntity.qml
@@ -17,4 +17,10 @@ Entity {
     property int cameraCount
     /// Number of textures
     property int textureCount
+    /// Number of resection IDs
+    property int resectionIdCount
+    /// Current resection ID
+    property int resectionId
+    /// Groups of cameras based on resection IDs
+    property var resectionGroups
 }