summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui161
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.cpp7
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp8
3 files changed, 20 insertions, 156 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
index 8bef36a7..789d2d25 100644
--- a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
+++ b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>411</width>
- <height>210</height>
+ <height>142</height>
</rect>
</property>
<property name="windowTitle">
@@ -25,40 +25,6 @@
</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>5550</number>
- </property>
- <property name="maximum">
- <number>10000</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>
@@ -86,13 +52,6 @@
</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">
@@ -100,25 +59,6 @@
</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">
@@ -135,31 +75,15 @@
</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">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_9">
<property name="text">
- <string>X:</string>
+ <string>Pitch:</string>
</property>
</widget>
</item>
- <item row="0" column="4">
- <widget class="QCheckBox" name="chkEnableX">
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="chkEnableRoll">
<property name="maximumSize">
<size>
<width>20</width>
@@ -169,43 +93,16 @@
<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 name="styleSheet">
+ <string notr="true"/>
</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">
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="chkEnableYaw">
<property name="maximumSize">
<size>
<width>20</width>
@@ -220,22 +117,6 @@
</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>
@@ -254,27 +135,6 @@
</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>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer_2">
@@ -367,7 +227,6 @@
</layout>
</widget>
<tabstops>
- <tabstop>spinPortNumber</tabstop>
<tabstop>btnOK</tabstop>
<tabstop>btnCancel</tabstop>
</tabstops>
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index ca290d0b..53ce8842 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -74,16 +74,17 @@ bool Rift_Tracker::GiveHeadPoseData(double *data)
newHeadPose[RY] =pitch;
newHeadPose[RZ] = roll;
newHeadPose[RX] = yaw;
-
+#if 0
if (bEnableX) {
data[TX] = newHeadPose[TX];
}
- if (bEnableX) {
+ if (bEnableY) {
data[TY] = newHeadPose[TY];
}
- if (bEnableX) {
+ if (bEnableY) {
data[TZ] = newHeadPose[TZ];
}
+#endif
if (bEnableYaw) {
data[RX] = newHeadPose[RX];
}
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
index e724e438..ca82d5e3 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
@@ -44,10 +44,11 @@ QWidget()
connect(ui.chkEnableRoll, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
connect(ui.chkEnablePitch, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
connect(ui.chkEnableYaw, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
+#if 0
connect(ui.chkEnableX, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
connect(ui.chkEnableY, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
connect(ui.chkEnableZ, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));
-
+#endif
// Load the settings from the current .INI-file
loadSettings();
}
@@ -135,10 +136,11 @@ void TrackerControls::loadSettings() {
ui.chkEnableRoll->setChecked(iniFile.value ( "EnableRoll", 1 ).toBool());
ui.chkEnablePitch->setChecked(iniFile.value ( "EnablePitch", 1 ).toBool());
ui.chkEnableYaw->setChecked(iniFile.value ( "EnableYaw", 1 ).toBool());
+#if 0
ui.chkEnableX->setChecked(iniFile.value ( "EnableX", 1 ).toBool());
ui.chkEnableY->setChecked(iniFile.value ( "EnableY", 1 ).toBool());
ui.chkEnableZ->setChecked(iniFile.value ( "EnableZ", 1 ).toBool());
-
+#endif
iniFile.endGroup ();
settingsDirty = false;
@@ -157,9 +159,11 @@ void TrackerControls::save() {
iniFile.setValue ( "EnableRoll", ui.chkEnableRoll->isChecked() );
iniFile.setValue ( "EnablePitch", ui.chkEnablePitch->isChecked() );
iniFile.setValue ( "EnableYaw", ui.chkEnableYaw->isChecked() );
+#if 0
iniFile.setValue ( "EnableX", ui.chkEnableX->isChecked() );
iniFile.setValue ( "EnableY", ui.chkEnableY->isChecked() );
iniFile.setValue ( "EnableZ", ui.chkEnableZ->isChecked() );
+#endif
iniFile.endGroup ();
settingsDirty = false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 17:22:07 +0000