From 9168374841f69bb9edd996d7f99759629d98a0ea Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 27 Apr 2013 04:20:29 +0200 Subject: Rift: UI fixes --- ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | 161 ++------------------- ftnoir_tracker_rift/ftnoir_tracker_rift.cpp | 7 +- ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp | 8 +- 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 @@ 0 0 411 - 210 + 142 @@ -24,40 +24,6 @@ false - - - - - - Port-number - - - - - - - 5550 - - - 10000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -86,13 +52,6 @@ - - - - Pitch: - - - @@ -100,25 +59,6 @@ - - - - - 20 - 16777215 - - - - Qt::LeftToRight - - - - - - - - - @@ -135,31 +75,15 @@ - - - - - 20 - 16777215 - - - - Qt::LeftToRight - - - - - - - - + + - X: + Pitch: - - + + 20 @@ -169,43 +93,16 @@ Qt::LeftToRight - - - - - - - - - Y: - - - - - - - - 20 - 16777215 - - - - Qt::LeftToRight + + - - - - Z: - - - - - + + 20 @@ -220,22 +117,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - @@ -253,27 +134,6 @@ - - - - - - Enter the port-number for the remote PC. - - - true - - - - - - - Remember: you may have to change firewall-settings too! - - - - - @@ -367,7 +227,6 @@ - spinPortNumber btnOK btnCancel 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; -- cgit v1.2.3