Fix last commit, remove duplicated code

4 files changed, 6 insertions, 76 deletions

diff --git a/ftnoir_filter_accela/default-points.cpp b/ftnoir_filter_accela/default-points.cpp
deleted file mode 100644
index 2cebff6c..00000000
--- a/ftnoir_filter_accela/default-points.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <QList>
-#include <QPointF>
-
-static QList<QPointF> EmptyList() {
-	return QList<QPointF>();
-}
-
-extern const QList<QPointF> defScaleRotation, defScaleTranslation;
-
-const QList<QPointF> defScaleRotation =
-	EmptyList()
-    << QPointF(0, 0)
-    << QPointF(0.308900523560209, 0.0666666666666667)
-    << QPointF(0.565445026178011, 0.226666666666667)
-    << QPointF(0.769633507853403, 0.506666666666667)
-    << QPointF(0.994764397905759, 1)
-    << QPointF(1.23560209424084, 1.61333333333333)
-    << QPointF(1.47643979057592, 2.37333333333333)
-    << QPointF(1.66492146596859, 3.12)
-    << QPointF(1.80628272251309, 3.92)
-    << QPointF(1.91623036649215, 4.70666666666667)
-    << QPointF(2.00523560209424, 5.44)
-    << QPointF(2.07329842931937, 6)
-;
-
-const QList<QPointF> defScaleTranslation =
-	EmptyList()
-    << QPointF(0, 0)
-    << QPointF(0.282722513089005, 0.08)
-    << QPointF(0.492146596858639, 0.306666666666667)
-    << QPointF(0.764397905759162, 0.84)
-    << QPointF(1.00523560209424, 1.62666666666667)
-    << QPointF(1.17277486910995, 2.78666666666667)
-    << QPointF(1.25130890052356, 3.6)
-    << QPointF(1.31937172774869, 4.29333333333333)
-    << QPointF(1.38219895287958, 4.90666666666667)
-    << QPointF(1.43455497382199, 5.65333333333333)
-;
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index cb9fb0f5..3e931df4 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -21,8 +21,8 @@
 #endif

 

 FTNoIR_Filter::FTNoIR_Filter() :

-	functionConfig("Accela-Scaling-Rotation", 4, 6),

-	translationFunctionConfig("Accela-Scaling-Translation", 4, 6)

+    functionConfig("Accela-Scaling-Rotation", 4, 6),

+    translationFunctionConfig("Accela-Scaling-Translation", 4, 6)

 {

 	first_run = true;

 	kMagicNumber = 100.0f;

@@ -39,30 +39,18 @@ 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)

 

-	defPoints.clear();

-    for (int i = 0; i < defScaleRotation.size(); i++) {		// Get the default points (hardcoded!)

-		defPoints.append(defScaleRotation[i]);

-	}

-	functionConfig.loadSettings(iniFile, defPoints);

-

-	defPoints.clear();

-    for (int i = 0; i < defScaleTranslation.size(); i++) {		// Get the default points (hardcoded!)

-		defPoints.append(defScaleTranslation[i]);

-	}

-	translationFunctionConfig.loadSettings(iniFile, defPoints);

+    functionConfig.loadSettings(iniFile);

+    translationFunctionConfig.loadSettings(iniFile);

 

 	iniFile.beginGroup ( "Accela" );

 	kMagicNumber = iniFile.value ( "Reduction", 100 ).toFloat();

     kZoomSlowness = iniFile.value("zoom-slowness", 0).toFloat();

 	iniFile.endGroup ();

-

 }

 

 void FTNoIR_Filter::FilterHeadPoseData(THeadPoseData *current_camera_position,

@@ -92,8 +80,6 @@ void FTNoIR_Filter::FilterHeadPoseData(THeadPoseData *current_camera_position,
 

 	if (first_run)

 	{

-		functionConfig.setTrackingActive(true);

-		translationFunctionConfig.setTrackingActive(true);

 		new_camera_position->x=target[0];

 		new_camera_position->y=target[1];

 		new_camera_position->z=target[2];

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h
index 32cebf99..701dabaa 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.h
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.h
@@ -34,9 +34,6 @@
 #include <qfunctionconfigurator/functionconfig.h>

 #include "facetracknoir/global-settings.h"

 

-extern const QList<QPointF> defScaleRotation;

-extern const QList<QPointF> defScaleTranslation;

-

 //

 // Macro to determine array-size

 //

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
index 9970e962..f9fdcb6f 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
@@ -39,8 +39,8 @@
 //

 FilterControls::FilterControls() :

 	QWidget(),

-	functionConfig("Accela-Scaling-Rotation", 4, 8),

-	translationFunctionConfig("Accela-Scaling-Translation", 4, 8)

+    functionConfig("Accela-Scaling-Rotation", 4, 8),

+    translationFunctionConfig("Accela-Scaling-Translation", 4, 8)

 {

 	ui.setupUi( this );

 

@@ -141,8 +141,6 @@ void FilterControls::doCancel() {
 // Load the current Settings from the currently 'active' INI-file.

 //

 void FilterControls::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();

@@ -150,21 +148,8 @@ QList<QPointF> defPoints;
 

 	qDebug() << "FTNoIR_Filter::loadSettings2 says: iniFile = " << currentFile;

 

-

     //qDebug() << "FTNoIR_Filter::loadSettings2 says: size = " << NUM_OF(defScaleRotation);

 

-	defPoints.clear();

-    for (int i = 0; i < defScaleRotation.size(); i++) {		// Get the default points (hardcoded!)

-		defPoints.append(defScaleRotation[i]);

-	}

-	functionConfig.loadSettings(iniFile, defPoints);

-

-	defPoints.clear();

-    for (int i = 0; i < defScaleTranslation.size(); i++) {		// Get the default points (hardcoded!)

-		defPoints.append(defScaleTranslation[i]);

-	}

-	translationFunctionConfig.loadSettings(iniFile, defPoints);

-

 	ui.translationScalingConfig->setConfig(&translationFunctionConfig, currentFile);

 	ui.scalingConfig->setConfig(&functionConfig, currentFile);