ENH: Update EndoscopyLogic API for retrieving first/previous/next/las…

…t indices
jcfr · Dec 8, 2023 · 9b9cc9f · 9b9cc9f
1 parent 083595b
commit 9b9cc9f
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/Modules/Scripted/Endoscopy/Endoscopy.py b/Modules/Scripted/Endoscopy/Endoscopy.py
@@ -411,34 +411,16 @@ def onDeleteOrientationButtonClicked(self):
         self.flyTo(resampledCurvePointIndexToDelete)
 
     def onFirstOrientationButtonClicked(self):
-        allIndices = self.logic.cameraOrientationResampledCurveIndices
-        if not allIndices:
-            return
-        whereTo = min(allIndices, default=self.frameSlider.minimum)
-        self.frameSlider.value = whereTo
+        self.frameSlider.value = self.logic.getFirstControlPointIndex()
 
     def onBackOrientationButtonClicked(self):
-        allIndices = self.logic.cameraOrientationResampledCurveIndices
-        allIndices = [x for x in allIndices if x < self.frameSlider.value]
-        if not allIndices:
-            return
-        whereTo = max(allIndices)
-        self.frameSlider.value = whereTo
+        self.frameSlider.value = self.logic.getPreviousControlPointIndex(self.frameSlider.value)
 
     def onNextOrientationButtonClicked(self):
-        allIndices = self.logic.cameraOrientationResampledCurveIndices
-        allIndices = [x for x in allIndices if x > self.frameSlider.value]
-        if not allIndices:
-            return
-        whereTo = min(allIndices)
-        self.frameSlider.value = whereTo
+        self.frameSlider.value = self.logic.getNextControlPointIndex(self.frameSlider.value)
 
     def onLastOrientationButtonClicked(self):
-        allIndices = self.logic.cameraOrientationResampledCurveIndices
-        if not allIndices:
-            return
-        whereTo = max(allIndices)
-        self.frameSlider.value = whereTo
+        self.frameSlider.value = self.logic.getLastControlPointIndex()
 
     def onSaveExportModelButtonClicked(self):
         logging.debug("Create Model...")
@@ -603,6 +585,24 @@ def __init__(self, dl=0.5):
     def getNumberOfControlPoints(self):
         return self.resampledCurve.GetNumberOfControlPoints()
 
+    def getFirstControlPointIndex(self):
+        allIndices = self.cameraOrientationResampledCurveIndices
+        return min(allIndices, default=None)
+
+    def getPreviousControlPointIndex(self, currentResampledCurvePointIndex):
+        allIndices = self.cameraOrientationResampledCurveIndices
+        allIndices = [x for x in allIndices if x < currentResampledCurvePointIndex]
+        return max(allIndices, default=None)
+
+    def getNextControlPointIndex(self, currentResampledCurvePointIndex):
+        allIndices = self.cameraOrientationResampledCurveIndices
+        allIndices = [x for x in allIndices if x > currentResampledCurvePointIndex]
+        return min(allIndices, default=None)
+
+    def getLastControlPointIndex(self):
+        allIndices = self.cameraOrientationResampledCurveIndices
+        return max(allIndices, default=None)
+
     def setControlPointsByResamplingAndInterpolationFromInputCurve(self, inputCurve) -> None:
         if inputCurve is None:
             return