diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2012-09-28 10:45:03 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2012-09-28 10:45:03 +0000 |
| commit | ee53c49af9789553fb51987bd6003ce30344e173 (patch) | |
| tree | 5360a62d0eb29129c7e18c6a1f9896502d075a6b /FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp | |
| parent | 7eefd68e5ca3323221a8cc0cf32dc4a74d1fb239 (diff) | |
Added member-function to FunctionConfig, so it accepts default-settings from a QList of QFloats.
Put Stanislaws' Accela-defaults in the Accela-filter: they work fine!
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@172 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp')
| -rwxr-xr-x | FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp b/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp index c71469c4..a6f9264b 100755 --- a/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp +++ b/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp @@ -36,13 +36,24 @@ void FTNoIR_Filter::Initialize() }
void FTNoIR_Filter::loadSettings() {
+ QList<QPointF> defPoints;
+
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)
- functionConfig.loadSettings(iniFile);
- translationFunctionConfig.loadSettings(iniFile);
+ defPoints.clear();
+ for (int i = 0; i < NUM_OF(defScaleRotation); i++) { // Get the default points (hardcoded!)
+ defPoints.append(defScaleRotation[i]);
+ }
+ functionConfig.loadSettings(iniFile, defPoints);
+
+ defPoints.clear();
+ for (int i = 0; i < NUM_OF(defScaleTranslation); i++) { // Get the default points (hardcoded!)
+ defPoints.append(defScaleTranslation[i]);
+ }
+ translationFunctionConfig.loadSettings(iniFile, defPoints);
}
void FTNoIR_Filter::FilterHeadPoseData(THeadPoseData *current_camera_position, THeadPoseData *target_camera_position, THeadPoseData *new_camera_position, bool newTarget)
|