From 7b0ce8034456271ab0ea15da9b60fe9b94d75dc0 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 15 Sep 2013 04:32:44 +0200 Subject: Don't use tracker.cpp indirection for updating zeroing --- facetracknoir/tracker.cpp | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'facetracknoir/tracker.cpp') diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp index cff2e765..4304d939 100644 --- a/facetracknoir/tracker.cpp +++ b/facetracknoir/tracker.cpp @@ -36,7 +36,6 @@ Tracker::Tracker( FaceTrackNoIR *parent ) : // Retieve the pointer to the parent mainApp = parent; // Load the settings from the INI-file - loadSettings(); } Tracker::~Tracker() @@ -196,33 +195,4 @@ void Tracker::getOutputHeadPose( double *data ) { data[i] = output_camera.axes[i]; } -// -// Load the current Settings from the currently 'active' INI-file. -// -void Tracker::loadSettings() { - qDebug() << "Tracker::loadSettings says: Starting "; - QSettings settings("opentrack"); // 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) - - iniFile.beginGroup("Tracking"); - - qDebug() << "loadSettings says: iniFile = " << currentFile; - - const char* names2[] = { - "zero_tx", - "zero_ty", - "zero_tz", - "zero_rx", - "zero_ry", - "zero_rz" - }; - - for (int i = 0; i < 6; i++) - mainApp->axis(i).zero = iniFile.value(names2[i], 0).toDouble(); - - iniFile.endGroup(); -} - void Tracker::setInvertAxis(Axis axis, bool invert) { mainApp->axis(axis).invert = invert?-1.0f:1.0f; } -- cgit v1.2.3