3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] get reconstruction statuses from updated poseIds in sfm result

Browse source 
* compatibility with rigs, where poseId of views are updated after SfM
* count the number of reconstructed viewpoints based on this
This commit is contained in:
Yann Lanthony 2018-10-11 20:22:26 +02:00
parent 465d1fb6c8
commit 7c2255c090
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meshroom/ui/reconstruction.py
View file

@ -444,8 +444,8 @@ class Reconstruction(UIGraph):
Update internal views and poses based on the current SfM node. Update internal views and poses based on the current SfM node.
""" """
if not self._sfm: if not self._sfm:
self._views = [] self._views = dict()
self._poses = [] self._poses = dict()
else: else:
self._views, self._poses = self._sfm.nodeDesc.getViewsAndPoses(self._sfm) self._views, self._poses = self._sfm.nodeDesc.getViewsAndPoses(self._sfm)
self.sfmReportChanged.emit() self.sfmReportChanged.emit()
@ -492,8 +492,9 @@ class Reconstruction(UIGraph):
@Slot(QObject, result=bool) @Slot(QObject, result=bool)
def isReconstructed(self, viewpoint): def isReconstructed(self, viewpoint):
# keys are strings (faster lookup) # fetch up-to-date poseId from sfm result (in case of rigs, poseId might have changed)
return str(viewpoint.poseId.value) in self._poses view = self._views.get(str(viewpoint.poseId.value), None) # keys are strings (faster lookup)
return view.get('poseId', -1) in self._poses if view else False
@Slot(QObject, result=bool) @Slot(QObject, result=bool)
def hasValidIntrinsic(self, viewpoint): def hasValidIntrinsic(self, viewpoint):
@ -512,6 +513,11 @@ class Reconstruction(UIGraph):
self._selectedViewId = viewId self._selectedViewId = viewId
self.selectedViewIdChanged.emit() self.selectedViewIdChanged.emit()
def reconstructedCamerasCount(self):
""" Get the number of reconstructed cameras in the current context. """
return len([v for v in self.getViewpoints() if self.isReconstructed(v)])
selectedViewIdChanged = Signal() selectedViewIdChanged = Signal()
selectedViewId = Property(str, lambda self: self._selectedViewId, setSelectedViewId, notify=selectedViewIdChanged) selectedViewId = Property(str, lambda self: self._selectedViewId, setSelectedViewId, notify=selectedViewIdChanged)
@ -522,7 +528,7 @@ class Reconstruction(UIGraph):
sfmReport = Property(bool, lambda self: len(self._poses) > 0, notify=sfmReportChanged) sfmReport = Property(bool, lambda self: len(self._poses) > 0, notify=sfmReportChanged)
sfmAugmented = Signal(Node, Node) sfmAugmented = Signal(Node, Node)
nbCameras = Property(int, lambda self: len(self._poses), notify=sfmReportChanged) nbCameras = Property(int, reconstructedCamerasCount, notify=sfmReportChanged)
# Signals to propagate high-level messages # Signals to propagate high-level messages
error = Signal(Message) error = Signal(Message)