summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--facetracknoir/facetracknoir.ui1194
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp6
2 files changed, 558 insertions, 642 deletions
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index 6af80978..86ceafb3 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -154,8 +154,8 @@ QGroupBox {
</property>
<property name="geometry">
<rect>
- <x>253</x>
- <y>1</y>
+ <x>250</x>
+ <y>10</y>
<width>671</width>
<height>419</height>
</rect>
@@ -434,7 +434,7 @@ QGroupBox {
<property name="locale">
<locale language="English" country="UnitedStates"/>
</property>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
@@ -450,6 +450,69 @@ QGroupBox {
<property name="verticalSpacing">
<number>6</number>
</property>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupTrackerSource">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="title">
+ <string>Tracker Source(1st = Master)</string>
+ </property>
+ <widget class="QComboBox" name="iconcomboTrackerSource">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>180</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="currentIndex">
+ <number>-1</number>
+ </property>
+ <property name="maxVisibleItems">
+ <number>5</number>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="btnShowEngineControls">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>50</y>
+ <width>180</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Change tracker settings</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Settings</string>
+ </property>
+ </widget>
+ </widget>
+ </item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupGameProtocol">
<property name="minimumSize">
@@ -513,12 +576,12 @@ QGroupBox {
</widget>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupTrackerSource">
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupFilter">
<property name="minimumSize">
<size>
<width>200</width>
- <height>80</height>
+ <height>70</height>
</size>
</property>
<property name="maximumSize">
@@ -531,9 +594,9 @@ QGroupBox {
<string notr="true"/>
</property>
<property name="title">
- <string>Tracker Source(1st = Master)</string>
+ <string>Filter</string>
</property>
- <widget class="QComboBox" name="iconcomboTrackerSource">
+ <widget class="QComboBox" name="iconcomboFilter">
<property name="geometry">
<rect>
<x>10</x>
@@ -549,10 +612,10 @@ QGroupBox {
<number>-1</number>
</property>
<property name="maxVisibleItems">
- <number>5</number>
+ <number>7</number>
</property>
</widget>
- <widget class="QPushButton" name="btnShowEngineControls">
+ <widget class="QPushButton" name="btnShowFilterControls">
<property name="enabled">
<bool>true</bool>
</property>
@@ -565,7 +628,7 @@ QGroupBox {
</rect>
</property>
<property name="toolTip">
- <string>Change tracker settings</string>
+ <string>Change game protocol settings</string>
</property>
<property name="styleSheet">
<string notr="true"/>
@@ -656,66 +719,6 @@ QGroupBox {
</item>
</layout>
</item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>80</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>200</width>
- <height>80</height>
- </size>
- </property>
- <property name="title">
- <string>Tracker Source (2nd)</string>
- </property>
- <widget class="QPushButton" name="btnShowSecondTrackerSettings">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>50</y>
- <width>180</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Change tracker settings</string>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Settings</string>
- </property>
- </widget>
- <widget class="QComboBox" name="cbxSecondTrackerSource">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>180</width>
- <height>22</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="currentIndex">
- <number>-1</number>
- </property>
- <property name="maxVisibleItems">
- <number>5</number>
- </property>
- </widget>
- </widget>
- </item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupStartStop">
<property name="minimumSize">
@@ -737,9 +740,9 @@ QGroupBox {
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
+ <y>30</y>
<width>81</width>
- <height>23</height>
+ <height>21</height>
</rect>
</property>
<property name="toolTip">
@@ -759,9 +762,9 @@ QGroupBox {
<property name="geometry">
<rect>
<x>100</x>
- <y>20</y>
+ <y>30</y>
<width>81</width>
- <height>23</height>
+ <height>21</height>
</rect>
</property>
<property name="toolTip">
@@ -776,12 +779,12 @@ QGroupBox {
</widget>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="groupFilter">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_3">
<property name="minimumSize">
<size>
<width>200</width>
- <height>70</height>
+ <height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -790,51 +793,48 @@ QGroupBox {
<height>80</height>
</size>
</property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
<property name="title">
- <string>Filter</string>
+ <string>Tracker Source (2nd)</string>
</property>
- <widget class="QComboBox" name="iconcomboFilter">
+ <widget class="QPushButton" name="btnShowSecondTrackerSettings">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
+ <y>50</y>
<width>180</width>
- <height>22</height>
+ <height>23</height>
</rect>
</property>
+ <property name="toolTip">
+ <string>Change tracker settings</string>
+ </property>
<property name="styleSheet">
<string notr="true"/>
</property>
- <property name="currentIndex">
- <number>-1</number>
- </property>
- <property name="maxVisibleItems">
- <number>7</number>
+ <property name="text">
+ <string>Settings</string>
</property>
</widget>
- <widget class="QPushButton" name="btnShowFilterControls">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <widget class="QComboBox" name="cbxSecondTrackerSource">
<property name="geometry">
<rect>
<x>10</x>
- <y>50</y>
+ <y>20</y>
<width>180</width>
- <height>23</height>
+ <height>22</height>
</rect>
</property>
- <property name="toolTip">
- <string>Change game protocol settings</string>
- </property>
<property name="styleSheet">
<string notr="true"/>
</property>
- <property name="text">
- <string>Settings</string>
+ <property name="currentIndex">
+ <number>-1</number>
+ </property>
+ <property name="maxVisibleItems">
+ <number>5</number>
</property>
</widget>
</widget>
@@ -845,7 +845,7 @@ QGroupBox {
<property name="geometry">
<rect>
<x>20</x>
- <y>10</y>
+ <y>20</y>
<width>400</width>
<height>25</height>
</rect>
@@ -870,526 +870,471 @@ background:none;</string>
<string>Camera Name</string>
</property>
</widget>
- <widget class="QWidget" name="">
+ <widget class="QGroupBox" name="groupBox_4">
<property name="geometry">
<rect>
- <x>10</x>
- <y>60</y>
- <width>698</width>
- <height>122</height>
+ <x>300</x>
+ <y>80</y>
+ <width>251</width>
+ <height>121</height>
</rect>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <property name="leftMargin">
- <number>10</number>
+ <property name="title">
+ <string>Axis inversion</string>
+ </property>
+ </widget>
+ <widget class="QGroupBox" name="groupProfile">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>80</y>
+ <width>271</width>
+ <height>120</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>206</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>65535</width>
+ <height>65535</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Profile</string>
+ </property>
+ <widget class="QComboBox" name="iconcomboProfile">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>251</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="currentIndex">
+ <number>-1</number>
</property>
- <property name="rightMargin">
+ <property name="maxVisibleItems">
<number>10</number>
</property>
- <item>
- <widget class="QGroupBox" name="groupProfile">
- <property name="minimumSize">
- <size>
- <width>206</width>
- <height>120</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>210</width>
- <height>120</height>
- </size>
- </property>
- <property name="title">
- <string>Profile</string>
- </property>
- <widget class="QComboBox" name="iconcomboProfile">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>180</width>
- <height>22</height>
- </rect>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="currentIndex">
- <number>-1</number>
- </property>
- <property name="maxVisibleItems">
- <number>10</number>
- </property>
- </widget>
- <widget class="QPushButton" name="btnSaveAs">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>80</y>
- <width>180</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Save the INI-file under another name</string>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Save As ...</string>
- </property>
- </widget>
- <widget class="QPushButton" name="btnLoad">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>50</y>
- <width>81</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Load an INI-file from a folder</string>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Load</string>
- </property>
- </widget>
- <widget class="QPushButton" name="btnSave">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>50</y>
- <width>81</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Save the current INI-file</string>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Save</string>
- </property>
- </widget>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupGlobalSettings">
- <property name="minimumSize">
- <size>
- <width>420</width>
- <height>120</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>120</height>
- </size>
- </property>
- <property name="title">
- <string>Global Settings</string>
- </property>
- <widget class="QWidget" name="gridLayoutWidget">
- <property name="geometry">
- <rect>
- <x>9</x>
- <y>20</y>
- <width>171</width>
- <height>80</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="lblSensYaw_4">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
-background:none;</string>
- </property>
- <property name="text">
- <string>Smoothing:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label">
- <property name="styleSheet">
- <string notr="true">color:#ccc;
-background:none;</string>
- </property>
- <property name="text">
- <string>(samples)</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QSlider" name="slideSmoothing">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>15</height>
- </size>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>50</number>
- </property>
- <property name="pageStep">
- <number>5</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::NoTicks</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinSmoothing">
- <property name="minimumSize">
- <size>
- <width>35</width>
- <height>22</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>50</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="gridLayoutWidget_2">
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>20</y>
- <width>211</width>
- <height>81</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="3" column="0">
- <widget class="QLabel" name="lblSensRoll">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </widget>
+ <widget class="QPushButton" name="btnSaveAs">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>80</y>
+ <width>251</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Save the INI-file under another name</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Save As ...</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="btnLoad">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>50</y>
+ <width>111</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Load an INI-file from a folder</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Load</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="btnSave">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>50</y>
+ <width>131</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Save the current INI-file</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QLabel" name="lblInvert1_2">
+ <property name="geometry">
+ <rect>
+ <x>480</x>
+ <y>101</y>
+ <width>30</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Roll</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="chkInvertRoll">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QLabel" name="lblSensZ">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Invert</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertRoll">
+ <property name="geometry">
+ <rect>
+ <x>383</x>
+ <y>167</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensZ">
+ <property name="geometry">
+ <rect>
+ <x>419</x>
+ <y>167</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Z</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QCheckBox" name="chkInvertZ">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="lblSensPitch">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Z</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertZ">
+ <property name="geometry">
+ <rect>
+ <x>480</x>
+ <y>167</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensPitch">
+ <property name="geometry">
+ <rect>
+ <x>321</x>
+ <y>148</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Pitch</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QCheckBox" name="chkInvertPitch">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QLabel" name="lblSensY">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Pitch</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertPitch">
+ <property name="geometry">
+ <rect>
+ <x>383</x>
+ <y>148</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensY">
+ <property name="geometry">
+ <rect>
+ <x>419</x>
+ <y>148</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Y</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QCheckBox" name="chkInvertY">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="lblSensYaw">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Y</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertY">
+ <property name="geometry">
+ <rect>
+ <x>480</x>
+ <y>148</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensYaw">
+ <property name="geometry">
+ <rect>
+ <x>321</x>
+ <y>129</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Yaw</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QCheckBox" name="chkInvertYaw">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="lblSensX">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Yaw</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertYaw">
+ <property name="geometry">
+ <rect>
+ <x>383</x>
+ <y>129</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensX">
+ <property name="geometry">
+ <rect>
+ <x>419</x>
+ <y>129</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>X</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QCheckBox" name="chkInvertX">
- <property name="styleSheet">
- <string notr="true">background:none;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="lblInvert1_3">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>X</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="chkInvertX">
+ <property name="geometry">
+ <rect>
+ <x>480</x>
+ <y>129</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background:none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblInvert1_3">
+ <property name="geometry">
+ <rect>
+ <x>383</x>
+ <y>101</y>
+ <width>30</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Invert</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="lblInvert1_2">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">color:#ccc;
+ </property>
+ <property name="text">
+ <string>Invert</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblSensRoll">
+ <property name="geometry">
+ <rect>
+ <x>321</x>
+ <y>167</y>
+ <width>25</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color:#ccc;
background:none;</string>
- </property>
- <property name="text">
- <string>Invert</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <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>
+ </property>
+ <property name="text">
+ <string>Roll</string>
+ </property>
</widget>
</widget>
<widget class="QFrame" name="video_frame">
@@ -2288,38 +2233,5 @@ Support FaceTrackNoIR!</string>
<resources>
<include location="main-facetracknoir.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>slideSmoothing</sender>
- <signal>valueChanged(int)</signal>
- <receiver>spinSmoothing</receiver>
- <slot>setValue(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>442</x>
- <y>387</y>
- </hint>
- <hint type="destinationlabel">
- <x>494</x>
- <y>389</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>spinSmoothing</sender>
- <signal>valueChanged(int)</signal>
- <receiver>slideSmoothing</receiver>
- <slot>setValue(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>494</x>
- <y>389</y>
- </hint>
- <hint type="destinationlabel">
- <x>442</x>
- <y>387</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 5785b21a..ffbf1be8 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -220,8 +220,12 @@ bool Tracker::GiveHeadPoseData(THeadPoseData* data)
if (shm->result.filled) {
if (enableRX)
data->yaw = shm->result.rotx;
- if (enableRY)
+ if (enableRY) {
data->pitch = shm->result.roty;
+ double sign = data->pitch >= 0 ? 1 : -1;
+ if (fabs(fabs(data->pitch) - 180) < fabs(data->pitch))
+ data->pitch = fabs(fabs(data->pitch) - 180) * sign;
+ }
if (enableRZ) {
data->roll = shm->result.rotz;
double sign = data->roll >= 0 ? 1 : -1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 02:11:18 +0000