fix raw output

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -760,10 +760,12 @@ def create_funscript(self, idx_dict: dict) -> None:
         """
         if self.params.raw_output:
             output_score = copy.deepcopy(self.score[self.params.metric])
+            self.logger.warning("Insert %d raw points", len(output_score))
             for idx in range(len(output_score)):
                 self.funscript.add_action(
-                        output_score[idx],
-                        FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps)
+                        round(output_score[idx]),
+                        FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps),
+                        True
                     )
 
         else:

funscript_editor/data/funscript.py

@@ -205,18 +205,21 @@ def get_stroke_height(self, current_timestamp: int) -> int:
         return int(round(abs(self.get_next_action(current_timestamp)['pos'] - self.get_prev_action(current_timestamp)['pos'])))
 
 
-    def add_action(self, position: int, time: int):
+    def add_action(self, position: int, time: int, insert_raw: bool = False):
         """ Add a new action to the Funscript
 
         Args:
             position (int): position in percent (0-100)
             time (int): time to be at position in milliseconds
+            insert_raw (bool): do not delete near points
 
         Returns:
             Funscript: current funscript instance
         """
+        print('raw is', insert_raw)
         self.changed = True
-        self.delete_action(time)
+        if not insert_raw:
+            self.delete_action(time)
         self.data['actions'].append({'pos': int(round(position)), 'at': time})
         self.data['actions'].sort(key = lambda x: x['at'])
         return self

funscript_editor/ui/funscript_generator_window.py

@@ -11,6 +11,7 @@
 from funscript_editor.ui.settings_dialog import SettingsDialog
 import funscript_editor.definitions as definitions
 from funscript_editor.ui.theme import setup_theme
+from funscript_editor.utils.config import SETTINGS
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
@@ -99,7 +100,7 @@ def __show_message(self, message :str, error: bool = False) -> None:
     def __funscript_generated(self, funscript, msg, success) -> None:
         if isinstance(self.output_file, Funscript):
             for item in funscript.get_actions():
-                self.output_file.add_action(item['pos'], item['at'])
+                self.output_file.add_action(item['pos'], item['at'], SETTINGS['raw_output'])
             self.funscriptCompleted.emit(self.output_file, msg, success)
         else:
             os.makedirs(os.path.dirname(self.output_file), exist_ok=True)