move axis inversion into the "mapping" window

4 files changed, 358 insertions, 373 deletions

diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp
index 4b07a165..d730e4f7 100644
--- a/facetracknoir/curve-config.cpp
+++ b/facetracknoir/curve-config.cpp
@@ -32,6 +32,13 @@ CurveConfigurationDialog::CurveConfigurationDialog(FaceTrackNoIR *ftnoir, QWidge
     tie_setting(mainApp->s.a_pitch.zero, ui.pos_ry);
     tie_setting(mainApp->s.a_roll.zero, ui.pos_rz);
 
+    tie_setting(mainApp->s.a_yaw.invert, ui.chkInvertYaw);
+    tie_setting(mainApp->s.a_pitch.invert, ui.chkInvertPitch);
+    tie_setting(mainApp->s.a_roll.invert, ui.chkInvertRoll);
+    tie_setting(mainApp->s.a_x.invert, ui.chkInvertX);
+    tie_setting(mainApp->s.a_y.invert, ui.chkInvertY);
+    tie_setting(mainApp->s.a_z.invert, ui.chkInvertZ);
+
 	// Load the settings from the current .INI-file
 	loadSettings();
 }
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 85207b53..de5b491f 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -145,12 +145,6 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent) :
     fill_combobox("opentrack-tracker-*.", dlopen_trackers, ui.iconcomboTrackerSource, ui.cbxSecondTrackerSource);
     fill_combobox("opentrack-filter-*.", dlopen_filters, ui.iconcomboFilter, NULL);
 
-    tie_setting(s.a_yaw.invert, ui.chkInvertYaw);
-    tie_setting(s.a_pitch.invert, ui.chkInvertPitch);
-    tie_setting(s.a_roll.invert, ui.chkInvertRoll);
-    tie_setting(s.a_x.invert, ui.chkInvertX);
-    tie_setting(s.a_y.invert, ui.chkInvertY);
-    tie_setting(s.a_z.invert, ui.chkInvertZ);
     tie_setting(s.tracker_dll, ui.iconcomboTrackerSource);
     tie_setting(s.tracker2_dll, ui.cbxSecondTrackerSource);
     tie_setting(s.protocol_dll, ui.iconcomboProtocol);
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index bcb37ad0..c25ee0db 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -896,164 +896,6 @@
      <string/>

     </property>

    </widget>

-   <widget class="QGroupBox" name="groupBox_4">

-    <property name="geometry">

-     <rect>

-      <x>600</x>

-      <y>240</y>

-      <width>124</width>

-      <height>117</height>

-     </rect>

-    </property>

-    <property name="maximumSize">

-     <size>

-      <width>65536</width>

-      <height>65536</height>

-     </size>

-    </property>

-    <property name="font">

-     <font>

-      <kerning>true</kerning>

-     </font>

-    </property>

-    <property name="title">

-     <string>Axis inversion</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignCenter</set>

-    </property>

-    <property name="flat">

-     <bool>true</bool>

-    </property>

-    <property name="checkable">

-     <bool>false</bool>

-    </property>

-    <layout class="QGridLayout" name="gridLayout_4" rowstretch="6,6,6" columnstretch="6,6" rowminimumheight="6,6,6" columnminimumwidth="6,6">

-     <property name="sizeConstraint">

-      <enum>QLayout::SetMinAndMaxSize</enum>

-     </property>

-     <property name="spacing">

-      <number>6</number>

-     </property>

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

-      <widget class="QCheckBox" name="chkInvertYaw">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>Yaw</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkInvertX">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>TX</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkInvertPitch">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="autoFillBackground">

-        <bool>false</bool>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>Pitch</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkInvertY">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>TY</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkInvertRoll">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>Roll</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkInvertZ">

-       <property name="maximumSize">

-        <size>

-         <width>65536</width>

-         <height>65536</height>

-        </size>

-       </property>

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="styleSheet">

-        <string notr="true">background:none;</string>

-       </property>

-       <property name="text">

-        <string>TZ</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </widget>

    <widget class="QGroupBox" name="groupBox_3">

     <property name="geometry">

      <rect>

diff --git a/facetracknoir/ftnoir_curves.ui b/facetracknoir/ftnoir_curves.ui
index 9b5c8d07..ae84110f 100644
--- a/facetracknoir/ftnoir_curves.ui
+++ b/facetracknoir/ftnoir_curves.ui
@@ -579,215 +579,357 @@
       <attribute name="title">

        <string>Options</string>

       </attribute>

-      <widget class="QGroupBox" name="groupBox">

-       <property name="geometry">

-        <rect>

-         <x>0</x>

-         <y>10</y>

-         <width>306</width>

-         <height>114</height>

-        </rect>

-       </property>

-       <property name="title">

-        <string>Center pose</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignCenter</set>

-       </property>

-       <property name="flat">

-        <bool>true</bool>

-       </property>

-       <property name="checkable">

-        <bool>false</bool>

-       </property>

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

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

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

-          <property name="text">

-           <string>RX</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_rx">

-          <property name="suffix">

-           <string> deg.</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-180.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>180.000000000000000</double>

-          </property>

-         </widget>

-        </item>

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

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

-          <property name="text">

-           <string>TX</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_tx">

-          <property name="suffix">

-           <string> cm</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-100.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>100.000000000000000</double>

-          </property>

-         </widget>

-        </item>

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

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

-          <property name="text">

-           <string>RY</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_ry">

-          <property name="suffix">

-           <string> deg.</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-180.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>180.000000000000000</double>

-          </property>

-         </widget>

-        </item>

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

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

-          <property name="text">

-           <string>TY</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_ty">

-          <property name="suffix">

-           <string> cm</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-100.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>100.000000000000000</double>

-          </property>

-         </widget>

-        </item>

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

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

-          <property name="text">

-           <string>RZ</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_rz">

-          <property name="suffix">

-           <string> deg.</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-180.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>180.000000000000000</double>

-          </property>

-         </widget>

-        </item>

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

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

-          <property name="text">

-           <string>TZ</string>

-          </property>

-         </widget>

-        </item>

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

-         <widget class="QDoubleSpinBox" name="pos_tz">

-          <property name="suffix">

-           <string> cm</string>

-          </property>

-          <property name="decimals">

-           <number>3</number>

-          </property>

-          <property name="minimum">

-           <double>-100.000000000000000</double>

-          </property>

-          <property name="maximum">

-           <double>100.000000000000000</double>

-          </property>

-         </widget>

-        </item>

-       </layout>

-      </widget>

-      <widget class="QGroupBox" name="groupBox_2">

-       <property name="geometry">

-        <rect>

-         <x>10</x>

-         <y>140</y>

-         <width>291</width>

-         <height>81</height>

-        </rect>

-       </property>

-       <property name="styleSheet">

-        <string notr="true"/>

-       </property>

-       <property name="title">

-        <string>Translation compensation</string>

-       </property>

-       <property name="flat">

-        <bool>true</bool>

-       </property>

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

-        <item>

-         <widget class="QCheckBox" name="tcomp_enable">

-          <property name="sizePolicy">

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

-            <horstretch>0</horstretch>

-            <verstretch>0</verstretch>

-           </sizepolicy>

-          </property>

-          <property name="styleSheet">

-           <string notr="true"/>

-          </property>

-          <property name="text">

-           <string>Enablement</string>

-          </property>

-         </widget>

-        </item>

-        <item>

-         <widget class="QCheckBox" name="tcomp_rz">

-          <property name="styleSheet">

-           <string notr="true"/>

-          </property>

-          <property name="text">

-           <string>Disable Z axis compensation</string>

-          </property>

-         </widget>

-        </item>

-       </layout>

-      </widget>

+      <layout class="QFormLayout" name="formLayout">

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

+        <widget class="QGroupBox" name="groupBox">

+         <property name="title">

+          <string>Center pose</string>

+         </property>

+         <property name="alignment">

+          <set>Qt::AlignCenter</set>

+         </property>

+         <property name="flat">

+          <bool>true</bool>

+         </property>

+         <property name="checkable">

+          <bool>false</bool>

+         </property>

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

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

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

+            <property name="text">

+             <string>RX</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QDoubleSpinBox" name="pos_rx">

+            <property name="suffix">

+             <string> deg.</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-180.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>180.000000000000000</double>

+            </property>

+           </widget>

+          </item>

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

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

+            <property name="text">

+             <string>TX</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QDoubleSpinBox" name="pos_tx">

+            <property name="suffix">

+             <string> cm</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-100.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>100.000000000000000</double>

+            </property>

+           </widget>

+          </item>

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

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

+            <property name="text">

+             <string>RY</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QDoubleSpinBox" name="pos_ry">

+            <property name="suffix">

+             <string> deg.</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-180.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>180.000000000000000</double>

+            </property>

+           </widget>

+          </item>

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

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

+            <property name="text">

+             <string>TY</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QDoubleSpinBox" name="pos_ty">

+            <property name="suffix">

+             <string> cm</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-100.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>100.000000000000000</double>

+            </property>

+           </widget>

+          </item>

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

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

+            <property name="text">

+             <string>TZ</string>

+            </property>

+           </widget>

+          </item>

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

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

+            <property name="text">

+             <string>RZ</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QDoubleSpinBox" name="pos_rz">

+            <property name="suffix">

+             <string> deg.</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-180.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>180.000000000000000</double>

+            </property>

+           </widget>

+          </item>

+          <item row="2" column="3">

+           <widget class="QDoubleSpinBox" name="pos_tz">

+            <property name="suffix">

+             <string> cm</string>

+            </property>

+            <property name="decimals">

+             <number>3</number>

+            </property>

+            <property name="minimum">

+             <double>-100.000000000000000</double>

+            </property>

+            <property name="maximum">

+             <double>100.000000000000000</double>

+            </property>

+           </widget>

+          </item>

+         </layout>

+        </widget>

+       </item>

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

+        <widget class="QGroupBox" name="groupBox_2">

+         <property name="styleSheet">

+          <string notr="true"/>

+         </property>

+         <property name="title">

+          <string>Translation compensation</string>

+         </property>

+         <property name="flat">

+          <bool>true</bool>

+         </property>

+         <layout class="QVBoxLayout" name="verticalLayout_2">

+          <item>

+           <widget class="QCheckBox" name="tcomp_enable">

+            <property name="sizePolicy">

+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

+              <horstretch>0</horstretch>

+              <verstretch>0</verstretch>

+             </sizepolicy>

+            </property>

+            <property name="styleSheet">

+             <string notr="true"/>

+            </property>

+            <property name="text">

+             <string>Enablement</string>

+            </property>

+           </widget>

+          </item>

+          <item>

+           <widget class="QCheckBox" name="tcomp_rz">

+            <property name="styleSheet">

+             <string notr="true"/>

+            </property>

+            <property name="text">

+             <string>Disable Z axis compensation</string>

+            </property>

+           </widget>

+          </item>

+         </layout>

+        </widget>

+       </item>

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

+        <widget class="QGroupBox" name="groupBox_4">

+         <property name="maximumSize">

+          <size>

+           <width>65536</width>

+           <height>65536</height>

+          </size>

+         </property>

+         <property name="font">

+          <font>

+           <kerning>true</kerning>

+          </font>

+         </property>

+         <property name="title">

+          <string>Axis inversion</string>

+         </property>

+         <property name="alignment">

+          <set>Qt::AlignCenter</set>

+         </property>

+         <property name="flat">

+          <bool>true</bool>

+         </property>

+         <property name="checkable">

+          <bool>false</bool>

+         </property>

+         <layout class="QGridLayout" name="gridLayout_4" rowstretch="6,6,6" columnstretch="6,6" rowminimumheight="6,6,6" columnminimumwidth="6,6">

+          <property name="sizeConstraint">

+           <enum>QLayout::SetMinAndMaxSize</enum>

+          </property>

+          <property name="spacing">

+           <number>6</number>

+          </property>

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

+           <widget class="QCheckBox" name="chkInvertYaw">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>Yaw</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QCheckBox" name="chkInvertX">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>TX</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QCheckBox" name="chkInvertPitch">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="autoFillBackground">

+             <bool>false</bool>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>Pitch</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QCheckBox" name="chkInvertY">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>TY</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QCheckBox" name="chkInvertRoll">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>Roll</string>

+            </property>

+           </widget>

+          </item>

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

+           <widget class="QCheckBox" name="chkInvertZ">

+            <property name="maximumSize">

+             <size>

+              <width>65536</width>

+              <height>65536</height>

+             </size>

+            </property>

+            <property name="layoutDirection">

+             <enum>Qt::RightToLeft</enum>

+            </property>

+            <property name="styleSheet">

+             <string notr="true">background:none;</string>

+            </property>

+            <property name="text">

+             <string>TZ</string>

+            </property>

+           </widget>

+          </item>

+         </layout>

+        </widget>

+       </item>

+      </layout>

      </widget>

     </widget>

    </item>