trackhat: more stubs

11 files changed, 360 insertions, 472 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4413f712..65d6e369 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-find_package(OpenCV 3.0)
+find_package(OpenCV 3.0 REQUIRED)
 
 find_package(Qt5 REQUIRED COMPONENTS Core Xml Network Widgets Gui QUIET)
 find_package(Qt5 COMPONENTS SerialPort QUIET)
@@ -83,13 +83,17 @@ macro(opentrack_qt n)
 endmacro()
 
 macro(opentrack_library n dir)
-    cmake_parse_arguments(foolib "" "LINK;COMPILE;GNU-LINK;GNU-COMPILE" "" ${ARGN})
+    cmake_parse_arguments(foolib "" "LINK;COMPILE;GNU-LINK;GNU-COMPILE;STATIC" "" ${ARGN})
     if(NOT " ${foolib_UNPARSED_ARGUMENTS}" STREQUAL " ")
         message(FATAL_ERROR "opentrack_library bad formals")
     endif()
     opentrack_module(${n} ${dir})
     opentrack_qt(${n})
-    add_library(${n} SHARED ${${n}-all})
+    set(link-mode SHARED)
+    if (STATIC)
+        set(link-mode STATIC)
+    endif()
+    add_library(${n} ${link-mode} ${${n}-all})
     target_link_libraries(${n} ${MY_QT_LIBS})
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(${n} PROPERTIES
@@ -99,7 +103,9 @@ macro(opentrack_library n dir)
     else()
         set_target_properties(${n} PROPERTIES LINK_FLAGS ${foolib_LINK} COMPILE_FLAGS ${foolib_COMPILE})
     endif()
-    install(TARGETS ${n} RUNTIME DESTINATION . LIBRARY DESTINATION .)
+    if (NOT STATIC)
+        install(TARGETS ${n} RUNTIME DESTINATION . LIBRARY DESTINATION .)
+    endif()
 endmacro()
 
 function(link_with_dinput8 n)
diff --git a/facetracknoir/images/trackhat-cap.png b/facetracknoir/images/trackhat-cap.png
new file mode 100644
index 00000000..7ce4bd1a
--- /dev/null
+++ b/facetracknoir/images/trackhat-cap.png
diff --git a/facetracknoir/images/trackhat-clip.png b/facetracknoir/images/trackhat-clip.png
new file mode 100644
index 00000000..3320f831
--- /dev/null
+++ b/facetracknoir/images/trackhat-clip.png
diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp
index 4489e502..9afeba7c 100644
--- a/facetracknoir/options-dialog.cpp
+++ b/facetracknoir/options-dialog.cpp
@@ -35,13 +35,6 @@ OptionsDialog::OptionsDialog()
     tie_setting(s.s_main.tcomp_p, ui.tcomp_enable);
     tie_setting(s.s_main.tcomp_tz, ui.tcomp_rz);
 
-    tie_setting(s.s_main.a_x.zero, ui.pos_tx);
-    tie_setting(s.s_main.a_y.zero, ui.pos_ty);
-    tie_setting(s.s_main.a_z.zero, ui.pos_tz);
-    tie_setting(s.s_main.a_yaw.zero, ui.pos_rx);
-    tie_setting(s.s_main.a_pitch.zero, ui.pos_ry);
-    tie_setting(s.s_main.a_roll.zero, ui.pos_rz);
-
     tie_setting(s.s_main.a_yaw.invert, ui.invert_yaw);
     tie_setting(s.s_main.a_pitch.invert, ui.invert_pitch);
     tie_setting(s.s_main.a_roll.invert, ui.invert_roll);
@@ -59,10 +52,26 @@ OptionsDialog::OptionsDialog()
     tie_setting(s.s_main.camera_yaw, ui.camera_yaw);
     tie_setting(s.s_main.camera_pitch, ui.camera_pitch);
     tie_setting(s.s_main.camera_roll, ui.camera_roll);
+    
+    tie_setting(pt.camera_mode, ui.camera_mode);
+
+    tie_setting(pt.threshold, ui.threshold_slider);
+
+    tie_setting(pt.min_point_size, ui.mindiam_spin);
+    tie_setting(pt.max_point_size, ui.maxdiam_spin);
+
+    tie_setting(pt.t_MH_x, ui.tx_spin);
+    tie_setting(pt.t_MH_y, ui.ty_spin);
+    tie_setting(pt.t_MH_z, ui.tz_spin);
+    
+    tie_setting(pt.fov, ui.camera_fov);
+    
+    tie_setting(pt.is_cap, ui.model_cap);
 }
 
 void OptionsDialog::doOK() {
     s.b->save();
+    pt.b->save();
     s.s_main.b->save();
     ui.game_detector->save();
     this->close();
@@ -71,6 +80,7 @@ void OptionsDialog::doOK() {
 
 void OptionsDialog::doCancel() {
     s.b->reload();
+    pt.b->reload();
     s.s_main.b->reload();
     ui.game_detector->revert();
     close();
diff --git a/facetracknoir/options-dialog.hpp b/facetracknoir/options-dialog.hpp
index 71a3acda..33ae1810 100644
--- a/facetracknoir/options-dialog.hpp
+++ b/facetracknoir/options-dialog.hpp
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include "ui_settings.h"
 #include "opentrack/shortcuts.h"
+#include "ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h"
 
 class OptionsDialog: public QWidget
 {
@@ -15,6 +16,7 @@ public:
 private:
     Ui::UI_Settings ui;
     Shortcuts::settings s;
+    settings_pt pt;
 private slots:
     void doOK();
     void doCancel();
diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui
index 34b15b47..240ed522 100644
--- a/facetracknoir/settings.ui
+++ b/facetracknoir/settings.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
-    <height>548</height>
+    <width>462</width>
+    <height>522</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -296,7 +296,7 @@
       <attribute name="title">
        <string>Camera</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
@@ -404,201 +404,402 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_6">
+        <widget class="QGroupBox" name="groupBox_9">
          <property name="title">
-          <string>Center pose offset</string>
+          <string>Device</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
-          <item>
-           <widget class="QLabel" name="label_22">
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_25">
             <property name="text">
-             <string>Alter the centered position sent to games by a fixed amount.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
+             <string>Mode</string>
             </property>
-            <property name="margin">
-             <number>2</number>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="camera_mode">
+            <item>
+             <property name="text">
+              <string>640x480, 75 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>640x480, 60 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>320x240, 189 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>320x240, 120 Hz</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Field of view</string>
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="camera_fov">
+            <item>
+             <property name="text">
+              <string>56°</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>75°</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_6">
+         <property name="title">
+          <string>Point extraction</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="QGroupBox" name="groupBox_7">
-            <property name="styleSheet">
-             <string notr="true">QGroupBox {
-	border: 0;
-}</string>
-            </property>
-            <property name="title">
-             <string/>
+           <widget class="QFrame" name="frame_2">
+            <property name="frameShape">
+             <enum>QFrame::StyledPanel</enum>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="flat">
-             <bool>false</bool>
-            </property>
-            <property name="checkable">
-             <bool>false</bool>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
-            <layout class="QGridLayout" name="gridLayout_3">
-             <item row="2" column="1">
-              <widget class="QDoubleSpinBox" name="pos_rz">
-               <property name="suffix">
-                <string> deg.</string>
+            <layout class="QGridLayout" name="gridLayout_10">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Threshold</string>
                </property>
-               <property name="decimals">
-                <number>3</number>
+               <property name="buddy">
+                <cstring>threshold_slider</cstring>
                </property>
-               <property name="minimum">
-                <double>-180.000000000000000</double>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QSlider" name="threshold_slider">
+               <property name="toolTip">
+                <string>Intensity threshold for point extraction</string>
                </property>
                <property name="maximum">
-                <double>180.000000000000000</double>
+                <number>255</number>
+               </property>
+               <property name="pageStep">
+                <number>1</number>
+               </property>
+               <property name="value">
+                <number>127</number>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="tickPosition">
+                <enum>QSlider::TicksBothSides</enum>
+               </property>
+               <property name="tickInterval">
+                <number>25</number>
                </property>
               </widget>
              </item>
-             <item row="2" column="3">
-              <widget class="QDoubleSpinBox" name="pos_tz">
-               <property name="suffix">
-                <string> cm</string>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFrame" name="frame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_3">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_29">
+               <property name="text">
+                <string>Min size</string>
                </property>
-               <property name="decimals">
-                <number>3</number>
+               <property name="buddy">
+                <cstring>mindiam_spin</cstring>
                </property>
-               <property name="minimum">
-                <double>-100.000000000000000</double>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="mindiam_spin">
+               <property name="toolTip">
+                <string>Minimum point diameter</string>
+               </property>
+               <property name="suffix">
+                <string> px</string>
                </property>
                <property name="maximum">
-                <double>100.000000000000000</double>
+                <number>1024</number>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
-              <widget class="QLabel" name="label_4">
+              <widget class="QLabel" name="label_22">
                <property name="text">
-                <string>TX</string>
+                <string>Max size</string>
+               </property>
+               <property name="buddy">
+                <cstring>maxdiam_spin</cstring>
                </property>
               </widget>
              </item>
              <item row="0" column="3">
-              <widget class="QDoubleSpinBox" name="pos_tx">
-               <property name="suffix">
-                <string> cm</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
+              <widget class="QSpinBox" name="maxdiam_spin">
+               <property name="toolTip">
+                <string>Maximum point diameter</string>
                </property>
-               <property name="minimum">
-                <double>-100.000000000000000</double>
+               <property name="suffix">
+                <string> px</string>
                </property>
                <property name="maximum">
-                <double>100.000000000000000</double>
+                <number>1024</number>
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>RY</string>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Model</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <widget class="QGroupBox" name="groupBox_7">
+         <property name="styleSheet">
+          <string notr="true">QGroupBox { border: 0; }</string>
+         </property>
+         <property name="title">
+          <string/>
+         </property>
+         <widget class="QRadioButton" name="model_cap">
+          <property name="geometry">
+           <rect>
+            <x>10</x>
+            <y>10</y>
+            <width>82</width>
+            <height>17</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string>Cap</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+         <widget class="QRadioButton" name="model_clip">
+          <property name="geometry">
+           <rect>
+            <x>10</x>
+            <y>140</y>
+            <width>82</width>
+            <height>17</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string>Clip</string>
+          </property>
+         </widget>
+         <widget class="QLabel" name="label_3">
+          <property name="geometry">
+           <rect>
+            <x>80</x>
+            <y>0</y>
+            <width>171</width>
+            <height>121</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="ui-res.qrc">:/images/trackhat-cap.png</pixmap>
+          </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+         </widget>
+         <widget class="QLabel" name="label_4">
+          <property name="geometry">
+           <rect>
+            <x>70</x>
+            <y>130</y>
+            <width>201</width>
+            <height>161</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="ui-res.qrc">:/images/trackhat-clip.png</pixmap>
+          </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_10">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Model position</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_11">
+          <item row="0" column="0">
+           <widget class="QFrame" name="frame_3">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_12">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_61">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
                </property>
-              </widget>
-             </item>
-             <item row="1" column="2">
-              <widget class="QLabel" name="label_5">
                <property name="text">
-                <string>TY</string>
+                <string>x:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QDoubleSpinBox" name="pos_ry">
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="tx_spin">
                <property name="suffix">
-                <string> deg.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
+                <string> mm</string>
                </property>
                <property name="minimum">
-                <double>-180.000000000000000</double>
+                <number>-65535</number>
                </property>
                <property name="maximum">
-                <double>180.000000000000000</double>
+                <number>65536</number>
                </property>
               </widget>
              </item>
-             <item row="2" column="2">
-              <widget class="QLabel" name="label_6">
-               <property name="text">
-                <string>TZ</string>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_62">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
                </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_3">
                <property name="text">
-                <string>RZ</string>
+                <string>y:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="3">
-              <widget class="QDoubleSpinBox" name="pos_ty">
+             <item row="1" column="1">
+              <widget class="QSpinBox" name="ty_spin">
                <property name="suffix">
-                <string> cm</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
+                <string> mm</string>
                </property>
                <property name="minimum">
-                <double>-100.000000000000000</double>
+                <number>-65535</number>
                </property>
                <property name="maximum">
-                <double>100.000000000000000</double>
+                <number>65536</number>
                </property>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_2">
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_66">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
                <property name="text">
-                <string>RX</string>
+                <string>z:</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QDoubleSpinBox" name="pos_rx">
+             <item row="2" column="1">
+              <widget class="QSpinBox" name="tz_spin">
                <property name="suffix">
-                <string> deg.</string>
-               </property>
-               <property name="decimals">
-                <number>3</number>
+                <string> mm</string>
                </property>
                <property name="minimum">
-                <double>-180.000000000000000</double>
+                <number>-65535</number>
                </property>
                <property name="maximum">
-                <double>180.000000000000000</double>
+                <number>65536</number>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="label_59">
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only pitch and yaw during calibration.&lt;/p&gt;&lt;p&gt;Don't roll and don't translate.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="tcalib_button">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Toggle calibration</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
@@ -1170,12 +1371,6 @@
   <tabstop>camera_yaw</tabstop>
   <tabstop>camera_pitch</tabstop>
   <tabstop>camera_roll</tabstop>
-  <tabstop>pos_rx</tabstop>
-  <tabstop>pos_ry</tabstop>
-  <tabstop>pos_rz</tabstop>
-  <tabstop>pos_tx</tabstop>
-  <tabstop>pos_ty</tabstop>
-  <tabstop>pos_tz</tabstop>
   <tabstop>tcomp_enable</tabstop>
   <tabstop>tcomp_rz</tabstop>
   <tabstop>src_yaw</tabstop>
@@ -1191,7 +1386,9 @@
   <tabstop>src_z</tabstop>
   <tabstop>invert_z</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="ui-res.qrc"/>
+ </resources>
  <connections/>
  <slots>
   <slot>startEngineClicked()</slot>
diff --git a/facetracknoir/ui-res.qrc b/facetracknoir/ui-res.qrc
index 030a6153..b251ab8f 100644
--- a/facetracknoir/ui-res.qrc
+++ b/facetracknoir/ui-res.qrc
@@ -6,5 +6,7 @@
         <file>images/facetracknoir.png</file>
         <file>images/no-feed.png</file>
         <file>images/filter-16.png</file>
+        <file>images/trackhat-cap.png</file>
+        <file>images/trackhat-clip.png</file>
     </qresource>
 </RCC>
diff --git a/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui b/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
index 0e6048c3..15062a8d 100644
--- a/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
+++ b/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
@@ -54,7 +54,7 @@
       <locale language="English" country="UnitedStates"/>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
@@ -253,131 +253,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Point extraction</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_7">
-          <item row="0" column="4">
-           <widget class="QSpinBox" name="mindiam_spin">
-            <property name="toolTip">
-             <string>Minimum point diameter</string>
-            </property>
-            <property name="suffix">
-             <string> px</string>
-            </property>
-            <property name="maximum">
-             <number>1024</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2">
-           <widget class="QSlider" name="threshold_slider">
-            <property name="toolTip">
-             <string>Intensity threshold for point extraction</string>
-            </property>
-            <property name="maximum">
-             <number>255</number>
-            </property>
-            <property name="pageStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>127</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="tickPosition">
-             <enum>QSlider::TicksBothSides</enum>
-            </property>
-            <property name="tickInterval">
-             <number>25</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="4">
-           <widget class="QSpinBox" name="maxdiam_spin">
-            <property name="toolTip">
-             <string>Maximum point diameter</string>
-            </property>
-            <property name="suffix">
-             <string> px</string>
-            </property>
-            <property name="maximum">
-             <number>1024</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>Max size</string>
-            </property>
-            <property name="buddy">
-             <cstring>maxdiam_spin</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" colspan="2">
-           <widget class="QSlider" name="threshold_secondary_slider">
-            <property name="toolTip">
-             <string>Per pixel hysteresis width (leave left if there is little difference between dot and non-dot, move right for increased stability against pixel noise)</string>
-            </property>
-            <property name="maximum">
-             <number>255</number>
-            </property>
-            <property name="pageStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>100</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="tickPosition">
-             <enum>QSlider::TicksBothSides</enum>
-            </property>
-            <property name="tickInterval">
-             <number>25</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Threshold</string>
-            </property>
-            <property name="buddy">
-             <cstring>threshold_slider</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_secondary">
-            <property name="text">
-             <string>Hysteresis</string>
-            </property>
-            <property name="buddy">
-             <cstring>threshold_secondary_slider</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QLabel" name="label_7">
-            <property name="text">
-             <string>Min size</string>
-            </property>
-            <property name="buddy">
-             <cstring>mindiam_spin</cstring>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
@@ -916,131 +791,6 @@
          </widget>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_10">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Model position</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="0">
-           <widget class="QFrame" name="frame_2">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_11">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_61">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>x:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QSpinBox" name="tx_spin">
-               <property name="suffix">
-                <string> mm</string>
-               </property>
-               <property name="minimum">
-                <number>-65535</number>
-               </property>
-               <property name="maximum">
-                <number>65536</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_62">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>y:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSpinBox" name="ty_spin">
-               <property name="suffix">
-                <string> mm</string>
-               </property>
-               <property name="minimum">
-                <number>-65535</number>
-               </property>
-               <property name="maximum">
-                <number>65536</number>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_66">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>z:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QSpinBox" name="tz_spin">
-               <property name="suffix">
-                <string> mm</string>
-               </property>
-               <property name="minimum">
-                <number>-65535</number>
-               </property>
-               <property name="maximum">
-                <number>65536</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="label_59">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only pitch and yaw during calibration.&lt;/p&gt;&lt;p&gt;Don't roll and don't translate.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="tcalib_button">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Toggle calibration</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
@@ -1149,10 +899,6 @@
   <tabstop>res_y_spin</tabstop>
   <tabstop>fps_spin</tabstop>
   <tabstop>fov</tabstop>
-  <tabstop>threshold_slider</tabstop>
-  <tabstop>mindiam_spin</tabstop>
-  <tabstop>threshold_secondary_slider</tabstop>
-  <tabstop>maxdiam_spin</tabstop>
   <tabstop>model_tabs</tabstop>
   <tabstop>clip_tlength_spin</tabstop>
   <tabstop>clip_theight_spin</tabstop>
@@ -1167,10 +913,6 @@
   <tabstop>m2x_spin</tabstop>
   <tabstop>m2y_spin</tabstop>
   <tabstop>m2z_spin</tabstop>
-  <tabstop>tx_spin</tabstop>
-  <tabstop>ty_spin</tabstop>
-  <tabstop>tz_spin</tabstop>
-  <tabstop>tcalib_button</tabstop>
  </tabstops>
  <resources>
   <include location="ftnoir_tracker_pt.qrc"/>
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index 86178cb3..6f78b141 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -39,43 +39,7 @@ TrackerDialog_PT::TrackerDialog_PT()
     }
 #endif
 
-    tie_setting(s.camera_name, ui.camdevice_combo);
-    tie_setting(s.cam_res_x, ui.res_x_spin);
-    tie_setting(s.cam_res_y, ui.res_y_spin);
-    tie_setting(s.cam_fps, ui.fps_spin);
-
-    tie_setting(s.threshold_secondary, ui.threshold_secondary_slider);
-    tie_setting(s.threshold, ui.threshold_slider);
-
-    tie_setting(s.min_point_size, ui.mindiam_spin);
-    tie_setting(s.max_point_size, ui.maxdiam_spin);
-
-    tie_setting(s.clip_by, ui.clip_bheight_spin);
-    tie_setting(s.clip_bz, ui.clip_blength_spin);
-    tie_setting(s.clip_ty, ui.clip_theight_spin);
-    tie_setting(s.clip_tz, ui.clip_tlength_spin);
-
-    tie_setting(s.cap_x, ui.cap_width_spin);
-    tie_setting(s.cap_y, ui.cap_height_spin);
-    tie_setting(s.cap_z, ui.cap_length_spin);
-
-    tie_setting(s.m01_x, ui.m1x_spin);
-    tie_setting(s.m01_y, ui.m1y_spin);
-    tie_setting(s.m01_z, ui.m1z_spin);
-
-    tie_setting(s.m02_x, ui.m2x_spin);
-    tie_setting(s.m02_y, ui.m2y_spin);
-    tie_setting(s.m02_z, ui.m2z_spin);
-
-    tie_setting(s.t_MH_x, ui.tx_spin);
-    tie_setting(s.t_MH_y, ui.ty_spin);
-    tie_setting(s.t_MH_z, ui.tz_spin);
-    
-    tie_setting(s.fov, ui.fov);
-    
-    tie_setting(s.active_model_panel, ui.model_tabs);
-    
-    tie_setting(s.dynamic_pose, ui.dynamic_pose);
+
 
     connect( ui.tcalib_button,SIGNAL(toggled(bool)), this,SLOT(startstop_trans_calib(bool)) );
 
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
index 30647412..1abb8897 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
@@ -8,63 +8,30 @@
 #ifndef FTNOIR_TRACKER_PT_SETTINGS_H
 #define FTNOIR_TRACKER_PT_SETTINGS_H
 
-#include <opencv2/core/core.hpp>
-
 #include "opentrack/options.hpp"
 using namespace options;
 
 struct settings_pt : opts
 {
-    value<QString> camera_name;
-    value<int> cam_res_x,
-               cam_res_y,
-               cam_fps,
-               threshold,
-               threshold_secondary,
+    value<int> threshold,
                min_point_size,
                max_point_size;
 
-    value<int> m01_x, m01_y, m01_z;
-    value<int> m02_x, m02_y, m02_z;
-
     value<int> t_MH_x, t_MH_y, t_MH_z;
-
-    value<int> clip_ty, clip_tz, clip_by, clip_bz;
-    value<int> active_model_panel, cap_x, cap_y, cap_z;
-    
-    value<int> fov;
-    
-    value<bool> dynamic_pose;
+    value<int> fov, camera_mode;
+    value<bool> is_cap;
 
     settings_pt() :
         opts("tracker-pt"),
-        camera_name(b, "camera-name", ""),
-        cam_res_x(b, "camera-res-width", 640),
-        cam_res_y(b, "camera-res-height", 480),
-        cam_fps(b, "camera-fps", 30),
         threshold(b, "threshold-primary", 128),
-        threshold_secondary(b, "threshold-secondary", 128),
         min_point_size(b, "min-point-size", 10),
         max_point_size(b, "max-point-size", 50),
-        m01_x(b, "m_01-x", 0),
-        m01_y(b, "m_01-y", 0),
-        m01_z(b, "m_01-z", 0),
-        m02_x(b, "m_02-x", 0),
-        m02_y(b, "m_02-y", 0),
-        m02_z(b, "m_02-z", 0),
         t_MH_x(b, "model-centroid-x", 0),
         t_MH_y(b, "model-centroid-y", 0),
         t_MH_z(b, "model-centroid-z", 0),
-        clip_ty(b, "clip-ty", 0),
-        clip_tz(b, "clip-tz", 0),
-        clip_by(b, "clip-by", 0),
-        clip_bz(b, "clip-bz", 0),
-        active_model_panel(b, "active-model-panel", 0),
-        cap_x(b, "cap-x", 0),
-        cap_y(b, "cap-y", 0),
-        cap_z(b, "cap-z", 0),
         fov(b, "camera-fov", 56),
-        dynamic_pose(b, "dynamic-pose-resolution", true)
+        camera_mode(b, "camera-mode", 0),
+        is_cap(b, "model-is-cap", true)
     {}
 };
 
diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp
index 250d4563..f47b3873 100644
--- a/opentrack/main-settings.hpp
+++ b/opentrack/main-settings.hpp
@@ -7,11 +7,9 @@
 using namespace options;
 
 struct axis_opts {
-    value<double> zero;
     value<bool> invert, altp;
     value<int> src;
     axis_opts(pbundle b, QString pfx, int idx) :
-        zero(b, n(pfx, "zero-pos"), 0),
         invert(b, n(pfx, "invert-sign"), false),
         altp(b, n(pfx, "alt-axis-sign"), false),
         src(b, n(pfx, "source-index"), idx)