diff options
Diffstat (limited to 'FaceTrackNoIR')
| -rw-r--r-- | FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui | 36 | ||||
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.cpp | 19 | ||||
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.qrc | 1 | ||||
| -rw-r--r-- | FaceTrackNoIR/Release/FaceTrackNoIR.exe.intermediate.manifest | 4 |
4 files changed, 44 insertions, 16 deletions
diff --git a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui index 39a3de0d..41fc4d36 100644 --- a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui +++ b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui @@ -562,14 +562,14 @@ <layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QLabel" name="lblYawAngle4ReverseAxis">
<property name="text">
<string>Yaw angle for Reverse Axis</string>
</property>
</widget>
</item>
- <item row="1" column="2">
+ <item row="2" column="2">
<widget class="QSpinBox" name="spinYawAngle4ReverseAxis">
<property name="maximumSize">
<size>
@@ -585,7 +585,7 @@ </property>
</widget>
</item>
- <item row="1" column="7">
+ <item row="2" column="7">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -598,21 +598,21 @@ </property>
</spacer>
</item>
- <item row="1" column="3">
+ <item row="2" column="3">
<widget class="QLabel" name="lblYawAngle4ReverseAxisEgu">
<property name="text">
<string>degrees</string>
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QLabel" name="lblZ_Pos4ReverseAxis">
<property name="text">
- <string>Yaw angle for Reverse Axis</string>
+ <string>Z-position for Reverse Axis</string>
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="3" column="2">
<widget class="QSpinBox" name="spinZ_Pos4ReverseAxis">
<property name="maximumSize">
<size>
@@ -631,21 +631,21 @@ </property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="3" column="3">
<widget class="QLabel" name="lblZ_Pos4ReverseAxisEgu">
<property name="text">
<string>cm</string>
</property>
</widget>
</item>
- <item row="2" column="4">
+ <item row="3" column="4">
<widget class="QLabel" name="label_7">
<property name="text">
<string>When Reverse:</string>
</property>
</widget>
</item>
- <item row="2" column="5">
+ <item row="3" column="5">
<widget class="QSpinBox" name="spinZ_PosWhenReverseAxis">
<property name="maximumSize">
<size>
@@ -664,13 +664,27 @@ </property>
</widget>
</item>
- <item row="2" column="6">
+ <item row="3" column="6">
<widget class="QLabel" name="lblZ_PosWhenReverseAxisEgu">
<property name="text">
<string>cm</string>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="lblZ_Pos4ReverseAxis_2">
+ <property name="text">
+ <string>Enable Revers Axis</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="chkEnableReverseAxis">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp index d71f5954..a9334752 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.cpp +++ b/FaceTrackNoIR/FaceTrackNoIR.cpp @@ -427,9 +427,9 @@ void FaceTrackNoIR::loadSettings() { disconnect(ui.iconcomboProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(profileSelected(int)));
ui.iconcomboProfile->clear();
for ( int i = 0; i < iniFileList.size(); i++) {
- ui.iconcomboProfile->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/Settings16.png"), iniFileList.at(i));
+ ui.iconcomboProfile->addItem(QIcon(":/images/Settings16.png"), iniFileList.at(i));
if (iniFileList.at(i) == pathInfo.fileName()) {
- ui.iconcomboProfile->setItemIcon(i, QIcon(QCoreApplication::applicationDirPath() + "/images/SettingsOpen16.png"));
+ ui.iconcomboProfile->setItemIcon(i, QIcon(":/images/SettingsOpen16.png"));
ui.iconcomboProfile->setCurrentIndex( i );
}
}
@@ -491,7 +491,7 @@ void FaceTrackNoIR::about() { aboutDialog.setMinimumWidth(270);
aboutDialog.setMinimumHeight(440);
- aboutDialog.setStyleSheet("background:#fff url(UIElements/aboutFaceTrackNoIR.png) no-repeat;");
+ aboutDialog.setStyleSheet("background:#fff url(:/UIElements/aboutFaceTrackNoIR.png) no-repeat;");
}
/** start tracking the face **/
@@ -1533,6 +1533,13 @@ int keyindex; ui.chkInhibitY->setChecked (iniFile.value ( "Inhibit_Y", 0 ).toBool());
ui.chkInhibitZ->setChecked (iniFile.value ( "Inhibit_Z", 0 ).toBool());
+
+ // Reverse Axis
+ ui.chkEnableReverseAxis->setChecked (iniFile.value ( "Enable_ReverseAxis", 0 ).toBool());
+ ui.spinYawAngle4ReverseAxis->setValue( settings.value ( "RA_Yaw", 40 ).toInt() );
+ ui.spinZ_Pos4ReverseAxis->setValue( settings.value ( "RA_ZPos", -20 ).toInt() );
+ ui.spinZ_PosWhenReverseAxis->setValue( settings.value ( "RA_ToZPos", 50 ).toInt() );
+
iniFile.endGroup ();
settingsDirty = false;
@@ -1581,6 +1588,12 @@ void KeyboardShortcutDialog::save() { iniFile.setValue ( "Inhibit_Y", ui.chkInhibitY->isChecked() );
iniFile.setValue ( "Inhibit_Z", ui.chkInhibitZ->isChecked() );
+ // Reverse Axis
+ iniFile.setValue ( "Enable_ReverseAxis", ui.chkEnableReverseAxis->isChecked() );
+ settings.setValue( "RA_Yaw", ui.spinYawAngle4ReverseAxis->value() );
+ settings.setValue( "RA_ZPos", ui.spinZ_Pos4ReverseAxis->value() );
+ settings.setValue( "RA_ToZPos", ui.spinZ_PosWhenReverseAxis->value() );
+
iniFile.endGroup ();
settingsDirty = false;
diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc index 10cdcd14..b24c4e2f 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.qrc +++ b/FaceTrackNoIR/FaceTrackNoIR.qrc @@ -16,5 +16,6 @@ <file>images/FSX.ico</file> <file>images/PPJoy.ico</file> <file>images/TrackIR.ico</file> + <file>UIElements/aboutFaceTrackNoIR.png</file> </qresource> </RCC> diff --git a/FaceTrackNoIR/Release/FaceTrackNoIR.exe.intermediate.manifest b/FaceTrackNoIR/Release/FaceTrackNoIR.exe.intermediate.manifest index c534db75..9ae90f83 100644 --- a/FaceTrackNoIR/Release/FaceTrackNoIR.exe.intermediate.manifest +++ b/FaceTrackNoIR/Release/FaceTrackNoIR.exe.intermediate.manifest @@ -2,12 +2,12 @@ <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<dependency>
<dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.762' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.762' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
</dependentAssembly>
</dependency>
</assembly>
|