[ui] new concept of pickedViewId to scroll in 2D viewer without const…

…antly updating selectedViewId
alicevision · Apr 24, 2023 · e8cc706 · e8cc706
1 parent 1f5737f
commit e8cc706
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/meshroom/ui/qml/Viewer/SequencePlayer.qml b/meshroom/ui/qml/Viewer/SequencePlayer.qml
@@ -39,6 +39,16 @@ FloatingPane {
         return viewIds;
     }
 
+    function updateReconstructionView() {
+        if (_reconstruction && m.frame >= 0 && m.frame < m.sortedViewIds.length) {
+            if (m.syncSelected) {
+                _reconstruction.selectedViewId = m.sortedViewIds[m.frame];
+            } else {
+                _reconstruction.pickedViewId = m.sortedViewIds[m.frame];
+            }
+        }
+    }
+
     // Sequence player model:
     // - ordered set of viewpoints
     // - current frame
@@ -50,14 +60,17 @@ FloatingPane {
         property var viewpoints: currentCameraInit ? currentCameraInit.attribute('viewpoints').value : undefined
         property var sortedViewIds: viewpoints ? sequence(viewpoints) : []
         property int frame: 0
+        property bool syncSelected: true
         property bool playing: false
         property bool repeat: false
         property real fps: 1
 
         onFrameChanged: {
-            if (_reconstruction && frame >= 0 && frame < sortedViewIds.length) {
-                _reconstruction.selectedViewId = sortedViewIds[frame];
-            }
+            updateReconstructionView();
+        }
+
+        onSyncSelectedChanged: {
+            updateReconstructionView();
         }
     }
 
@@ -179,6 +192,10 @@ FloatingPane {
                 m.frame = value;
             }
 
+            onPressedChanged: {
+                m.syncSelected = !pressed;
+            }
+
             Connections {
                 target: m
                 onFrameChanged: {

diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml
@@ -219,7 +219,7 @@ FocusScope {
             return sourceExternal;
         }
         if (_reconstruction && (!displayedNode || outputAttribute.name == "gallery")) {
-            return Filepath.stringToUrl(getViewpointAttribute("path",_reconstruction.selectedViewId));
+            return Filepath.stringToUrl(getViewpointAttribute("path",_reconstruction.pickedViewId));
         }
 
         var viewId = -1;

diff --git a/meshroom/ui/reconstruction.py b/meshroom/ui/reconstruction.py
@@ -437,6 +437,7 @@ def __init__(self, undoStack, taskManager, defaultPipeline='', parent=None):
         self._solvedIntrinsics = None
         self._selectedViewId = None
         self._selectedViewpoint = None
+        self._pickedViewId = None
         self._liveSfmManager = LiveSfmManager(self)
 
         self._workerThreads = ThreadPool(processes=1)
@@ -1063,6 +1064,7 @@ def setSelectedViewId(self, viewId):
         if viewId == self._selectedViewId:
             return
         self._selectedViewId = viewId
+        self.setPickedViewId(viewId)
         vp = None
         if self.viewpoints:
             vp = next((v for v in self.viewpoints if str(v.viewId.value) == self._selectedViewId), None)
@@ -1075,6 +1077,12 @@ def _setSelectedViewpoint(self, viewpointAttribute):
             self._selectedViewpoint.deleteLater()
         self._selectedViewpoint = ViewpointWrapper(viewpointAttribute, self) if viewpointAttribute else None
 
+    def setPickedViewId(self, viewId):
+        if viewId == self._pickedViewId:
+            return
+        self._pickedViewId = viewId
+        self.pickedViewIdChanged.emit()
+
     def reconstructedCamerasCount(self):
         """ Get the number of reconstructed cameras in the current context. """
         viewpoints = self.getViewpoints()
@@ -1120,6 +1128,8 @@ def getPoseRT(self, viewpoint):
     selectedViewIdChanged = Signal()
     selectedViewId = Property(str, lambda self: self._selectedViewId, setSelectedViewId, notify=selectedViewIdChanged)
     selectedViewpoint = Property(ViewpointWrapper, lambda self: self._selectedViewpoint, notify=selectedViewIdChanged)
+    pickedViewIdChanged = Signal()
+    pickedViewId = Property(str, lambda self: self._pickedViewId, setPickedViewId, notify=pickedViewIdChanged)
 
     sfmChanged = Signal()
     sfm = Property(QObject, getSfm, setSfm, notify=sfmChanged)