Skip to content

[ui] Use ExportAnimatedCamera output for image overlay in Viewer3D #2398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 31, 2024
Merged

[ui] Use ExportAnimatedCamera output for image overlay in Viewer3D #2398

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad7745a
[ui] Undistorted images depend now also on ExportAnimatedCamera if ex…
Just-Kiel May 2, 2024
f6332ef
[ui] uvCenterOffset set according to principal point corrected or not…
Just-Kiel May 16, 2024
0899900
[nodes] <FILESTEM> added and changed in nodes values
Just-Kiel May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions meshroom/ui/reconstruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class ViewpointWrapper(QObject):

initialParamsChanged = Signal()
sfmParamsChanged = Signal()
denseSceneParamsChanged = Signal()
undistortedImageParamsChanged = Signal()
internalChanged = Signal()

def __init__(self, viewpointAttribute, reconstruction):
Expand All @@ -194,16 +194,18 @@ def __init__(self, viewpointAttribute, reconstruction):
# PrepareDenseScene
self._undistortedImagePath = ''
self._activeNode_PrepareDenseScene = self._reconstruction.activeNodes.get("PrepareDenseScene")
self._activeNode_ExportAnimatedCamera = self._reconstruction.activeNodes.get("ExportAnimatedCamera")

# update internally cached variables
self._updateInitialParams()
self._updateSfMParams()
self._updateDenseSceneParams()
self._updateUndistortedImageParams()

# trigger internal members updates when reconstruction members changes
self._reconstruction.cameraInitChanged.connect(self._updateInitialParams)
self._reconstruction.sfmReportChanged.connect(self._updateSfMParams)
self._activeNode_PrepareDenseScene.nodeChanged.connect(self._updateDenseSceneParams)
self._activeNode_PrepareDenseScene.nodeChanged.connect(self._updateUndistortedImageParams)
self._activeNode_ExportAnimatedCamera.nodeChanged.connect(self._updateUndistortedImageParams)

def _updateInitialParams(self):
""" Update internal members depending on CameraInit. """
Expand Down Expand Up @@ -235,15 +237,20 @@ def _updateSfMParams(self):
self._reconstructed = self._R is not None
self.sfmParamsChanged.emit()

def _updateDenseSceneParams(self):
""" Update internal members depending on PrepareDenseScene. """
def _updateUndistortedImageParams(self):
""" Update internal members depending on PrepareDenseScene or ExportAnimatedCamera. """
# undistorted image path
if not self._activeNode_PrepareDenseScene.node:
if not self._activeNode_PrepareDenseScene.node or not self._activeNode_ExportAnimatedCamera.node:
# if not self._activeNode_PrepareDenseScene.node:
self._undistortedImagePath = ''
if self._activeNode_ExportAnimatedCamera.node:
basename = "{}_{}".format(self._viewpoint.intrinsicId.value, os.path.basename(self._viewpoint.path.value))
filename = "{}.{}".format(os.path.splitext(basename)[0], self._activeNode_ExportAnimatedCamera.node.undistortedImageType.value)
self._undistortedImagePath = os.path.join(self._activeNode_ExportAnimatedCamera.node.output.value, "undistort", filename)
else:
filename = "{}.{}".format(self._viewpoint.viewId.value, self._activeNode_PrepareDenseScene.node.outputFileType.value)
self._undistortedImagePath = os.path.join(self._activeNode_PrepareDenseScene.node.output.value, filename)
self.denseSceneParamsChanged.emit()
self.undistortedImageParamsChanged.emit()

# Get the underlying Viewpoint attribute wrapped by this Viewpoint.
attribute = Property(QObject, lambda self: self._viewpoint, constant=True)
Expand Down Expand Up @@ -350,7 +357,7 @@ def fieldOfView(self):
sensorHeight = self.solvedIntrinsics["sensorHeight"]
return 2.0 * math.atan(float(sensorHeight) / (2.0 * float(focalLength))) * 180.0 / math.pi

@Property(type=QUrl, notify=denseSceneParamsChanged)
@Property(type=QUrl, notify=undistortedImageParamsChanged)
def undistortedImageSource(self):
""" Get path to undistorted image source if available. """
return QUrl.fromLocalFile(self._undistortedImagePath)
Expand Down