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_ht/ftnoir_tracker_ht.cpp | 26 +++-------
 ftnoir_tracker_ht/ftnoir_tracker_ht.h   |  7 ---
 ftnoir_tracker_ht/ht-trackercontrols.ui | 91 ++-------------------------------
 3 files changed, 9 insertions(+), 115 deletions(-)

(limited to 'ftnoir_tracker_ht')

diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index ef7e185d..7d6fc24e 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -197,24 +197,16 @@ void Tracker::GetHeadPoseData(double *data)
         shm->frame.width = 0;
     }
     if (shm->result.filled) {
-        if (s.enableRX)
-            data[Yaw] = shm->result.rotx;
-        if (s.enableRY) {
-            data[Pitch] = shm->result.roty;
-		}
-        if (s.enableRZ) {
-            data[Roll] = shm->result.rotz;
-        }
-        if (s.enableTX)
-            data[TX] = shm->result.tx;
-        if (s.enableTY)
-            data[TY] = shm->result.ty;
-        if (s.enableTZ)
-            data[TZ] = shm->result.tz;
         if (fabs(data[Yaw]) > 60 || fabs(data[Pitch]) > 50 || fabs(data[Roll]) > 40)
         {
             shm->pause = true;
         }
+        data[Yaw] = shm->result.rotx;
+        data[Pitch] = shm->result.roty;
+        data[Roll] = shm->result.rotz;
+        data[TX] = shm->result.tx;
+        data[TY] = shm->result.ty;
+        data[TZ] = shm->result.tz;
     } else {
         shm->pause = false;
     }
@@ -267,12 +259,6 @@ TrackerControls::TrackerControls()
     tie_setting(s.camera_idx, ui.cameraName);
     tie_setting(s.fps, ui.cameraFPS);
     tie_setting(s.fov, ui.cameraFOV);
-    tie_setting(s.enableTX, ui.tx);
-    tie_setting(s.enableTY, ui.ty);
-    tie_setting(s.enableTZ, ui.tz);
-    tie_setting(s.enableRX, ui.rx);
-    tie_setting(s.enableRY, ui.ry);
-    tie_setting(s.enableRZ, ui.rz);
     tie_setting(s.resolution, ui.resolution);
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
     connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index 583249dc..418137bc 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -20,17 +20,10 @@ using namespace options;
 
 struct settings {
     pbundle b;
-    value<bool> enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ;
     value<double> fov;
     value<int> fps, camera_idx, resolution;
     settings() :
         b(bundle("HT-Tracker")),
-        enableTX(b, "enable-tx", true),
-        enableTY(b, "enable-ty", true),
-        enableTZ(b, "enable-tz", true),
-        enableRX(b, "enable-rx", true),
-        enableRY(b, "enable-ry", true),
-        enableRZ(b, "enable-rz", true),
         fov(b, "fov", 56),
         fps(b, "fps", 0),
         camera_idx(b, "camera-index", 0),
diff --git a/ftnoir_tracker_ht/ht-trackercontrols.ui b/ftnoir_tracker_ht/ht-trackercontrols.ui
index f57022c8..0b94ffc5 100644
--- a/ftnoir_tracker_ht/ht-trackercontrols.ui
+++ b/ftnoir_tracker_ht/ht-trackercontrols.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>531</width>
-    <height>166</height>
+    <width>354</width>
+    <height>158</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -52,91 +52,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2" rowspan="3">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Enable axes</string>
-     </property>
-     <widget class="QCheckBox" name="rx">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>20</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>RX</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="ry">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>40</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>RY</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="rz">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>60</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>RZ</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="tx">
-      <property name="geometry">
-       <rect>
-        <x>60</x>
-        <y>20</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>TX</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="ty">
-      <property name="geometry">
-       <rect>
-        <x>60</x>
-        <y>40</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>TY</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="tz">
-      <property name="geometry">
-       <rect>
-        <x>60</x>
-        <y>60</y>
-        <width>70</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>TZ</string>
-      </property>
-     </widget>
-    </widget>
-   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
@@ -214,7 +129,7 @@
      </item>
     </widget>
    </item>
-   <item row="4" column="2">
+   <item row="4" column="1">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-- 
cgit v1.2.3