add distance to multiaxis output

Author: arch

contrib/Installer/assets/main.lua

@@ -18,7 +18,7 @@ stopAtNextActionPoint = true
 filterSimilarTimestamps = true
 scriptNames = {}
 scriptNamesCount = 0
-scriptAssignment = {x={idx=1}, y={idx=1}, roll={idx=1}}
+scriptAssignment = {x={idx=1}, y={idx=1}, distance={idx=1}, roll={idx=1}}
 
 function exists(file)
    return os.rename(file, file)
@@ -483,6 +483,8 @@ function gui()
     multiaxis, _ = ofs.Checkbox("Enable multiaxis", multiaxis)
 
     if multiaxis then
+        ofs.Separator()
+        ofs.Text("Multiaxis Output Assignment:")
         local comboNum = 1
         for k,v in pairs(scriptAssignment) do
             ofs.Text("  o "..k.." ->")

docs/app/docs/user-guide/usage.md

@@ -42,5 +42,3 @@ You can then specify blocking/non blocking: the first means that when the featur
 ### Multiaxis Tracking
 
 Multiaxis funscripts are basically one funscript for each axis of movement or rotation. Available axis depends on the used device. The MTFG support the output of `heave (suck) = y`, `sway = x` and `roll`. When you enable the multiaxis support in the OFS MTFG Extension Widget you can assign the tracking metric to the desired funscript via drop down menu. Use the option `ignore` if you don't need the corresponding movement/rotation for your funscripts. The widget show all opened funscripts from OFS. To add a new funscript axis in OFS you can use `Project : Add ... : Shortcust` menu from the OFS app bar. E.g. set `roll = *.roll`, `x = *.sway` and `y = *.suck`. With this settings you probably want to select the Tracking Metric `x + y + roll` in the MTFG settings dialog because the Extension can only import available tracking data. The setting in the OFS widget window is only the binding for the MTFG output. So the extension only import available data from MTFG. When you chose e.g. only the Tracking Metric `y (up-down)` you get only the resulting movement for `y` in OFS no matter what you set for the binding in OFS widget.
-
-In Multiaxis tracking the Tracking Metric `distance` is not available because this metric already combines the `x` and `y` movement to an euclidean distance in 2D space.

funscript_editor/ui/settings_dialog.py

@@ -145,21 +145,19 @@ def __setup_combo_boxes(self):
             'y inverted (down-up)',
             'x (left-right)',
             'x inverted (right-left)',
+            'distance (p1-p2)',
+            'distance inverted (p2-p1)',
             'roll (rotation)',
             'roll inverted (rotation)'
         ])
 
         if self.include_multiaxis:
             self.ui.trackingMetricComboBox.addItems([
                 "y + roll (up-down + rotation)",
+                "distance + roll (p1-p1 + rotation)",
                 "x + y (left-right + up-down)",
                 "x + y + roll (left-right + up-down + rotation)",
             ])
-        else:
-            self.ui.trackingMetricComboBox.addItems([
-                'distance (p1-p2)',
-                'distance inverted (p2-p1)',
-            ])
 
         self.ui.processingSpeedComboBox.addItems([
             "0 (accurate)",