add custom post processing tab

Author: arch

funscript_editor/algorithms/signal.py

@@ -20,7 +20,6 @@ class SignalParameter:
     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'])
-    additional_points_repetitions: int = int(HYPERPARAMETER['signal']['additional_points_repetitions'])
     min_evenly_intermediate_interframes: int = int(HYPERPARAMETER['signal']['min_evenly_intermediate_interframes'])
 
 
@@ -583,13 +582,15 @@ def apply_manual_shift(self, point_group: dict, max_idx: int, shift: dict = {'mi
     def decimate(self,
             signal: list,
             base_point_algorithm: BasePointAlgorithm,
-            additional_points_algorithms: List[AdditionalPointAlgorithm]) -> list:
+            additional_points_algorithms: List[AdditionalPointAlgorithm],
+            additional_points_repetitions: int = 2) -> list:
         """ Compute the decimated signal with given algorithms
 
         Args:
             signal (list): raw signal
             base_point_algorithm (BasePointAlgorithm): algorithm to determine the base points
             additional_points_algorithms (List[AdditionalPointAlgorithm]): list with algorithms to determine additional points
+            additional_points_repetitions: number of runs for the additional points algorithm (max number of points that will be insert between 2 base points)
 
         Returns:
             list: indexes for decimated signal
@@ -601,7 +602,7 @@ def decimate(self,
         else:
             raise NotImplementedError("Selected Base Point Algorithm is not implemented")
 
-        for run_idx in range(self.params.additional_points_repetitions):
+        for run_idx in range(additional_points_repetitions):
             self.logger.info("Run Additional Points Algorithms #%d", run_idx+1)
             len_before_merge = len(decimated_indexes)
             for algo in additional_points_algorithms:

funscript_editor/config/hyperparameter.yaml

@@ -40,9 +40,6 @@ signal:
   # min interframes without an additional datapoint for the evenly intermediate algorithm
   min_evenly_intermediate_interframes: 2
 
-  # number of runs for the additional points algorithm (max number of points that will be insert between 2 base points)
-  additional_points_repetitions: 2
-
 
 # Scene Detector Hyperparameter
 scene_detector:

funscript_editor/config/settings.yaml

@@ -26,9 +26,6 @@ notification_sound: 'off'
 # - 'THRESHOLD': Detects fades in video.
 scene_detector: 'CSV'
 
-# Output an position for each frame. This option disable post processing!
-raw_output: False
-
 # Force dark ui theme
 dark_theme: False
 

funscript_editor/ui/funscript_generator_window.py

@@ -189,7 +189,7 @@ def __next_postprocessing(self, last_metric, idx_keep, val_keep):
                 continue
 
             if found_last:
-                self.postprocessing_widget = PostprocessingWidget(metric, self.score[metric])
+                self.postprocessing_widget = PostprocessingWidget(metric, self.score[metric], self.video_info)
                 self.postprocessing_widget.postprocessingCompleted.connect(self.__next_postprocessing)
                 self.postprocessing_widget.show()
                 return
@@ -205,7 +205,7 @@ def __funscript_generated(self, funscripts, msg, success) -> None:
             if len(funscripts) > 1:
                 self.__logger.warning("Multiaxis output for build-in UI is not implemented")
             for item in funscripts[first_metric].get_actions():
-                self.output_file.add_action(item['pos'], item['at'], SETTINGS['raw_output'])
+                self.output_file.add_action(item['pos'], item['at'], True)
             self.funscriptCompleted.emit(self.output_file, msg, success)
         else:
             os.makedirs(os.path.dirname(self.output_file), exist_ok=True)

funscript_editor/ui/postprocessing.py

@@ -6,14 +6,18 @@
 
 import numpy as np
 import pyqtgraph as pg
+
+from funscript_editor.algorithms.signal import Signal
 from funscript_editor.ui.cut_tracking_result import Slider
 
+
 class PostprocessingWidget(QtWidgets.QWidget):
-    def __init__(self, metric, raw_score, parent=None):
+    def __init__(self, metric, raw_score, video_info, parent=None):
         super(QtWidgets.QWidget, self).__init__(parent=parent)
         pg.setConfigOption("background","w")
         self.verticalLayout = QtWidgets.QVBoxLayout(self)
 
+        self.video_info = video_info
         self.metric = metric
         self.raw_score_idx = [x for x in range(len(raw_score))]
         self.raw_score = raw_score
@@ -25,6 +29,7 @@ def __init__(self, metric, raw_score, parent=None):
         self.tabs_content = {}
         self.add_rdp_tab()
         self.add_vw_tab()
+        self.add_custom_tab()
         self.verticalLayout.addWidget(self.tabs)
         self.tabs.currentChanged.connect(self.update_plot)
 
@@ -67,13 +72,44 @@ def add_vw_tab(self):
         tab_name = "Visvalingam-Whyatt"
         self.tabs_content[tab_name] = {"main": QtWidgets.QWidget(), "widgets": {}}
         self.tabs_content[tab_name]["main"].layout = QtWidgets.QVBoxLayout(self)
-        self.tabs_content[tab_name]["widgets"]["epsilon"] = Slider("Epsilon", 100, 10)
+        self.tabs_content[tab_name]["widgets"]["epsilon"] = Slider("Epsilon", 200, 50)
         self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["epsilon"])
         self.tabs_content[tab_name]["widgets"]["epsilon"].slider.valueChanged.connect(self.update_plot)
         self.tabs_content[tab_name]["main"].setLayout(self.tabs_content[tab_name]["main"].layout)
         self.tabs.addTab(self.tabs_content[tab_name]["main"], tab_name)
 
 
+    def add_custom_tab(self):
+        tab_name = "Custom"
+        self.tabs_content[tab_name] = {"main": QtWidgets.QWidget(), "widgets": {}}
+        self.tabs_content[tab_name]["main"].layout = QtWidgets.QVBoxLayout(self)
+
+        self.tabs_content[tab_name]["widgets"]["points"] = QtWidgets.QComboBox()
+        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"]["high_second_derivate"] = QtWidgets.QCheckBox("High Second Derivate")
+        self.tabs_content[tab_name]["widgets"]["high_second_derivate"].stateChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["distance_minimization"] = QtWidgets.QCheckBox("Distance Minimization")
+        self.tabs_content[tab_name]["widgets"]["distance_minimization"].stateChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["evenly_intermediate"] = QtWidgets.QCheckBox("Evenly Intermediate")
+        self.tabs_content[tab_name]["widgets"]["evenly_intermediate"].stateChanged.connect(self.update_plot)
+
+        self.tabs_content[tab_name]["widgets"]["runs"] = Slider("Additionl Points Algorthm Runs", 8, 2)
+        self.tabs_content[tab_name]["widgets"]["runs"].slider.valueChanged.connect(self.update_plot)
+
+        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"]["high_second_derivate"])
+        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"]["evenly_intermediate"])
+        self.tabs_content[tab_name]["main"].layout.addWidget(self.tabs_content[tab_name]["widgets"]["runs"])
+
+        self.tabs_content[tab_name]["main"].setLayout(self.tabs_content[tab_name]["main"].layout)
+        self.tabs.addTab(self.tabs_content[tab_name]["main"], tab_name)
+
+
     def get_current_tab_name(self) -> str:
         return self.tabs.tabText(self.tabs.currentIndex())
 
@@ -94,7 +130,36 @@ def update_plot(self):
             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) / 10.0)
+            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
+
+            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
+            )
             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