From c4a43c7ebacca6de419640e5cf683cc959520cd8 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Sun, 5 Aug 2012 11:59:00 +0000 Subject: Busy adapting changes from Stan. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@119 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FaceTrackNoIR/tracker.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'FaceTrackNoIR/tracker.h') diff --git a/FaceTrackNoIR/tracker.h b/FaceTrackNoIR/tracker.h index c1eb61c6..56fe51fd 100644 --- a/FaceTrackNoIR/tracker.h +++ b/FaceTrackNoIR/tracker.h @@ -100,17 +100,18 @@ class FaceTrackNoIR; // pre-define parent-class to avoid circular includes class THeadPoseDOF { public: - THeadPoseDOF(QString primary, QString secondary = "") { - QSettings settings("Abbequerque Inc.", "FaceTrackNoIR"); // Registry settings (in HK_USER) + THeadPoseDOF(QString primary, QString secondary = "", int maxInput = 50, int maxOutput = 180) { + QSettings settings("Abbequerque Inc.", "FaceTrackNoIR"); // Registry settings (in HK_USER) QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString(); - QSettings iniFile( currentFile, QSettings::IniFormat ); // Application settings (in INI-file) + QSettings iniFile( currentFile, QSettings::IniFormat ); // Application settings (in INI-file) - curvePtr = new FunctionConfig(primary); // Create the Function-config for input-output translation - curvePtr->loadSettings(iniFile); // Load the settings from the INI-file + curvePtr = new FunctionConfig(primary, maxInput, maxOutput); // Create the Function-config for input-output translation + curvePtr->loadSettings(iniFile); // Load the settings from the INI-file if (secondary != "") { - curvePtrAlt = new FunctionConfig(secondary); + curvePtrAlt = new FunctionConfig(secondary, maxInput, maxOutput); curvePtrAlt->loadSettings(iniFile); } + } void initHeadPoseData(){ @@ -126,6 +127,9 @@ public: MaxInput = 0; confidence = 0.0f; newSample = FALSE; + + qDebug() << "initHeadPoseData: " << curvePtr->getTitle(); + } float headPos; // Current position (from faceTracker, radials or meters) float offset_headPos; // Offset for centering -- cgit v1.2.3