add more sliders

Author: arch

funscript_editor/algorithms/signal.py

@@ -13,20 +13,20 @@
 
 @dataclass
 class SignalParameter:
-    local_min_max_filter_len: int = int(HYPERPARAMETER['signal']['local_max_min_filter_len'])
+    additional_points_merge_time_threshold_in_ms: float
+    additional_points_merge_distance_threshold: float
+    high_second_derivative_points_threshold: float
+    distance_minimization_threshold: float
+    local_min_max_filter_len: int
+    direction_change_filter_len: int
     avg_sec_for_local_min_max_extraction: float = float(HYPERPARAMETER['signal']['avg_sec_for_local_min_max_extraction'])
-    additional_points_merge_time_threshold_in_ms: float = float(HYPERPARAMETER['signal']['additional_points_merge_time_threshold_in_ms'])
-    additional_points_merge_distance_threshold: float = float(HYPERPARAMETER['signal']['additional_points_merge_distance_threshold'])
-    distance_minimization_threshold: float = float(HYPERPARAMETER['signal']['distance_minimization_threshold'])
-    high_second_derivative_points_threshold: float = float(HYPERPARAMETER['signal']['high_second_derivative_points_threshold'])
-    direction_change_filter_len: int = int(HYPERPARAMETER['signal']['direction_change_filter_len'])
     min_evenly_intermediate_interframes: int = int(HYPERPARAMETER['signal']['min_evenly_intermediate_interframes'])
 
 
 class Signal:
 
-    def __init__(self, fps):
-        self.params = SignalParameter()
+    def __init__(self, params, fps):
+        self.params = params
         self.fps = fps
         self.logger = logging.getLogger(__name__)
 

funscript_editor/config/hyperparameter.yaml

@@ -9,34 +9,14 @@
 min_frames: 90
 
 # reaction time of the user to stop the tracking when scene changed or tracking box shifts
-user_reaction_time_in_milliseconds: 1000
+user_reaction_time_in_milliseconds: 800
 
 
 # Signal Processing Hyperparameter
 signal:
-
-  # Specify the window size for the calculation of smothed tracking signal for the local min and max search.
-  # For slow actions in your video, i recommend to set this to '3' to reduce the false positive predictions.
-  local_max_min_filter_len: 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: 2.0
 
-  # threshold value to predict an distance minimization point candidate
-  distance_minimization_threshold: 16.0
-
-  # threshold value tor get additional points by comparing second derivative with the rolling standard deviation and given threshold
-  high_second_derivative_points_threshold: 1.2
-
-  # filter length to detect a direction change
-  direction_change_filter_len: 3
-
-  # threshold value in milliseconds to merge additional points
-  additional_points_merge_time_threshold_in_ms: 60
-
-  # threshold value to merge additional points
-  additional_points_merge_distance_threshold: 8.0
-
   # min interframes without an additional datapoint for the evenly intermediate algorithm
   min_evenly_intermediate_interframes: 2
 

funscript_editor/ui/postprocessing.py

@@ -4,11 +4,12 @@
     simplify_coords_vw_idx,
 )
 
+import funscript_editor.utils.logging as logging
 import copy
 import numpy as np
 import pyqtgraph as pg
 
-from funscript_editor.algorithms.signal import Signal
+from funscript_editor.algorithms.signal import Signal,SignalParameter
 from funscript_editor.ui.cut_tracking_result import Slider
 
 class QHLine(QtWidgets.QFrame):
@@ -20,6 +21,7 @@ def __init__(self):
 class PostprocessingWidget(QtWidgets.QWidget):
     def __init__(self, metric, raw_score, video_info, parent=None):
         super(QtWidgets.QWidget, self).__init__(parent=parent)
+        self.logger = logging.getLogger(__name__)
         pg.setConfigOption("background","w")
         self.verticalLayout = QtWidgets.QVBoxLayout(self)
 
@@ -94,6 +96,9 @@ def add_custom_tab(self):
         self.tabs_content[tab_name]["widgets"]["points"].addItems(["Local Min Max", "Direction Changed"])
         self.tabs_content[tab_name]["widgets"]["points"].currentIndexChanged.connect(self.update_plot)
 
+        self.tabs_content[tab_name]["widgets"]["filterLen"] = Slider("Filter Len", 10, 2)
+        self.tabs_content[tab_name]["widgets"]["filterLen"].slider.valueChanged.connect(self.update_plot)
+
         self.tabs_content[tab_name]["widgets"]["high_second_derivate"] = QtWidgets.QCheckBox("High Second Derivate")
         self.tabs_content[tab_name]["widgets"]["high_second_derivate"].stateChanged.connect(self.update_plot)
 
@@ -106,6 +111,18 @@ def add_custom_tab(self):
         self.tabs_content[tab_name]["widgets"]["runs"] = Slider("Max additional Points", 8, 2)
         self.tabs_content[tab_name]["widgets"]["runs"].slider.valueChanged.connect(self.update_plot)
 
+        self.tabs_content[tab_name]["widgets"]["mergeThresholdMs"] = Slider("Merge Threshold Time in ms", 1000, 60)
+        self.tabs_content[tab_name]["widgets"]["mergeThresholdMs"].slider.valueChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["mergeThresholdDistance"] = Slider("Merge Threshold Distance", 100, 12)
+        self.tabs_content[tab_name]["widgets"]["mergeThresholdDistance"].slider.valueChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["highSecondDerivateThreshold"] = Slider("Threshold", 100, 12)
+        self.tabs_content[tab_name]["widgets"]["highSecondDerivateThreshold"].slider.valueChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["distanzMinimizationThreshold"] = Slider("Threshold", 100, 16)
+        self.tabs_content[tab_name]["widgets"]["distanzMinimizationThreshold"].slider.valueChanged.connect(self.update_plot)
+
         self.tabs_content[tab_name]["widgets"]["lower"] = Slider("Lower Offset", 100, 0)
         self.tabs_content[tab_name]["widgets"]["lower"].slider.valueChanged.connect(self.update_plot)
 
@@ -114,12 +131,20 @@ def add_custom_tab(self):
 
         self.tabs_content[tab_name]["main"].layout.addWidget(QtWidgets.QLabel("Points:"))
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["points"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["filterLen"])
         self.tabs_content[tab_name]["main"].layout.addWidget(QHLine())
         self.tabs_content[tab_name]["main"].layout.addWidget(QtWidgets.QLabel("Additinal Points:"))
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["runs"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["mergeThresholdMs"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["mergeThresholdDistance"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(QHLine())
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["high_second_derivate"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["highSecondDerivateThreshold"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(QHLine())
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["distance_minimization"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["distanzMinimizationThreshold"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(QHLine())
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["evenly_intermediate"])
-        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["runs"])
         self.tabs_content[tab_name]["main"].layout.addWidget(QHLine())
         self.tabs_content[tab_name]["main"].layout.addWidget(QtWidgets.QLabel("Offset:"))
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["lower"])
@@ -142,57 +167,75 @@ def confirm(self):
     def update_plot(self):
         current_tab_name = self.get_current_tab_name()
 
-        if current_tab_name == "Ramer–Douglas–Peucker":
-            self.result_idx = simplify_coords_idx(self.raw_score_np, float(self.tabs_content[current_tab_name]["widgets"]["epsilon"].x) / 10.0)
-            self.result_val = [val for idx,val in enumerate(self.raw_score) if idx in self.result_idx]
-            self.curve_result.setData(self.result_idx, self.result_val)
-            return
-
-        if current_tab_name == "Visvalingam-Whyatt":
-            self.result_idx = simplify_coords_vw_idx(self.raw_score_np, float(self.tabs_content[current_tab_name]["widgets"]["epsilon"].x) / 1.0)
-            self.result_val = [val for idx,val in enumerate(self.raw_score) if idx in self.result_idx]
-            self.curve_result.setData(self.result_idx, self.result_val)
-            return
-
-        if current_tab_name == "Custom":
-            base_algo = self.tabs_content[current_tab_name]["widgets"]["points"].currentText()
-            runs = self.tabs_content[current_tab_name]["widgets"]["runs"].x
-            offset_lower = self.tabs_content[current_tab_name]["widgets"]["lower"].x
-            offset_upper = self.tabs_content[current_tab_name]["widgets"]["upper"].x
-
-            base_point_algorithm = Signal.BasePointAlgorithm.local_min_max
-            if base_algo == 'Direction Changed':
-                base_point_algorithm = Signal.BasePointAlgorithm.direction_changes
-
-            additional_points_algorithms = []
-            if self.tabs_content[current_tab_name]["widgets"]["high_second_derivate"].isChecked():
-                additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.high_second_derivative)
-
-            if self.tabs_content[current_tab_name]["widgets"]["distance_minimization"].isChecked():
-                additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.distance_minimization)
-
-            if self.tabs_content[current_tab_name]["widgets"]["evenly_intermediate"].isChecked():
-                additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.evenly_intermediate)
-
-            signal = Signal(self.video_info.fps)
-            self.result_idx = signal.decimate(
-                    self.raw_score,
-                    base_point_algorithm,
-                    additional_points_algorithms,
-                    additional_points_repetitions = runs
-            )
-
-            categorized = signal.categorize_points(self.raw_score, self.result_idx)
-
-            score = copy.deepcopy(self.raw_score)
-            score_min, score_max = min(score), max(score)
-
-            for idx in categorized['upper']:
-                score[idx] = max(( score_min, min((score_max, score[idx] + offset_upper)) ))
-
-            for idx in categorized['lower']:
-                score[idx] = max(( score_min, min((score_max, score[idx] - offset_lower)) ))
+        try:
+            if current_tab_name == "Ramer–Douglas–Peucker":
+                self.result_idx = simplify_coords_idx(self.raw_score_np, float(self.tabs_content[current_tab_name]["widgets"]["epsilon"].x) / 10.0)
+                self.result_val = [val for idx,val in enumerate(self.raw_score) if idx in self.result_idx]
+                self.curve_result.setData(self.result_idx, self.result_val)
+                return
+
+            if current_tab_name == "Visvalingam-Whyatt":
+                self.result_idx = simplify_coords_vw_idx(self.raw_score_np, float(self.tabs_content[current_tab_name]["widgets"]["epsilon"].x) / 1.0)
+                self.result_val = [val for idx,val in enumerate(self.raw_score) if idx in self.result_idx]
+                self.curve_result.setData(self.result_idx, self.result_val)
+                return
+
+            if current_tab_name == "Custom":
+                base_algo = self.tabs_content[current_tab_name]["widgets"]["points"].currentText()
+                runs = self.tabs_content[current_tab_name]["widgets"]["runs"].x
+                offset_lower = self.tabs_content[current_tab_name]["widgets"]["lower"].x
+                offset_upper = self.tabs_content[current_tab_name]["widgets"]["upper"].x
+                mergeThresholdMs = self.tabs_content[current_tab_name]["widgets"]["mergeThresholdMs"].x
+                mergeThresholdDistance = self.tabs_content[current_tab_name]["widgets"]["mergeThresholdDistance"].x
+                highSecondDerivateThreshold = self.tabs_content[current_tab_name]["widgets"]["highSecondDerivateThreshold"].x / 10.0
+                distanzMinimizationThreshold = self.tabs_content[current_tab_name]["widgets"]["distanzMinimizationThreshold"].x
+                filterLen = self.tabs_content[current_tab_name]["widgets"]["filterLen"].x + 1
+
+                base_point_algorithm = Signal.BasePointAlgorithm.local_min_max
+                if base_algo == 'Direction Changed':
+                    base_point_algorithm = Signal.BasePointAlgorithm.direction_changes
+
+                additional_points_algorithms = []
+                if self.tabs_content[current_tab_name]["widgets"]["high_second_derivate"].isChecked():
+                    additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.high_second_derivative)
+
+                if self.tabs_content[current_tab_name]["widgets"]["distance_minimization"].isChecked():
+                    additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.distance_minimization)
+
+                if self.tabs_content[current_tab_name]["widgets"]["evenly_intermediate"].isChecked():
+                    additional_points_algorithms.append(Signal.AdditionalPointAlgorithm.evenly_intermediate)
+
+                signal = Signal(SignalParameter(
+                        additional_points_merge_time_threshold_in_ms = mergeThresholdMs,
+                        additional_points_merge_distance_threshold = mergeThresholdDistance,
+                        high_second_derivative_points_threshold = highSecondDerivateThreshold,
+                        distance_minimization_threshold = distanzMinimizationThreshold,
+                        local_min_max_filter_len = filterLen,
+                        direction_change_filter_len = filterLen
+                    ), self.video_info.fps
+                )
+
+                self.result_idx = signal.decimate(
+                        self.raw_score,
+                        base_point_algorithm,
+                        additional_points_algorithms,
+                        additional_points_repetitions = runs
+                )
+
+                categorized = signal.categorize_points(self.raw_score, self.result_idx)
+
+                score = copy.deepcopy(self.raw_score)
+                score_min, score_max = min(score), max(score)
+
+                for idx in categorized['upper']:
+                    score[idx] = max(( score_min, min((score_max, score[idx] + offset_upper)) ))
+
+                for idx in categorized['lower']:
+                    score[idx] = max(( score_min, min((score_max, score[idx] - offset_lower)) ))
+
+                self.result_val = [val for idx,val in enumerate(score) if idx in self.result_idx]
+                self.curve_result.setData(self.result_idx, self.result_val)
+                return
+        except Exception as ex:
+            self.logger.critical("Invalid Values in Postprocessing Widget", exc_info=ex)
 
-            self.result_val = [val for idx,val in enumerate(score) if idx in self.result_idx]
-            self.curve_result.setData(self.result_idx, self.result_val)
-            return