diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-24 06:00:10 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-24 06:00:10 +0100 |
| commit | 7cd098be225ab1338c81f842dc1a48d097c494bc (patch) | |
| tree | fa6a94d0a6af2002529976be754f1b67ed1ae9ff | |
| parent | 9490813ba7283a5f4caf178808907177357cd5c8 (diff) | |
| parent | a8750aae7ed86edd9f28f39f09f4650d9fe00666 (diff) | |
Merge branch 'master' of github.com:opentrack/opentrack
| -rw-r--r-- | facetracknoir/curve-config.cpp | 4 | ||||
| -rw-r--r-- | facetracknoir/facetracknoir.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp index 65470339..ca9e0d19 100644 --- a/facetracknoir/curve-config.cpp +++ b/facetracknoir/curve-config.cpp @@ -96,7 +96,7 @@ void CurveConfigurationDialog::loadSettings() { iniFile.beginGroup("Tracking"); - ui.checkBox->setChecked(iniFile.value("compensation", true).toBool()); + ui.checkBox->setChecked(iniFile.value("compensate", true).toBool()); for (int i = 0; i < 6; i++) mainApp->axis(i).altp = iniFile.value(names[i], false).toBool(); @@ -219,7 +219,7 @@ void CurveConfigurationDialog::save() { bool compensate = true; - iniFile.setValue("compensation", compensate = (bool) !!ui.checkBox->isChecked()); + iniFile.setValue("compensate", compensate = (bool) !!ui.checkBox->isChecked()); if (mainApp->tracker) mainApp->tracker->compensate = compensate; diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index b000b304..1f3ae3a2 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -492,12 +492,12 @@ void FaceTrackNoIR::startTracker( ) { axis(i).invert = iniFile.value(invert_names[i], false).toBool() ? 1 : -1; } - iniFile.endGroup(); - - tracker = new Tracker ( this ); + tracker = new Tracker ( this ); tracker->compensate = iniFile.value("compensate", true).toBool(); + iniFile.endGroup(); + tracker->setInvertAxis(Yaw, ui.chkInvertYaw->isChecked() ); tracker->setInvertAxis(Pitch, ui.chkInvertPitch->isChecked() ); tracker->setInvertAxis(Roll, ui.chkInvertRoll->isChecked() ); |