From de8ca77801f1f7de1e553967f80147ad89345912 Mon Sep 17 00:00:00 2001
From: Wim Vriend <facetracknoir@gmail.com>
Date: Tue, 25 Jan 2011 20:52:17 +0000
Subject: Fixed beta filter-initialize

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@44 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
---
 FaceTrackNoIR/FaceTrackNoIR.cpp |  3 ++-
 FaceTrackNoIR/FaceTrackNoIR.qrc |  2 ++
 FaceTrackNoIR/FaceTrackNoIR.ui  | 30 +++++++++++++++---------------
 FaceTrackNoIR/tracker.cpp       | 14 +++++++-------
 4 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'FaceTrackNoIR')

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 {
-- 
cgit v1.2.3