change interpolation

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -128,6 +128,13 @@ def interpolate_bboxes(self, bboxes :dict) -> dict:
         Returns:
             dict: interpolated bboxes {'Men': {tracker_number: [(box_frame1),(box_frame2),....], ...} 'Woman': {tracker_number: [(box_frame1),(box_frame2),....], ...}}
         """
+        interpolation = 'quadratic'
+        if self.params.supervised_tracking and not self.params.supervised_tracking_is_exit_condition:
+            # NOTE: wh have to use linea interpolation to get flat lines at when the feature leave the tracking area
+            interpolation = 'linear'
+
+        self.logger.info("Use %s interpolation", interpolation)
+
         interpolated_bboxes = {}
         for tracker_type in bboxes:
             interpolated_bboxes[tracker_type] = {}
@@ -144,10 +151,10 @@ def interpolate_bboxes(self, bboxes :dict) -> dict:
                 x_head = [x[0]-1]+x+[x[-1]+1]
                 boxes = [boxes[0]]+boxes+[boxes[-1]]
 
-                fx0 = interp1d(x_head, [item[0] for item in boxes], kind = 'quadratic')
-                fy0 = interp1d(x_head, [item[1] for item in boxes], kind = 'quadratic')
-                fw  = interp1d(x_head, [item[2] for item in boxes], kind = 'quadratic')
-                fh  = interp1d(x_head, [item[3] for item in boxes], kind = 'quadratic')
+                fx0 = interp1d(x_head, [item[0] for item in boxes], kind = interpolation)
+                fy0 = interp1d(x_head, [item[1] for item in boxes], kind = interpolation)
+                fw  = interp1d(x_head, [item[2] for item in boxes], kind = interpolation)
+                fh  = interp1d(x_head, [item[3] for item in boxes], kind = interpolation)
 
                 for i in range(min(x), max(x)+1):
                     interpolated_bboxes[tracker_type][tracker_number].append((float(fx0(i)), float(fy0(i)), float(fw(i)), float(fh(i))))

funscript_editor/algorithms/signal.py

@@ -484,10 +484,11 @@ def categorize_points(self, signal: list, points: list) -> dict:
 
         grouped_points = {'min': [], 'max': []}
         for idx in points:
-            if smothed_signal[idx] > avg[idx]:
-                grouped_points['max'].append(idx)
-            else:
-                grouped_points['min'].append(idx)
+            if -1 < idx < min((len(smothed_signal), len(avg))):
+                if smothed_signal[idx] > avg[idx]:
+                    grouped_points['max'].append(idx)
+                else:
+                    grouped_points['min'].append(idx)
 
         return grouped_points
 

funscript_editor/algorithms/videotracker.py

@@ -241,6 +241,9 @@ def run(self) -> None:
                             status = StaticVideoTracker.Status.FEATURE_OUTSIDE
                         else:
                             bbox = self.last_valid_tracking_box
+                    elif self.supervised_tracking_area is not None and not self.supervised_tracking_is_exit_condition:
+                        # TODO: When we insert the tracking area again make sure the point is below/above the last valid box
+                        pass
 
 
                 self.queue_out.put((status, bbox))

funscript_editor/data/funscript.py

@@ -216,7 +216,6 @@ def add_action(self, position: int, time: int, insert_raw: bool = False):
         Returns:
             Funscript: current funscript instance
         """
-        print('raw is', insert_raw)
         self.changed = True
         if not insert_raw:
             self.delete_action(time)