remove obsolete axis selector from trackers

4 files changed, 25 insertions, 152 deletions

diff --git a/ftnoir_tracker_freepie-udp/freepie-udp-controls.ui b/ftnoir_tracker_freepie-udp/freepie-udp-controls.ui
index 937dafaa..9870372a 100644
--- a/ftnoir_tracker_freepie-udp/freepie-udp-controls.ui
+++ b/ftnoir_tracker_freepie-udp/freepie-udp-controls.ui
@@ -9,8 +9,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>208</width>

-    <height>240</height>

+    <width>198</width>

+    <height>71</height>

    </rect>

   </property>

   <property name="windowTitle">

@@ -26,145 +26,31 @@
   <property name="autoFillBackground">

    <bool>false</bool>

   </property>

-  <layout class="QGridLayout" name="gridLayout_3">

-   <property name="topMargin">

-    <number>0</number>

-   </property>

-   <item row="0" column="0" colspan="3">

-    <widget class="QGroupBox" name="groupbox_port">

-     <layout class="QGridLayout" name="gridLayout">

-      <item row="0" column="1">

-       <widget class="QSpinBox" name="port">

-        <property name="minimum">

-         <number>0</number>

-        </property>

-        <property name="maximum">

-         <number>65535</number>

-        </property>

-       </widget>

-      </item>

-      <item row="0" column="0">

-       <widget class="QLabel" name="label_5">

-        <property name="sizePolicy">

-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

-          <horstretch>0</horstretch>

-          <verstretch>0</verstretch>

-         </sizepolicy>

-        </property>

-        <property name="text">

-         <string>UDP port</string>

-        </property>

-       </widget>

-      </item>

-     </layout>

+  <layout class="QGridLayout" name="gridLayout">

+   <item row="0" column="0">

+    <widget class="QLabel" name="label_5">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="text">

+      <string>UDP port</string>

+     </property>

     </widget>

    </item>

-   <item row="1" column="0" rowspan="2" colspan="3">

-    <widget class="QGroupBox" name="groupBox_3">

-     <property name="minimumSize">

-      <size>

-       <width>0</width>

-       <height>85</height>

-      </size>

+   <item row="0" column="1">

+    <widget class="QSpinBox" name="port">

+     <property name="minimum">

+      <number>0</number>

      </property>

-     <property name="title">

-      <string>Enable axis</string>

+     <property name="maximum">

+      <number>65535</number>

      </property>

-     <layout class="QGridLayout" name="gridLayout_2">

-      <item row="2" column="0">

-       <widget class="QLabel" name="label_6">

-        <property name="sizePolicy">

-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

-          <horstretch>0</horstretch>

-          <verstretch>0</verstretch>

-         </sizepolicy>

-        </property>

-        <property name="text">

-         <string>Roll</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="0" column="0">

-       <widget class="QLabel" name="label_11">

-        <property name="sizePolicy">

-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

-          <horstretch>0</horstretch>

-          <verstretch>0</verstretch>

-         </sizepolicy>

-        </property>

-        <property name="text">

-         <string>Yaw</string>

-        </property>

-       </widget>

-      </item>

-      <item row="1" column="0">

-       <widget class="QLabel" name="label_9">

-        <property name="sizePolicy">

-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

-          <horstretch>0</horstretch>

-          <verstretch>0</verstretch>

-         </sizepolicy>

-        </property>

-        <property name="text">

-         <string>Pitch</string>

-        </property>

-       </widget>

-      </item>

-      <item row="0" 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="2" 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>

-     </layout>

     </widget>

    </item>

-   <item row="3" column="1">

+   <item row="1" column="0" colspan="2">

     <widget class="QDialogButtonBox" name="buttonBox">

      <property name="standardButtons">

       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>

@@ -173,9 +59,6 @@
    </item>

   </layout>

  </widget>

- <tabstops>

-  <tabstop>port</tabstop>

- </tabstops>

  <resources/>

  <connections/>

  <slots>

diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
index 7223a33f..718ec510 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
@@ -92,12 +92,9 @@ void TrackerImpl::GetHeadPoseData(double *data)
     if (s.enable_z)
         data[TZ] = pose[TZ];
 #endif
-    if (s.enable_yaw)
-        data[Yaw] = pose[Yaw];
-    if (s.enable_pitch)
-        data[Pitch] = pose[Pitch];
-    if (s.enable_roll)
-        data[Roll] = pose[Roll];
+    data[Yaw] = pose[Yaw];
+    data[Pitch] = pose[Pitch];
+    data[Roll] = pose[Roll];
 }
 
 extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
index 8cefb509..b3f028fc 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
@@ -16,13 +16,9 @@ using namespace options;
 struct settings {
     pbundle b;
     value<int> port;
-    value<bool> enable_roll, enable_pitch, enable_yaw;
     settings() :
         b(bundle("freepie-udp-tracker")),
-        port(b, "port", 4237),
-        enable_roll(b, "enable-roll", true),
-        enable_pitch(b, "enable-pitch", true),
-        enable_yaw(b, "enable-yaw", true)
+        port(b, "port", 4237)
     {}
 };
 
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
index d845ff4a..1489e336 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
@@ -9,9 +9,6 @@ TrackerDialog::TrackerDialog()
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     tie_setting(s.port, ui.port);
-    tie_setting(s.enable_yaw, ui.chkEnableYaw);
-    tie_setting(s.enable_pitch, ui.chkEnablePitch);
-    tie_setting(s.enable_roll, ui.chkEnableRoll);
 }
 
 void TrackerDialog::doOK() {