summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-11-25 09:13:14 +0100
committerStanislaw Halik <sthalik@misaki.pl>2016-11-25 09:13:14 +0100
commit97f80ccc1fed421665ee49745e230a7fb63f226a (patch)
tree9de66fe34bab9a55d2f10ba5e6694167390d70c4 /gui
parent50d3b377880049aebfd69c4c6f956b0f8d5326dd (diff)
Revert "logic, gui: remove relative translation disable axis"opentrack-2.3-rc99p15
This reverts commit 9fb8b48027ac8c03628955da2b186de88745e348.
Diffstat (limited to 'gui')
-rw-r--r--gui/options-dialog.cpp7
-rw-r--r--gui/options-dialog.ui88
2 files changed, 93 insertions, 2 deletions
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index 2be39ac2..bafddb57 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -51,8 +51,14 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
tie_setting(main.tcomp_p, ui.tcomp_enable);
+ tie_setting(main.tcomp_disable_tx, ui.tcomp_tx_disable);
+ tie_setting(main.tcomp_disable_ty, ui.tcomp_ty_disable);
tie_setting(main.tcomp_disable_tz, ui.tcomp_tz_disable);
+ tie_setting(main.tcomp_disable_src_yaw, ui.tcomp_src_yaw_disable);
+ tie_setting(main.tcomp_disable_src_pitch, ui.tcomp_src_pitch_disable);
+ tie_setting(main.tcomp_disable_src_roll, ui.tcomp_src_roll_disable);
+
tie_setting(main.a_x.zero, ui.pos_tx);
tie_setting(main.a_y.zero, ui.pos_ty);
tie_setting(main.a_z.zero, ui.pos_tz);
@@ -77,6 +83,7 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
tie_setting(main.camera_yaw, ui.camera_yaw);
tie_setting(main.camera_pitch, ui.camera_pitch);
tie_setting(main.camera_roll, ui.camera_roll);
+ tie_setting(main.use_camera_offset_from_centering, ui.use_center_as_translation_camera_offset);
tie_setting(main.center_method, ui.center_method);
diff --git a/gui/options-dialog.ui b/gui/options-dialog.ui
index 737bc581..f23dd63f 100644
--- a/gui/options-dialog.ui
+++ b/gui/options-dialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>450</width>
- <height>593</height>
+ <height>599</height>
</rect>
</property>
<property name="minimumSize">
@@ -463,6 +463,13 @@
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="4" column="0">
+ <widget class="QCheckBox" name="use_center_as_translation_camera_offset">
+ <property name="text">
+ <string>Use camera center as translation offset</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
<widget class="QLabel" name="label_17">
<property name="minimumSize">
<size>
@@ -487,7 +494,7 @@
</property>
</widget>
</item>
- <item row="5" column="0" alignment="Qt::AlignLeft">
+ <item row="6" column="0" alignment="Qt::AlignLeft">
<widget class="QGroupBox" name="groupBox_3">
<property name="styleSheet">
<string notr="true">QGroupBox
@@ -936,6 +943,38 @@
<number>0</number>
</property>
<item row="2" column="0">
+ <widget class="QCheckBox" name="tcomp_tx_disable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>3</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Disable for X</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="tcomp_ty_disable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>3</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Disable for Y</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
<widget class="QCheckBox" name="tcomp_tz_disable">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -951,6 +990,45 @@
</property>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="tcomp_src_yaw_disable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Disable effect by yaw</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="tcomp_src_pitch_disable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Disable effect by pitch</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="tcomp_src_roll_disable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Disable effect by roll</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -1505,6 +1583,7 @@
<tabstop>bind_tcomp_off_held</tabstop>
<tabstop>trayp</tabstop>
<tabstop>tray_start</tabstop>
+ <tabstop>use_center_as_translation_camera_offset</tabstop>
<tabstop>camera_yaw</tabstop>
<tabstop>camera_pitch</tabstop>
<tabstop>camera_roll</tabstop>
@@ -1529,7 +1608,12 @@
<tabstop>invert_z</tabstop>
<tabstop>tracklogging_enabled</tabstop>
<tabstop>tcomp_enable</tabstop>
+ <tabstop>tcomp_tx_disable</tabstop>
+ <tabstop>tcomp_ty_disable</tabstop>
<tabstop>tcomp_tz_disable</tabstop>
+ <tabstop>tcomp_src_yaw_disable</tabstop>
+ <tabstop>tcomp_src_pitch_disable</tabstop>
+ <tabstop>tcomp_src_roll_disable</tabstop>
</tabstops>
<resources>
<include location="opentrack-res.qrc"/>