add raw output to setting dialog

Author: arch

funscript_editor/config/settings.yaml

@@ -26,9 +26,6 @@ notification_sound: 'off'
 # - 'THRESHOLD': Detects fades in video.
 scene_detector: 'CSV'
 
-# Disable postprocessing
-raw_output: False
-
 # Force dark ui theme
 dark_theme: False
 

funscript_editor/ui/build_ui.sh

@@ -2,3 +2,4 @@
 
 pyuic5 funscript_editor_view.ui -o funscript_editor_view.py
 pyuic5 settings_view.ui -o settings_view.py
+echo "ok"

funscript_editor/ui/funscript_generator_window.py

@@ -43,6 +43,7 @@ def __init__(self,
             include_multiaxis: bool = False):
         super(FunscriptGeneratorWindow, self).__init__()
         self.allow_close = False
+        self.raw_output = False
         setup_theme()
         if os.path.exists(definitions.ICON_PATH):
             self.setWindowIcon(QtGui.QIcon(definitions.ICON_PATH))
@@ -177,7 +178,7 @@ def __cut_completed(self, cut_values):
     def __scaling_completed(self, score):
         self.score = score
         self.__logger.info('scaling completed')
-        if not SETTINGS["raw_output"]:
+        if not self.raw_output:
             self.__next_postprocessing(None, [], [])
         else:
             self.__logger.info("Raw Output")
@@ -270,6 +271,7 @@ def run(self) -> None:
         self.__logger.info('settings: %s', str(self.settings))
         self.settings['videoType'] = list(filter(lambda x: PROJECTION[x]['name'] == self.settings['videoType'], PROJECTION.keys()))[0]
         self.metrics = {k.replace('inverted', '').strip(): {"inverted": "inverted" in k} for k in self.settings['trackingMetrics'].split('+')}
+        self.raw_output = self.settings["outputMode"] == "normalized raw tracking data"
         self.tracking_manager = TrackingManagerThread(
                 self.video_info,
                 TrackingManagerParameter(

funscript_editor/ui/settings_dialog.py

@@ -62,6 +62,7 @@ def __setup_dialog_elements(self):
                 'trackingMethod': self.ui.trackingMethodComboBox,
                 'numberOfTracker': self.ui.numberOfTrackerComboBox,
                 'processingSpeed': self.ui.processingSpeedComboBox,
+                'outputMode': self.ui.outputComboBox
             }
 
 
@@ -166,6 +167,11 @@ def __setup_combo_boxes(self):
             "2 (fast)"
         ])
 
+        self.ui.outputComboBox.addItems([
+            "post processed data",
+            "normalized raw tracking data"
+        ])
+
         self.ui.numberOfTrackerComboBox.addItems([str(i) for i in range(1, 6)])
 
 

funscript_editor/ui/settings_view.py

@@ -92,6 +92,17 @@ def setupUi(self, Form):
         self.numberOfTrackerComboBox.setSizePolicy(sizePolicy)
         self.numberOfTrackerComboBox.setObjectName("numberOfTrackerComboBox")
         self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.numberOfTrackerComboBox)
+        self.label_6 = QtWidgets.QLabel(Form)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.outputComboBox = QtWidgets.QComboBox(Form)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.outputComboBox.sizePolicy().hasHeightForWidth())
+        self.outputComboBox.setSizePolicy(sizePolicy)
+        self.outputComboBox.setObjectName("outputComboBox")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.outputComboBox)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
         spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@@ -119,5 +130,6 @@ def retranslateUi(self, Form):
         self.label_3.setText(_translate("Form", "Tracking Method:"))
         self.label_10.setText(_translate("Form", "Processing Speed:"))
         self.label_5.setText(_translate("Form", "Number of Tracker:"))
+        self.label_6.setText(_translate("Form", "Output:"))
         self.docsButton.setText(_translate("Form", "Documentation"))
         self.okButton.setText(_translate("Form", "OK"))

funscript_editor/ui/settings_view.ui

@@ -64,6 +64,7 @@
                             </property>
                         </widget>
                     </item>
+
                     <item row="1" column="0">
                         <widget class="QLabel" name="label">
                             <property name="text">
@@ -81,6 +82,7 @@
                             </property>
                         </widget>
                     </item>
+
                     <item row="2" column="0">
                         <widget class="QLabel" name="label_2">
                             <property name="text">
@@ -98,6 +100,7 @@
                             </property>
                         </widget>
                     </item>
+
                     <item row="3" column="0">
                         <widget class="QLabel" name="label_3">
                             <property name="text">
@@ -115,6 +118,7 @@
                             </property>
                         </widget>
                     </item>
+
                     <item row="4" column="0">
                         <widget class="QLabel" name="label_10">
                             <property name="text">
@@ -132,6 +136,7 @@
                             </property>
                         </widget>
                     </item>
+
                     <item row="5" column="0">
                         <widget class="QLabel" name="label_5">
                             <property name="text">
@@ -150,6 +155,24 @@
                         </widget>
                     </item>
 
+                    <item row="6" column="0">
+                        <widget class="QLabel" name="label_6">
+                            <property name="text">
+                                <string>Output:</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item row="6" column="1">
+                        <widget class="QComboBox" name="outputComboBox">
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                        </widget>
+                    </item>
+
                     <item row="10" column="1">
                         <layout class="QHBoxLayout" name="horizontalLayout">
                             <item>