Merge branch 'master' into trackhat-camera

5 files changed, 104 insertions, 3 deletions

diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp
index af35c999..cdbf532e 100644
--- a/gui/mapping-dialog.cpp
+++ b/gui/mapping-dialog.cpp
@@ -59,6 +59,10 @@ mapping_dialog::mapping_dialog(Mappings& m) : m(m), widgets{}
     tie_setting(s.a_y.clamp_x_, ui.max_y_translation);
     tie_setting(s.a_z.clamp_x_, ui.max_z_translation);
 
+    tie_setting(s.a_x.clamp_y_, ui.max_x_out);
+    tie_setting(s.a_y.clamp_y_, ui.max_y_out);
+    tie_setting(s.a_z.clamp_y_, ui.max_z_out);
+
     tie_setting(s.a_pitch.clamp_y_, ui.max_pitch_output);
 }
 
@@ -96,9 +100,13 @@ void mapping_dialog::load()
             x->addItem(tr("%1°").arg(y), y);
 
     for (QComboBox* x : { ui.max_x_translation, ui.max_y_translation, ui.max_z_translation })
-        for (a y : { a::t30, a::t20, a::t15, a::t10, a::t100 })
+        for (a y : { a::t30, a::t20, a::t15, a::t10, a::t75, a::t100, a::t150, a::t300, a::t600 })
             x->addItem(tr("%1 cm").arg(int(y)), y);
 
+    for (QComboBox* x : { ui.max_x_out, ui.max_y_out, ui.max_z_out })
+        for (a y : { a::o_t75, a::o_t100, a::o_t150, a::o_t300, a::o_t600 })
+            x->addItem(tr("%1 cm").arg(abs(int(y))), y);
+
     for (int i = 0; qfcs[i].qfc; i++)
     {
         const bool altp = qfcs[i].altp;
@@ -122,8 +130,12 @@ void mapping_dialog::load()
                 value = 1;
             else if (clamp_x <= a::r45)
                 value = 5;
-            else
+            else if (clamp_x <= a::t150)
                 value = 10;
+            else if (clamp_x <= a::t300)
+                value = 25;
+            else
+                value = 50;
 
             qfc.set_x_step(value);
         };
@@ -139,6 +151,13 @@ void mapping_dialog::load()
                 value = 10; break;
             case a::o_t75:
                 value = 5; break;
+            case a::o_t100:
+            case a::o_t150:
+                value = 10; break;
+            case a::o_t300:
+                value = 50; break;
+            case a::o_t600:
+                value = 100; break;
             }
             qfc.set_y_step(value);
         };
diff --git a/gui/mapping-dialog.ui b/gui/mapping-dialog.ui
index 8d72533d..545b5ae5 100644
--- a/gui/mapping-dialog.ui
+++ b/gui/mapping-dialog.ui
@@ -352,6 +352,29 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="label4out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Max output</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="max_x_out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -432,6 +455,29 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="label5out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Max output</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="max_y_out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -512,6 +558,29 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="label6out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Max output</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="max_z_out">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/spline/axis-opts.hpp b/spline/axis-opts.hpp
index c773dd61..b389f4b9 100644
--- a/spline/axis-opts.hpp
+++ b/spline/axis-opts.hpp
@@ -29,7 +29,11 @@ public:
         r15 = 15,
         r10 = 10,
 
+        t600 = 600,
+        t300 = 300,
+        t150 = 150,
         t100 = 100,
+        t75 = 75,
         t30 = 30,
         t20 = 20,
         t15 = 15,
@@ -38,6 +42,10 @@ public:
         o_r180 = -180,
         o_r90 = -90,
         o_t75 = -75,
+        o_t100 = -100,
+        o_t150 = -150,
+        o_t300 = -300,
+        o_t600 = -600,
 
         x1000 = 1000,
     };
diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt
index 3623808a..f414c920 100644
--- a/tracker-neuralnet/CMakeLists.txt
+++ b/tracker-neuralnet/CMakeLists.txt
@@ -28,5 +28,10 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND)
         PERMISSIONS ${opentrack-perms-file}
         )
 
-    otr_install_lib("${ONNXRuntime_RUNTIME}" ".")
+    if(WIN32)
+        otr_install_lib("${ONNXRuntime_RUNTIME}" ".")
+    endif()
+    if(MSVC)
+        otr_install_lib("redist/vcomp140.dll" "${opentrack-bin}")
+    endif()
 endif()
diff --git a/tracker-neuralnet/redist/vcomp140.dll b/tracker-neuralnet/redist/vcomp140.dll
new file mode 100644
index 00000000..42c069b9
--- /dev/null
+++ b/tracker-neuralnet/redist/vcomp140.dll