ENH: Update EndoscopyLogic to support saving camera view angle

jcfr · Dec 8, 2023 · 58fafb5 · 58fafb5
1 parent a418b96
commit 58fafb5
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/Modules/Scripted/Endoscopy/Endoscopy.py b/Modules/Scripted/Endoscopy/Endoscopy.py
@@ -301,12 +301,14 @@ def setInputCurve(self, newInputCurve):
         """Set and observe a curve node."""
 
         if self.inputCurve is not None:
+            self.removeObserver(self.inputCurve, vtk.vtkCommand.ModifiedEvent, self.updateWidgetFromMRML)
             self.removeObserver(self.inputCurve, slicer.vtkMRMLMarkupsNode.PointModifiedEvent, self.onInputCurveControlPointModified)
             self.removeObserver(self.inputCurve, slicer.vtkMRMLMarkupsNode.PointEndInteractionEvent, self.onInputCurveControlPointEndInteraction)
 
         self.inputCurve = newInputCurve
 
         if newInputCurve is not None:
+            self.addObserver(self.inputCurve, vtk.vtkCommand.ModifiedEvent, self.updateWidgetFromMRML)
             self.addObserver(self.inputCurve, slicer.vtkMRMLMarkupsNode.PointModifiedEvent, self.onInputCurveControlPointModified)
             self.addObserver(self.inputCurve, slicer.vtkMRMLMarkupsNode.PointEndInteractionEvent, self.onInputCurveControlPointEndInteraction)
 
@@ -342,7 +344,9 @@ def updateWidgetFromMRML(self, *_unused):
             self.cameraNodeSelector.setCurrentNode(cameraNode)
 
         if cameraNode:
-            self.viewAngleSlider.value = cameraNode.GetViewAngle()
+            viewAngle = EndoscopyLogic.getCameraViewAngleFromInputCurve(self.inputCurve)
+            self.viewAngleSlider.value = viewAngle
+            cameraNode.GetCamera().SetViewAngle(viewAngle)
 
         numberOfControlPoints = self.logic.getNumberOfControlPoints()
 
@@ -388,10 +392,7 @@ def frameDelaySliderValueChanged(self, newValue):
         self.timer.interval = newValue
 
     def viewAngleSliderValueChanged(self, newValue):
-        cameraNode = EndoscopyLogic.getCameraFromInputCurve(self.inputCurve)
-        if not cameraNode:
-            return
-        cameraNode.GetCamera().SetViewAngle(newValue)
+        EndoscopyLogic.setInputCurveCameraViewAngle(self.inputCurve, newValue)
 
     def setPlaybackEnabled(self, play):
         if play:
@@ -586,6 +587,8 @@ def flyToNext():
     """
 
     NODE_PATH_CAMERA_ORIENTATIONS_ATTRIBUTE_NAME = "Endoscopy.Path.CameraOrientations"
+    NODE_PATH_VIEW_ANGLE_ATTRIBUTE_NAME = "Endoscopy.Path.ViewAngle"
+    DEFAULT_CAMERA_VIEW_ANGLE = 30.0
 
     def __init__(self, dl=0.5):
         self.dl = dl  # desired world space step size (in mm)
@@ -834,6 +837,19 @@ def getCameraFromInputCurve(inputCurve):
             return None
         return inputCurve.GetNodeReference("Camera")
 
+    @staticmethod
+    def setInputCurveCameraViewAngle(inputCurve, viewAngle):
+        if not inputCurve:
+            return
+        inputCurve.SetAttribute(EndoscopyLogic.NODE_PATH_VIEW_ANGLE_ATTRIBUTE_NAME, str(viewAngle))
+
+    @staticmethod
+    def getCameraViewAngleFromInputCurve(inputCurve):
+        if not inputCurve:
+            return
+        value = inputCurve.GetAttribute(EndoscopyLogic.NODE_PATH_VIEW_ANGLE_ATTRIBUTE_NAME)
+        return float(value if value is not None else EndoscopyLogic.DEFAULT_CAMERA_VIEW_ANGLE)
+
     @staticmethod
     def createTransformFromInputCurve(inputCurve):
         if not inputCurve: