Updating before branching. Last revision is v170 beta1.

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

3 files changed, 9 insertions, 1 deletions

diff --git a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
index e9f3facb..2a5ad691 100644
--- a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
+++ b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
@@ -686,7 +686,7 @@
         <widget class="QCheckBox" name="chkDisableBeep">

          <property name="maximumSize">

           <size>

-           <width>80</width>

+           <width>85</width>

            <height>16777215</height>

           </size>

          </property>

diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index c9a05dc9..0fe22052 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -946,6 +946,10 @@ THeadPoseData newdata;
 	}

 //	Tracker::doRefreshVideo();

 

+	if (_curve_config) {

+		_curve_config->update();

+	}

+

 }

 

 /** set the smoothing from the slider **/

diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index 2c09917b..5396c95b 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -639,6 +639,7 @@ bool bTracker2Confid = false;
 			}

 			if (pTracker) {

 				bTracker1Confid = pTracker->GiveHeadPoseData(&newpose);

+//		qDebug() << "Tracker::run() says Roll = " << newpose.roll;

 			}

 			else {

 				bTracker1Confid = false;

@@ -706,6 +707,7 @@ bool bTracker2Confid = false;
 				target_camera.pitch = getSmoothFromList( &Pitch.rawList );

 				target_camera.yaw   = getSmoothFromList( &Yaw.rawList );

 				target_camera.roll  = getSmoothFromList( &Roll.rawList );

+//		qDebug() << "Tracker::run() says Roll from Smoothing = " << target_camera.roll;

 

 				// do the centering

 				target_camera = target_camera - offset_camera;

@@ -715,9 +717,11 @@ bool bTracker2Confid = false;
 				//

 				if (pFilter) {

 					pFilter->FilterHeadPoseData(&current_camera, &target_camera, &new_camera, Tracker::Pitch.newSample);

+//		qDebug() << "Tracker::run() says Roll in Filter = " << current_camera.roll << ", Roll to output = " << new_camera.roll;

 				}

 				else {

 					new_camera = target_camera;

+//		qDebug() << "Tracker::run() says Roll to output = " << new_camera.roll;

 				}

 				output_camera.x = X.invert * X.curvePtr->getValue(new_camera.x);

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