From fb0cd9401e26aaf610356ffe899af268012d18c3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 22 Sep 2014 11:39:07 +0200
Subject: remove obsolete axis selector from trackers

---
 ftnoir_tracker_pt/FTNoIR_PT_Controls.ui        | 245 -------------------------
 ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp |   7 -
 ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h |   9 -
 3 files changed, 261 deletions(-)

(limited to 'ftnoir_tracker_pt')

diff --git a/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui b/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
index 0bbec7e1..44dfc060 100644
--- a/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
+++ b/ftnoir_tracker_pt/FTNoIR_PT_Controls.ui
@@ -129,245 +129,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>85</height>
-          </size>
-         </property>
-         <property name="title">
-          <string>Enable Axis</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <item>
-           <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_6">
-              <property name="text">
-               <string>Roll:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnableRoll</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_9">
-              <property name="text">
-               <string>Pitch:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnablePitch</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_11">
-              <property name="text">
-               <string>Yaw:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnableYaw</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="chkEnableRoll">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="styleSheet">
-               <string notr="true"/>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="chkEnablePitch">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="chkEnableYaw">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="3">
-             <widget class="QLabel" name="label_14">
-              <property name="text">
-               <string>X:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnableX</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="4">
-             <widget class="QCheckBox" name="chkEnableX">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="3">
-             <widget class="QLabel" name="label_15">
-              <property name="text">
-               <string>Y:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnableY</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="4">
-             <widget class="QCheckBox" name="chkEnableY">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="3">
-             <widget class="QLabel" name="label_16">
-              <property name="text">
-               <string>Z:</string>
-              </property>
-              <property name="buddy">
-               <cstring>chkEnableZ</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="4">
-             <widget class="QCheckBox" name="chkEnableZ">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="2">
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Minimum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="1" column="2">
-             <spacer name="horizontalSpacer_5">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Minimum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="2" column="2">
-             <spacer name="horizontalSpacer_8">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Minimum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
@@ -1723,12 +1484,6 @@
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>reset_spin</tabstop>
-  <tabstop>chkEnableRoll</tabstop>
-  <tabstop>chkEnablePitch</tabstop>
-  <tabstop>chkEnableYaw</tabstop>
-  <tabstop>chkEnableX</tabstop>
-  <tabstop>chkEnableY</tabstop>
-  <tabstop>chkEnableZ</tabstop>
   <tabstop>camdevice_combo</tabstop>
   <tabstop>res_x_spin</tabstop>
   <tabstop>res_y_spin</tabstop>
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index 00d10d13..4ba981a5 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -57,13 +57,6 @@ TrackerDialog::TrackerDialog()
     tie_setting(s.threshold_secondary, ui.threshold_secondary_slider);
     tie_setting(s.threshold, ui.threshold_slider);
 
-    tie_setting(s.bEnableYaw, ui.chkEnableYaw);
-    tie_setting(s.bEnablePitch, ui.chkEnablePitch);
-    tie_setting(s.bEnableRoll, ui.chkEnableRoll);
-    tie_setting(s.bEnableX, ui.chkEnableX);
-    tie_setting(s.bEnableY, ui.chkEnableY);
-    tie_setting(s.bEnableZ, ui.chkEnableZ);
-
     tie_setting(s.min_point_size, ui.mindiam_spin);
     tie_setting(s.max_point_size, ui.maxdiam_spin);
 
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
index 109090b3..1eca1e35 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
@@ -38,9 +38,6 @@ struct settings
 
     value<int> reset_time;
 
-    value<bool> bEnableYaw, bEnablePitch, bEnableRoll;
-    value<bool> bEnableX, bEnableY, bEnableZ;
-
     value<int> clip_ty, clip_tz, clip_by, clip_bz;
     value<int> active_model_panel, cap_x, cap_y, cap_z;
 
@@ -70,12 +67,6 @@ struct settings
         t_MH_y(b, "model-centroid-y", 0),
         t_MH_z(b, "model-centroid-z", 0),
         reset_time(b, "reset-time", 2000),
-        bEnableYaw(b, "enable-yaw", true),
-        bEnablePitch(b, "enable-pitch", true),
-        bEnableRoll(b, "enable-roll", true),
-        bEnableX(b, "enable-x", true),
-        bEnableY(b, "enable-y", true),
-        bEnableZ(b, "enable-z", true),
         clip_ty(b, "clip-ty", 0),
         clip_tz(b, "clip-tz", 0),
         clip_by(b, "clip-by", 0),
-- 
cgit v1.2.3