remove obsolete axis selector from trackers

4 files changed, 25 insertions, 367 deletions

diff --git a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
index 6f81a50b..f485e67f 100644
--- a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
+++ b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
@@ -9,8 +9,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>411</width>

-    <height>232</height>

+    <width>216</width>

+    <height>71</height>

    </rect>

   </property>

   <property name="windowTitle">

@@ -26,353 +26,35 @@
   <property name="autoFillBackground">

    <bool>false</bool>

   </property>

-  <layout class="QVBoxLayout" name="_vertical_layout">

-   <item>

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

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

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

-       <property name="text">

-        <string>Port-number</string>

-       </property>

-      </widget>

-     </item>

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

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

-       <property name="minimum">

-        <number>0</number>

-       </property>

-       <property name="maximum">

-        <number>65535</number>

-       </property>

-      </widget>

-     </item>

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

-      <spacer name="horizontalSpacer_3">

-       <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>

-   </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>

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

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

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

+     <property name="text">

+      <string>Port</string>

      </property>

-     <widget class="QWidget" name="layoutWidget">

-      <property name="geometry">

-       <rect>

-        <x>10</x>

-        <y>20</y>

-        <width>150</width>

-        <height>73</height>

-       </rect>

-      </property>

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

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

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

-         <property name="text">

-          <string>Roll:</string>

-         </property>

-        </widget>

-       </item>

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

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

-         <property name="text">

-          <string>Pitch:</string>

-         </property>

-        </widget>

-       </item>

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

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

-         <property name="text">

-          <string>Yaw:</string>

-         </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>

-        </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>

-        </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>

-        </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_4">

-         <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>

-     </widget>

     </widget>

    </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

-      <enum>Qt::Vertical</enum>

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

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

+     <property name="minimum">

+      <number>0</number>

      </property>

-     <property name="sizeHint" stdset="0">

-      <size>

-       <width>20</width>

-       <height>40</height>

-      </size>

+     <property name="maximum">

+      <number>65535</number>

      </property>

-    </spacer>

-   </item>

-   <item>

-    <layout class="QVBoxLayout" name="verticalLayout">

-     <item>

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

-       <property name="text">

-        <string>Enter the port-number for the remote PC.</string>

-       </property>

-       <property name="wordWrap">

-        <bool>true</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

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

-       <property name="text">

-        <string>Remember: you may have to change firewall-settings too!</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

+    </widget>

    </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout">

-     <item>

-      <spacer name="horizontalSpacer_2">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-     <item>

-      <layout class="QHBoxLayout" name="horizontalLayout_2">

-       <property name="sizeConstraint">

-        <enum>QLayout::SetDefaultConstraint</enum>

-       </property>

-       <item>

-        <widget class="QPushButton" name="btnOK">

-         <property name="sizePolicy">

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

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>OK</string>

-         </property>

-        </widget>

-       </item>

-       <item>

-        <widget class="QPushButton" name="btnCancel">

-         <property name="sizePolicy">

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

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>Cancel</string>

-         </property>

-        </widget>

-       </item>

-      </layout>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeType">

-        <enum>QSizePolicy::Fixed</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>10</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-    </layout>

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

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

+     <property name="standardButtons">

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

+     </property>

+    </widget>

    </item>

   </layout>

  </widget>

  <tabstops>

   <tabstop>spinPortNumber</tabstop>

-  <tabstop>btnOK</tabstop>

-  <tabstop>btnCancel</tabstop>

  </tabstops>

  <resources/>

  <connections/>

diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
index 1b6d9ddd..335616d5 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
@@ -62,18 +62,8 @@ void FTNoIR_Tracker::StartTracker(QFrame*)
 void FTNoIR_Tracker::GetHeadPoseData(double *data)
 {
     QMutexLocker foo(&mutex);
-    if (s.enable_x)
-        data[TX] = newHeadPose[TX];
-    if (s.enable_y)
-        data[TY] = newHeadPose[TY];
-    if (s.enable_z)
-        data[TZ] = newHeadPose[TZ];
-    if (s.enable_yaw)
-        data[Yaw] = newHeadPose[Yaw];
-    if (s.enable_pitch)
-        data[Pitch] = newHeadPose[Pitch];
-    if (s.enable_roll)
-        data[Roll] = newHeadPose[Roll];
+    for (int i = 0; i < 6; i++)
+        data[i] = last_recv_pose[i];
 }
 
 extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index 22c9c465..92d321b2 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -10,17 +10,9 @@ using namespace options;
 struct settings {
     pbundle b;
     value<int> port;
-    value<bool> enable_roll, enable_pitch, enable_yaw,
-                enable_x, enable_y, enable_z;
     settings() :
         b(bundle("udp-tracker")),
-        port(b, "port", 4242),
-        enable_roll(b, "enable-roll", true),
-        enable_pitch(b, "enable-pitch", true),
-        enable_yaw(b, "enable-yaw", true),
-        enable_x(b, "enable-x", true),
-        enable_y(b, "enable-y", true),
-        enable_z(b, "enable-y", true)
+        port(b, "port", 4242)
     {}
 };
 
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
index 17b174e8..16a59292 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
@@ -30,15 +30,9 @@ QWidget()
 {
 	ui.setupUi( this );
 
-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+	connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
+	connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
-    tie_setting(s.enable_x, ui.chkEnableX);
-    tie_setting(s.enable_y, ui.chkEnableY);
-    tie_setting(s.enable_z, ui.chkEnableZ);
-    tie_setting(s.enable_yaw, ui.chkEnableYaw);
-    tie_setting(s.enable_pitch, ui.chkEnablePitch);
-    tie_setting(s.enable_roll, ui.chkEnableRoll);
     tie_setting(s.port, ui.spinPortNumber);
 }