From e89709a801e7874bc02c66848c638c6a0ccc85c1 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 2 Dec 2017 09:45:20 +0100 Subject: logic: remove center_method setting --- gui/settings-dialog.ui | 964 +++++++++++++++++++++---------------------------- gui/settings.cpp | 2 +- 2 files changed, 421 insertions(+), 545 deletions(-) (limited to 'gui') diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui index fe5b8864..7ffff281 100644 --- a/gui/settings-dialog.ui +++ b/gui/settings-dialog.ui @@ -6,8 +6,8 @@ 0 0 - 588 - 562 + 576 + 560 @@ -36,7 +36,7 @@ - 0 + 1 false @@ -963,7 +963,7 @@ - + 0 @@ -971,301 +971,206 @@ - Camera + Output - + - + 0 0 + + + true + + - Custom center pose + Output remap - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignHCenter|Qt::AlignTop - - - - - Alter the centered position sent to games. - - - true - - - 2 + + false + + + false + + + + QLayout::SetMinAndMaxSize + + + 4 + + + 0 + + + 6 + + + + + + 0 + 0 + - - - - - QGroupBox { + QGroupBox +{ border: 0; } - - - - - Qt::AlignCenter - - - false - - - false - - - - + + + 12 + + + 9 + + + - + 0 0 - - ° - - - 2 - - - -180.000000000000000 - - - 180.000000000000000 - + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + - - + + - 0 + 254 0 - - cm - - - 3 - - - -500.000000000000000 - - - 500.000000000000000 - - - - - X - - + + - 0 + 254 0 - - cm - - - 3 - - - -500.000000000000000 - - - 500.000000000000000 - - - - - - Pitch + Roll - - + + + + + 255 + 0 + + - Y + - - + + - 0 + 255 0 - - ° - - - 2 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - Z + - - + + + + + 254 + 0 + + - Roll + Yaw - - + + - 0 + 255 0 - - cm - - - 3 - - - -500.000000000000000 - - - 500.000000000000000 - - - - - - Yaw + - + - 0 + 254 0 - - ° - - - 2 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - - - - - - - - - 0 - 0 - - - - Centering method - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - 4 - 0 - - - - Try changing this if centering doesn't perform correctly for your input device. - - - true - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 1 - - - 0 - - - 1 - - - 0 - - - - - Method + + Source - - + + 0 @@ -1274,112 +1179,43 @@ - Relative (inertial device) + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll - Absolute (camera device) + Disabled - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 0 - - - - - - - - - - 0 - 0 - - - - Output - - - - - - - 0 - 0 - - - - - true - - - - Output remap - - - Qt::AlignHCenter|Qt::AlignTop - - - false - - - false - - - - QLayout::SetMinAndMaxSize - - - 4 - - - 0 - - - 6 - - - - - - 0 - 0 - - - - QGroupBox -{ - border: 0; -} - - - - 12 - - - 9 - - - + + 255 @@ -1391,47 +1227,8 @@ - - - - - 254 - 0 - - - - Roll - - - - - - - - 254 - 0 - - - - X - - - - - - - - 254 - 0 - - - - Invert - - - - - + + 0 @@ -1475,8 +1272,8 @@ - - + + 254 @@ -1484,12 +1281,25 @@ - Pitch + Z - - + + + + + 255 + 0 + + + + + + + + + 0 @@ -1591,73 +1401,8 @@ - - - - - 254 - 0 - - - - Y - - - - - - - - 254 - 0 - - - - Destination - - - - - - - - 255 - 0 - - - - - - - - - - - - 254 - 0 - - - - Yaw - - - - - - - - 255 - 0 - - - - - - - - - + + 254 @@ -1665,12 +1410,12 @@ - Source + Invert - - + + 0 @@ -1714,66 +1459,21 @@ - - + + - 255 + 254 0 - + Destination - - - - - 0 - 0 - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - + + 254 @@ -1781,65 +1481,20 @@ - Z + Y - - - - - 0 - 0 - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - + + - 255 + 254 0 - + Pitch @@ -1883,13 +1538,241 @@ + + + + + 0 + 0 + + + + Custom center pose + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + Alter the centered position sent to games. Useful if the default position is too much downward or upward. + + + true + + + 2 + + + + + + + QGroupBox { + border: 0; +} + + + + + + Qt::AlignCenter + + + false + + + false + + + + + + + 0 + 0 + + + + ° + + + 2 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + + 0 + 0 + + + + cm + + + 3 + + + -500.000000000000000 + + + 500.000000000000000 + + + + + + + X + + + + + + + + 0 + 0 + + + + cm + + + 3 + + + -500.000000000000000 + + + 500.000000000000000 + + + + + + + Pitch + + + + + + + Y + + + + + + + + 0 + 0 + + + + ° + + + 2 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + Z + + + + + + + Roll + + + + + + + + 0 + 0 + + + + cm + + + 3 + + + -500.000000000000000 + + + 500.000000000000000 + + + + + + + Yaw + + + + + + + + 0 + 0 + + + + ° + + + 2 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + + + Qt::Vertical - QSizePolicy::Expanding + QSizePolicy::Minimum @@ -2348,13 +2231,6 @@ disable_translation trayp tray_start - pos_rx - pos_ry - pos_rz - pos_tx - pos_ty - pos_tz - center_method src_yaw invert_yaw src_pitch diff --git a/gui/settings.cpp b/gui/settings.cpp index 3105bad9..33d9b5cf 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -85,7 +85,7 @@ OptionsDialog::OptionsDialog(std::function pause_keybindings) : tie_setting(main.a_y.src, ui.src_y); tie_setting(main.a_z.src, ui.src_z); - tie_setting(main.center_method, ui.center_method); + //tie_setting(main.center_method, ui.center_method); tie_setting(main.tracklogging_enabled, ui.tracklogging_enabled); -- cgit v1.2.3