stop at next action point

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -474,15 +474,11 @@ def get_perspective_roi(self, image :np.ndarray) -> None:
                 elif pressed_key == "'s'":
                     perspective['PHI'] = max((-80, perspective['PHI'] - 5))
                     parameter_changed = True
-                # elif pressed_key == "'a'":
-                #     perspective['THETA'] -= 5
-                # elif pressed_key == "'d'":
-                #     perspective['THETA'] += 5
 
             if cv2.waitKey(1) in [ord('q')]: break
 
         try:
-            background = np.full(preview.shape, 255, dtype=np.uint8)
+            background = np.full(preview.shape, 0, dtype=np.uint8)
             loading_screen = self.drawText(background, "Please wait ...")
             cv2.imshow(self.window_name, loading_screen)
         except: pass
@@ -602,6 +598,10 @@ def tracking(self) -> str:
             if self.params.skip_frames > 0 and frame_num % (self.params.skip_frames + 1) != 1:
                 continue
 
+            if self.params.end_frame > 0 and frame_num + self.params.start_frame >= self.params.end_frame:
+                status = "Tracking stop at existing action point"
+                break
+
             trackerWoman.update(frame)
             if self.params.track_men: trackerMen.update(frame)
             self.processStatus.emit(frame_num)

funscript_editor/ui/minimal.py

@@ -69,7 +69,7 @@ def __init__(self,
         trackMen = True if reply == QtWidgets.QMessageBox.Yes else False
 
         start_frame = int(round(float(start_time)/(float(1000)/float(fps)))) if start_time > 0.0 else 0
-        end_frame = int(round(float(end_time)/(float(1000)/float(fps)))) if end_time > 0.0 else -1
+        end_frame = int(round(float(end_time)/(float(1000)/float(fps)))) if end_time > 0.0 and start_time < end_time else -1
 
         self.funscript_generator = FunscriptGenerator(
                 FunscriptGeneratorParameter(