For update v170 alpha 2

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

3 files changed, 23 insertions, 8 deletions

diff --git a/FaceTrackNoIR/FTNoIR_Curves.ui b/FaceTrackNoIR/FTNoIR_Curves.ui
index c241cc42..fbe96b1c 100644
--- a/FaceTrackNoIR/FTNoIR_Curves.ui
+++ b/FaceTrackNoIR/FTNoIR_Curves.ui
@@ -7,7 +7,7 @@
     <x>0</x>

     <y>0</y>

     <width>901</width>

-    <height>824</height>

+    <height>585</height>

    </rect>

   </property>

   <property name="windowTitle">

diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index da70816c..6ed3a64a 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -455,7 +455,7 @@ void FaceTrackNoIR::loadSettings() {
 	// Put the filename in the window-title.

 	//

     QFileInfo pathInfo ( currentFile );

-    setWindowTitle ( "FaceTrackNoIR (1.7) - " + pathInfo.fileName() );

+    setWindowTitle ( "FaceTrackNoIR (1.7 alpha 2) - " + pathInfo.fileName() );

 

 	//

 	// Get a List of all the INI-files in the (currently active) Settings-folder.

diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index 31fcff04..74fa2df5 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -23,6 +23,7 @@
 *********************************************************************************/

 /*

 	Modifications (last one on top):

+		20120827 - WVR: Signal tracking = false to Curve-widget(s) when quitting run(). Also when Alternative Pitch curve is used.

 		20120805 - WVR: The FunctionConfig-widget is used to configure the Curves. It was tweaked some more, because the Accela filter now also

 						uses the Curve(s). ToDo: make the ranges configurable by the user. Development on the Toradex IMU makes us realize, that

 						a fixed input-range may not be so handy after all..

@@ -359,7 +360,15 @@ T6DOF gameoutput_camera(0,0,0,0,0,0);
 

 			// Set event

 			::SetEvent(m_WaitThread);

-		   qDebug() << "Tracker::run terminated run()";

+			qDebug() << "Tracker::run terminated run()";

+			X.curvePtr->setTrackingActive( false );

+			Y.curvePtr->setTrackingActive( false );

+			Z.curvePtr->setTrackingActive( false );

+			Yaw.curvePtr->setTrackingActive( false );

+			Pitch.curvePtr->setTrackingActive( false );

+			Pitch.curvePtrAlt->setTrackingActive( false );

+			Roll.curvePtr->setTrackingActive( false );

+

 			return;

 		}

 

@@ -507,9 +516,17 @@ T6DOF gameoutput_camera(0,0,0,0,0,0);
 				output_camera.position.x = X.invert * X.curvePtr->getValue(new_camera.position.x);

 				output_camera.position.y = Y.invert * Y.curvePtr->getValue(new_camera.position.y);

 				output_camera.position.z = Z.invert * Z.curvePtr->getValue(new_camera.position.z);

-				int altp = new_camera.position.pitch < 0;

-				output_camera.position.pitch = Pitch.invert * (altp ? Pitch.curvePtrAlt : Pitch.curvePtr)->getValue(new_camera.position.pitch);

-				///output_camera.position.pitch = Pitch.invert * Pitch.curvePtr->getValue(new_camera.position.pitch);

+				bool altp = new_camera.position.pitch < 0;

+				if (altp) {

+					output_camera.position.pitch = Pitch.invert * Pitch.curvePtrAlt->getValue(new_camera.position.pitch);

+					Pitch.curvePtr->setTrackingActive( false );

+					Pitch.curvePtrAlt->setTrackingActive( true );

+				}

+				else {

+					output_camera.position.pitch = Pitch.invert * Pitch.curvePtr->getValue(new_camera.position.pitch);

+					Pitch.curvePtr->setTrackingActive( true );

+					Pitch.curvePtrAlt->setTrackingActive( false );

+				}

 				output_camera.position.yaw = Yaw.invert * Yaw.curvePtr->getValue(new_camera.position.yaw);

 				output_camera.position.roll = Roll.invert * Roll.curvePtr->getValue(new_camera.position.roll);

 

@@ -518,8 +535,6 @@ T6DOF gameoutput_camera(0,0,0,0,0,0);
 				Y.curvePtr->setTrackingActive( true );

 				Z.curvePtr->setTrackingActive( true );

 				Yaw.curvePtr->setTrackingActive( true );

-				Pitch.curvePtr->setTrackingActive( true );

-				Pitch.curvePtrAlt->setTrackingActive( true );

 				Roll.curvePtr->setTrackingActive( true );

 

 				//