improve preview scaling

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -280,7 +280,7 @@ def min_max_selector(self,
                     (self.x_text_start, 50), cv2.FONT_HERSHEY_SIMPLEX, self.font_size, (0,0,255), 2)
                 cv2.putText(preview, "Set {} to {}".format('Max', trackbarValueMax),
                     (image_min.shape[1] + self.x_text_start, 50), cv2.FONT_HERSHEY_SIMPLEX, self.font_size, (0,0,255), 2)
-                cv2.imshow(self.window_name, self.preview_scaling(preview))
+                cv2.imshow(self.window_name, self.preview_scaling(preview, 1.1))
                 if self.was_space_pressed() or cv2.waitKey(25) == ord(' '): break
                 trackbarValueMin = cv2.getTrackbarPos("Min", self.window_name)
                 trackbarValueMax = cv2.getTrackbarPos("Max", self.window_name)
@@ -352,9 +352,9 @@ def scale_score(self, status: str, direction : str = 'y') -> None:
                     imgMax = imgMax[:int(imgMax.shape[0]/2), :]
 
             if PROJECTION[self.params.projection]['parameter']['width'] > 0:
-                scale = PROJECTION[self.params.projection]['parameter']['width'] / float(2*imgMax.shape[1])
+                scale = PROJECTION[self.params.projection]['parameter']['width'] / float(1.75*imgMax.shape[1])
             else:
-                scale = PROJECTION[self.params.projection]['parameter']['height'] / float(2*imgMax.shape[1])
+                scale = PROJECTION[self.params.projection]['parameter']['height'] / float(1.75*imgMax.shape[0])
             imgMin = cv2.resize(imgMin, None, fx=scale, fy=scale)
             imgMax = cv2.resize(imgMax, None, fx=scale, fy=scale)
 
@@ -451,20 +451,21 @@ def delete_last_tracking_predictions(self, num :int) -> None:
                 if self.params.track_men: del self.bboxes['Men'][-1]
 
 
-    def preview_scaling(self, preview_image :np.ndarray) -> np.ndarray:
+    def preview_scaling(self, preview_image :np.ndarray, post_scale :float = 1.0) -> np.ndarray:
         """ Scale image for preview
 
         Args:
             preview_image (np.ndarray): opencv image
+            post_scale (float, optional): additional scaling factor
 
         Returns:
             np.ndarray: scaled opencv image
         """
         return cv2.resize(
                 preview_image,
                 None,
-                fx=self.params.preview_scaling,
-                fy=self.params.preview_scaling
+                fx=self.params.preview_scaling*post_scale,
+                fy=self.params.preview_scaling*post_scale
             )
 
 
@@ -678,7 +679,7 @@ def tracking(self) -> str:
 
                 if self.was_key_pressed('q') or cv2.waitKey(1) == ord('q'):
                     status = 'Tracking stopped by user'
-                    self.delete_last_tracking_predictions(int((self.get_average_tracking_fps()+1)*2.2))
+                    self.delete_last_tracking_predictions(int((self.get_average_tracking_fps()+1)*2.0))
                     break
 
             (successWoman, bboxWoman) = trackerWoman.result()
@@ -756,7 +757,8 @@ def finished(self, status: str, success :bool) -> None:
             status (str): a process status/error message
             success (bool): True if funscript was generated else False
         """
-        cv2.destroyWindow(self.window_name)
+        try: cv2.destroyWindow(self.window_name)
+        except: pass
         self.funscriptCompleted.emit(self.funscript, status, success)
 
 
@@ -907,6 +909,10 @@ def create_funscript(self, idx_dict: dict) -> None:
 
     def run(self) -> None:
         """ The Funscript Generator Thread Function """
+        if self.params.direction == 'd' and not self.params.track_men:
+                self.finished("Tracking with 'd' and no men tracker is not implemented!", False)
+                return
+
         # NOTE: score['y'] and score['x'] should have the same number size so it should be enouth to check one score length
         with Listener(on_press=self.on_key_press) as listener:
             status = self.tracking()

funscript_editor/config/hyperparameter.yaml

@@ -11,7 +11,7 @@ skip_frames: 1
 
 # Specify the window size for the calculation of the reference value for the local min
 # and max search.
-avg_sec_for_local_min_max_extraction: 1.9
+avg_sec_for_local_min_max_extraction: 2.0
 
 # Specify the minimum required frames for the tracking. Wee need this parameter to
 # ensure there is at leas two strokes in the tracking result.

funscript_editor/config/settings.yaml

@@ -26,4 +26,4 @@ preview_scaling: 0.6
 # Available Options:
 # - 'flat': 2D Videos
 # - 'vr_he_sbs': 3D VR Side-By-Side Video
-projection: 'flat'
+projection: 'vr_he_sbs'