From 939a7aeb335b998cc763c33aa3cb81fb5ddd87a4 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 13 Apr 2013 01:00:34 +0200
Subject: Third chance - fix alt spline not working for all axes

---
 bin/settings/default.ini        | 146 +++++++++++++++++++++-------------------
 facetracknoir/facetracknoir.cpp |  10 ++-
 2 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/bin/settings/default.ini b/bin/settings/default.ini
index 5a4827ba..7ca466a5 100644
--- a/bin/settings/default.ini
+++ b/bin/settings/default.ini
@@ -1,3 +1,58 @@
+[General]
+rx_alt=false
+ry_alt=true
+rz_alt=false
+tx_alt=false
+ty_alt=false
+tz_alt=true
+
+[Curves-rx]
+point-count=4
+point-0-x=0
+point-0-y=0
+point-1-x=5
+point-1-y=14
+point-2-x=12.222222328186
+point-2-y=75
+point-3-x=19
+point-3-y=158
+
+[Curves-ry]
+point-count=1
+point-0-x=19
+point-0-y=90
+
+[Curves-ry_alt]
+point-count=4
+point-0-x=0
+point-0-y=0
+point-1-x=4.88888883590698
+point-1-y=16
+point-2-x=8.88888931274414
+point-2-y=36
+point-3-x=12
+point-3-y=69
+
+[Curves-rz]
+point-count=1
+point-0-x=60
+point-0-y=60
+
+[Curves-tx]
+point-count=1
+point-0-x=59.8888893127441
+point-0-y=165
+
+[Curves-ty]
+point-count=1
+point-0-x=60
+point-0-y=165
+
+[Curves-tz]
+point-count=1
+point-0-x=60
+point-0-y=200
+
 [Tracking]
 Smooth=1
 invertYaw=false
@@ -31,43 +86,6 @@ Selection=0
 DLL=FTNoIR_Tracker_SM.dll
 2ndDLL=None
 
-[Curves-Yaw]
-point-count=2
-point-0-x=25
-point-0-y=90
-point-1-x=50
-point-1-y=180
-
-[Curves-PitchUp]
-point-count=1
-point-0-x=35.25
-point-0-y=86
-
-[Curves-PitchDown]
-point-count=1
-point-0-x=27
-point-0-y=50.5
-
-[Curves-Roll]
-point-count=1
-point-0-x=26.25
-point-0-y=49
-
-[Curves-X]
-point-count=1
-point-0-x=41
-point-0-y=41
-
-[Curves-Y]
-point-count=1
-point-0-x=25
-point-0-y=23
-
-[Curves-Z]
-point-count=1
-point-0-x=39.75
-point-0-y=40
-
 [Filter]
 DLL=FTNoIR_Filter_Accela.dll
 
@@ -82,40 +100,32 @@ EnableZ=true
 
 [Accela]
 Reduction=100
-zoom-slowness=20
+zoom-slowness=15
 
 [Curves-Accela-Scaling-Rotation]
-point-count=9
-point-0-x=0.429319381713867
-point-0-y=0.106666669249535
-point-1-x=1
-point-1-y=0.306666672229767
-point-2-x=1.73821985721588
-point-2-y=0.666666686534882
-point-3-x=2.14659690856934
-point-3-y=1.09333336353302
-point-4-x=2.4240837097168
-point-4-y=1.65333330631256
-point-5-x=2.6439790725708
-point-5-y=2.35999989509583
-point-6-x=2.85340309143066
-point-6-y=3.27999997138977
-point-7-x=3
-point-7-y=4.40000009536743
-point-8-x=3.09424090385437
-point-8-y=6
+point-count=6
+point-0-x=0.994764387607574
+point-0-y=0.453333348035812
+point-1-x=1.7329843044281
+point-1-y=1.1599999666214
+point-2-x=2.1989529132843
+point-2-y=1.97333335876465
+point-3-x=2.54973816871643
+point-3-y=3.20000004768372
+point-4-x=2.7120418548584
+point-4-y=4.70666646957397
+point-5-x=2.7748692035675
+point-5-y=6
 
 [Curves-Accela-Scaling-Translation]
-point-count=6
+point-count=5
 point-0-x=0
 point-0-y=0
-point-1-x=0.476439790575916
-point-1-y=0.173333333333333
-point-2-x=1.01047120418848
-point-2-y=0.613333333333333
-point-3-x=1.4869109947644
-point-3-y=1.45333333333333
-point-4-x=1.91099476439791
-point-4-y=2.90666666666667
-point-5-x=2.15183246073298
-point-5-y=5.98666666666667
\ No newline at end of file
+point-1-x=0.486910994764398
+point-1-y=0.813333333333333
+point-2-x=0.989528795811518
+point-2-y=2.01333333333333
+point-3-x=1.40837696335079
+point-3-y=3.70666666666667
+point-4-x=1.6020942408377
+point-4-y=6
\ No newline at end of file
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 37f54aaa..fd971c96 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -757,6 +757,13 @@ void FaceTrackNoIR::startTracker( ) {
     GlobalPose->Pitch.curvePtrAlt->loadSettings(iniFile);
     GlobalPose->Roll.curvePtrAlt->loadSettings(iniFile);
 
+    GlobalPose->Yaw.altp = iniFile.value("rx_alt", false).toBool();
+    GlobalPose->Pitch.altp = iniFile.value("ry_alt", false).toBool();
+    GlobalPose->Roll.altp = iniFile.value("rz_alt", false).toBool();
+    GlobalPose->X.altp = iniFile.value("tx_alt", false).toBool();
+    GlobalPose->Y.altp = iniFile.value("ty_alt", false).toBool();
+    GlobalPose->Z.altp = iniFile.value("tz_alt", false).toBool();
+
 	tracker = new Tracker ( this );
 
 	//
@@ -1967,9 +1974,6 @@ void CurveConfigurationDialog::loadSettings() {
 
 	qDebug() << "loadSettings says: iniFile = " << currentFile;
 
-	iniFile.beginGroup ( "Tracking" );
-    iniFile.endGroup ();
-
     GlobalPose->Yaw.altp = iniFile.value("rx_alt", false).toBool();
     GlobalPose->Pitch.altp = iniFile.value("ry_alt", false).toBool();
     GlobalPose->Roll.altp = iniFile.value("rz_alt", false).toBool();
-- 
cgit v1.2.3