trackhat: more stubs

3 files changed, 7 insertions, 334 deletions

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)
     {}
 };