Fixed beta filter-initialize

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@44 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

9 files changed, 31 insertions, 25 deletions

diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo
index 3713f390..2969c4b5 100644
--- a/FaceTrackNoIR.suo
+++ b/FaceTrackNoIR.suo
diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index cec69d44..8c678100 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -405,8 +405,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(iniFileList.at(i));

+		ui.iconcomboProfile->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/Settings16.png"), iniFileList.at(i));

 		if (iniFileList.at(i) == pathInfo.fileName()) {

+			ui.iconcomboProfile->setItemIcon(i, QIcon(QCoreApplication::applicationDirPath() + "/images/SettingsOpen16.png"));

 			ui.iconcomboProfile->setCurrentIndex( i );

 		}

 	}

diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc
index 1093f7ec..17aa1be6 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.qrc
+++ b/FaceTrackNoIR/FaceTrackNoIR.qrc
@@ -1,5 +1,7 @@
 <RCC>
   <qresource prefix="/">
+    <file>images/Settings16.png</file>
+    <file>images/SettingsOpen16.png</file>
     <file>UIElements/Donate.png</file>
     <file>UIElements/Curves.png</file>
     <file>images/rotation_DOFs.png</file>
diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui
index 22e5bcf4..e6ebde75 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.ui
+++ b/FaceTrackNoIR/FaceTrackNoIR.ui
@@ -813,7 +813,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>20</y>

-                  <width>161</width>

+                  <width>180</width>

                   <height>22</height>

                  </rect>

                 </property>

@@ -835,12 +835,12 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>80</y>

-                  <width>161</width>

+                  <width>180</width>

                   <height>23</height>

                  </rect>

                 </property>

                 <property name="toolTip">

-                 <string>Change tracker settings</string>

+                 <string>Save the INI-file under another name</string>

                 </property>

                 <property name="styleSheet">

                  <string notr="true"/>

@@ -854,12 +854,12 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>50</y>

-                  <width>75</width>

+                  <width>81</width>

                   <height>23</height>

                  </rect>

                 </property>

                 <property name="toolTip">

-                 <string>Start the Tracker</string>

+                 <string>Load an INI-file from a folder</string>

                 </property>

                 <property name="styleSheet">

                  <string notr="true"/>

@@ -874,14 +874,14 @@ border:none;
                 </property>

                 <property name="geometry">

                  <rect>

-                  <x>96</x>

+                  <x>110</x>

                   <y>50</y>

-                  <width>75</width>

+                  <width>81</width>

                   <height>23</height>

                  </rect>

                 </property>

                 <property name="toolTip">

-                 <string>Stop the Tracker</string>

+                 <string>Save the current INI-file</string>

                 </property>

                 <property name="styleSheet">

                  <string notr="true"/>

@@ -911,7 +911,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>20</y>

-                  <width>161</width>

+                  <width>180</width>

                   <height>22</height>

                  </rect>

                 </property>

@@ -933,7 +933,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>80</y>

-                  <width>161</width>

+                  <width>180</width>

                   <height>23</height>

                  </rect>

                 </property>

@@ -952,7 +952,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>50</y>

-                  <width>75</width>

+                  <width>81</width>

                   <height>23</height>

                  </rect>

                 </property>

@@ -972,9 +972,9 @@ border:none;
                 </property>

                 <property name="geometry">

                  <rect>

-                  <x>96</x>

+                  <x>109</x>

                   <y>50</y>

-                  <width>75</width>

+                  <width>81</width>

                   <height>23</height>

                  </rect>

                 </property>

@@ -1009,7 +1009,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>20</y>

-                  <width>151</width>

+                  <width>180</width>

                   <height>22</height>

                  </rect>

                 </property>

@@ -1031,7 +1031,7 @@ border:none;
                  <rect>

                   <x>10</x>

                   <y>80</y>

-                  <width>151</width>

+                  <width>180</width>

                   <height>23</height>

                  </rect>

                 </property>

diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index c054873d..bc7b45f8 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -335,13 +335,6 @@ void Tracker::run() {
 	smEngineHeadPoseData temp_head_pose;			// headpose from faceAPI

 #       endif

 

-	new_camera_position.x = 0.0f;

-	new_camera_position.y = 0.0f;

-	new_camera_position.z = 0.0f;

-	new_camera_position.yaw = 0.0f;

-	new_camera_position.pitch = 0.0f;

-	new_camera_position.roll = 0.0f;

-

 	//

 	// Test some Filter-stuff

 	//

@@ -432,6 +425,13 @@ void Tracker::run() {
 						Z.rawList.clear();

 						Z.prevPos = 0.0f;

 

+						current_camera_position.x = 0.0f;

+						current_camera_position.y = 0.0f;

+						current_camera_position.z = 0.0f;

+						current_camera_position.yaw = 0.0f;

+						current_camera_position.pitch = 0.0f;

+						current_camera_position.roll = 0.0f;

+

 						_engine->start();

 					}

 					else {

diff --git a/bin/FaceTrackNoIR.exe b/bin/FaceTrackNoIR.exe
index 618cc1fb..dd98c3ca 100644
--- a/bin/FaceTrackNoIR.exe
+++ b/bin/FaceTrackNoIR.exe
diff --git a/bin/Settings/Wings of Prey.ini b/bin/Settings/Wings of Prey.ini
index c0e29816..44459460 100644
--- a/bin/Settings/Wings of Prey.ini
+++ b/bin/Settings/Wings of Prey.ini
@@ -20,6 +20,9 @@ redRoll=60
 redX=50

 redY=50

 redZ=50

+minSmooth=10

+powCurve=2

+maxSmooth=50

 

 [GameProtocol]

 Selection=4

@@ -45,7 +48,7 @@ Inhibit_Y=false
 Inhibit_Z=false

 

 [Curves]

-Yaw_point1=@Variant(\0\0\0\x1a@\x12\0\0\0\0\0\0@\x12\0\0\0\0\0\0)

+Yaw_point1=@Variant(\0\0\0\x1a@\x14\0\0\0\0\0\0@\x14\0\0\0\0\0\0)

 Yaw_point2=@Variant(\0\0\0\x1a@_\xc0\0\0\0\0\0@ \0\0\0\0\0\0)

 Yaw_point3=@Variant(\0\0\0\x1a@c`\0\0\0\0\0@?\0\0\0\0\0\0)

 Yaw_point4=@Variant(\0\0\0\x1a@f\x80\0\0\0\0\0@I\0\0\0\0\0\0)

@@ -53,7 +56,7 @@ Pitch_point1=@Variant(\0\0\0\x1a@\b\0\0\0\0\0\0@\b\0\0\0\0\0\0)
 Pitch_point2=@Variant(\0\0\0\x1a@W@\0\0\0\0\0@ \0\0\0\0\0\0)

 Pitch_point3=@Variant(\0\0\0\x1a@\\\xc0\0\0\0\0\0@9\0\0\0\0\0\0)

 Pitch_point4=@Variant(\0\0\0\x1a@f\x80\0\0\0\0\0@I\0\0\0\0\0\0)

-Roll_point1=@Variant(\0\0\0\x1a@\f\0\0\0\0\0\0@\f\0\0\0\0\0\0)

+Roll_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x10\0\0\0\0\0\0)

 Roll_point2=@Variant(\0\0\0\x1a@S\0\0\0\0\0\0@3\0\0\0\0\0\0)

 Roll_point3=@Variant(\0\0\0\x1a@a\xa0\0\0\0\0\0@C\0\0\0\0\0\0)

 Roll_point4=@Variant(\0\0\0\x1a@d@\0\0\0\0\0@I\0\0\0\0\0\0)

diff --git a/bin/images/Settings16.png b/bin/images/Settings16.png
new file mode 100644
index 00000000..3b31623b
--- /dev/null
+++ b/bin/images/Settings16.png
diff --git a/bin/images/SettingsOpen16.png b/bin/images/SettingsOpen16.png
new file mode 100644
index 00000000..5bf65f0d
--- /dev/null
+++ b/bin/images/SettingsOpen16.png