ewma use settings framework

4 files changed, 32 insertions, 169 deletions

diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
index 77596b71..4f07443a 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
@@ -37,42 +37,13 @@
 //

 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 

-FTNoIR_Filter::FTNoIR_Filter()

+FTNoIR_Filter::FTNoIR_Filter() : first_run(true), alpha_smoothing(0.02)

 {

-    first_run = true;

-    alpha_smoothing = 0.02f;  // this is a constant for now, might be a parameter later

-    loadSettings();  // Load the Settings

 }

 

-void FTNoIR_Filter::receiveSettings(double smin, double smax, double sexpt)

+void FTNoIR_Filter::receiveSettings()

 {

-    QMutexLocker foo(&mutex);

-    

-    kMinSmoothing = smin;

-    kMaxSmoothing = smax;

-    kSmoothingScaleCurve = sexpt;

-}

-

-//

-// Load the current Settings from the currently 'active' INI-file.

-//

-void FTNoIR_Filter::loadSettings() {

-    qDebug() << "FTNoIR_Filter::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)

-

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

-

-    //

-    // The EWMA2-filter-settings are in the Tracking group: this is because they used to be on the Main Form of FaceTrackNoIR

-    //

-    iniFile.beginGroup ( "Tracking" );

-    kMinSmoothing = iniFile.value ( "minSmooth", 15 ).toInt();

-    kMaxSmoothing = iniFile.value ( "maxSmooth", 50 ).toInt();

-    kSmoothingScaleCurve = iniFile.value ( "powCurve", 10 ).toInt();

-    iniFile.endGroup ();

+    s.b->reload();

 }

 

 void FTNoIR_Filter::FilterHeadPoseData(const double *target_camera_position,

@@ -93,15 +64,13 @@ void FTNoIR_Filter::FilterHeadPoseData(const double *target_camera_position,
         return;

     }

     

-    QMutexLocker foo(&mutex);

-

     for (int i=0;i<6;i++) {

         // Calculate the delta.

         delta=target_camera_position[i]-current_camera_position[i];

         // Normalise the delta.

         delta=std::min<double>(std::max<double>(fabs(delta)/scale[i],0.0),1.0);

         // Calculate the new alpha from the normalized delta.

-        new_alpha=1.0/(kMinSmoothing+((1.0-pow(delta,kSmoothingScaleCurve))*(kMaxSmoothing-kMinSmoothing)));

+        new_alpha=1.0/(s.kMinSmoothing+((1.0-pow(delta,s.kSmoothingScaleCurve))*(s.kMaxSmoothing-s.kMinSmoothing)));

         // Update the smoothed alpha.

         alpha[i]=(alpha_smoothing*new_alpha)+((1.0-alpha_smoothing)*alpha[i]);

     }

diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
index 7c98b2cb..6e9a7f9a 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
@@ -31,35 +31,35 @@
 #include "ui_ftnoir_ewma_filtercontrols.h"

 #include <QWidget>

 #include <QMutex>

+#include "facetracknoir/options.hpp"

+using namespace options;

+

+struct settings {

+    pbundle b;

+    value<int> kMinSmoothing, kMaxSmoothing, kSmoothingScaleCurve;

+    settings() :

+        b(bundle("ewma-filter")),

+        kMinSmoothing(b, "min-smoothing", 15),

+        kMaxSmoothing(b, "max-smoothing", 50),

+        kSmoothingScaleCurve(b, "smoothing-scale-curve", 10)

+    {}

+};

+

 

-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-//

-// EWMA Filter: Exponentially Weighted Moving Average filter with dynamic smoothing parameter

-//

-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 class FTNoIR_Filter : public IFilter

 {

 public:

     FTNoIR_Filter();

     void reset() {}

-

     void FilterHeadPoseData(const double *target_camera_position,

                             double *new_camera_position);

-    void receiveSettings(double smin, double smax, double sexpt);

-

+    void receiveSettings();

 private:

-    void loadSettings();  // Load the settings from the INI-file

-    double newHeadPose;   // Structure with new headpose

-

     bool first_run;

     double alpha_smoothing;

     double alpha[6];

-

-    double kMinSmoothing;

-    double kMaxSmoothing;

-    double kSmoothingScaleCurve;

     double current_camera_position[6];

-    QMutex mutex;

+    settings s;

 };

 

 //*******************************************************************************************************

@@ -71,26 +71,19 @@ class FilterControls: public QWidget, public IFilterDialog
 {

     Q_OBJECT

 public:

-    explicit FilterControls();

-    void showEvent (QShowEvent *);

+    FilterControls();

     void registerFilter(IFilter* flt);

     void unregisterFilter();

 

 private:

     Ui::UICFilterControls ui;

-    void loadSettings();

     void save();

-

-    /** helper **/

-    bool settingsDirty;

-

+    settings s;

     FTNoIR_Filter* pFilter;

 

 private slots:

     void doOK();

     void doCancel();

-    void settingChanged() { settingsDirty = true; }

-    void settingChanged( int ) { settingsDirty = true; }

 };

 

 //*******************************************************************************************************

@@ -99,8 +92,6 @@ private slots:
 class FTNoIR_FilterDll : public Metadata

 {

 public:

-    FTNoIR_FilterDll();

-    ~FTNoIR_FilterDll();

     void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA Filter Mk2"); }

     void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA"); }

     void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Exponentially Weighted Moving Average filter with dynamic smoothing parameter"); }

diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
index eb414340..e452c6f0 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
@@ -28,35 +28,17 @@
 #include "facetracknoir/global-settings.h"
 #include "ui_ftnoir_ewma_filtercontrols.h"
 
-//*******************************************************************************************************
-// FaceTrackNoIR Filter Settings-dialog.
-//*******************************************************************************************************
-//
-// Constructor for server-settings-dialog
-//
 FilterControls::FilterControls() :
     QWidget(), pFilter(NULL)
 {
-	ui.setupUi( this );
+    ui.setupUi( this );
 
-	QPoint offsetpos(100, 100);
-	//if (parent) {
-	//	this->move(parent->pos() + offsetpos);
-	//}
+    connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+    connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
 
-	// Connect Qt signals to member-functions
-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
-
-	// Connect sliders for reduction factor
-	connect(ui.minSmooth, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));
-	connect(ui.maxSmooth, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));
-	connect(ui.powCurve, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));
-
-	qDebug() << "FilterControls() says: started";
-
-	// Load the settings from the current .INI-file
-	loadSettings();
+    tie_setting(s.kMaxSmoothing, ui.maxSmooth);
+    tie_setting(s.kMinSmoothing, ui.minSmooth);
+    tie_setting(s.kSmoothingScaleCurve, ui.powCurve);
 }
 
 void FilterControls::registerFilter(IFilter* flt)
@@ -69,34 +51,23 @@ void FilterControls::unregisterFilter()
     pFilter = NULL;
 }
 
-//
-// OK clicked on server-dialog
-//
 void FilterControls::doOK() {
 	save();
 	this->close();
 }
 
-// override show event
-void FilterControls::showEvent ( QShowEvent * ) {
-	loadSettings();
-}
-
-//
-// Cancel clicked on server-dialog
-//
 void FilterControls::doCancel() {
 	//
 	// Ask if changed Settings should be saved
 	//
-	if (settingsDirty) {
+    if (s.b->modifiedp()) {
 		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
 
 		qDebug() << "doCancel says: answer =" << ret;
 
 		switch (ret) {
 			case QMessageBox::Save:
-				save();
+                save();
 				this->close();
 				break;
 			case QMessageBox::Discard:
@@ -115,62 +86,12 @@ void FilterControls::doCancel() {
 	}
 }
 
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void FilterControls::loadSettings() {
-	qDebug() << "FilterControls::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)
-
-	qDebug() << "FilterControls::loadSettings says: iniFile = " << currentFile;
-
-	//
-	// The EWMA2-filter-settings are in the Tracking group: this is because they used to be on the Main Form of FaceTrackNoIR
-	//
-	iniFile.beginGroup ( "Tracking" );
-	ui.minSmooth->setValue (iniFile.value ( "minSmooth", 15 ).toInt());
-	ui.maxSmooth->setValue (iniFile.value ( "maxSmooth", 50 ).toInt());
-	ui.powCurve->setValue (iniFile.value ( "powCurve", 10 ).toInt());
-	iniFile.endGroup ();
-
-	settingsDirty = false;
-}
-
-//
-// Save the current Settings to the currently 'active' INI-file.
-//
 void FilterControls::save() {
-	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)
-    
-    double smooth_min, smooth_max, smooth_expt;
-
-	iniFile.beginGroup ( "Tracking" );
-	iniFile.setValue ( "minSmooth", smooth_min = ui.minSmooth->value() );
-	iniFile.setValue ( "powCurve", smooth_expt = ui.powCurve->value() );
-	iniFile.setValue ( "maxSmooth", smooth_max = ui.maxSmooth->value() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
-    
+    s.b->save();
     if (pFilter)
-        pFilter->receiveSettings(smooth_min, smooth_max, smooth_expt);
+        pFilter->receiveSettings();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Filter-settings dialog object.
-
-// Export both decorated and undecorated names.
-//   GetFilterDialog     - Undecorated name, which can be easily used with GetProcAddress
-//                          Win32 API function.
-//   _GetFilterDialog@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetFilterDialog=_GetFilterDialog@0")
-
 extern "C" FTNOIR_FILTER_BASE_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog( )
 {
     return new FilterControls;
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
index 087ede1b..6ef7768e 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
@@ -23,26 +23,8 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_filter_ewma2.h"
-#include <QDebug>
 #include "facetracknoir/global-settings.h"
 
-FTNoIR_FilterDll::FTNoIR_FilterDll() {
-}
-
-FTNoIR_FilterDll::~FTNoIR_FilterDll()
-{
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Filter object.
-
-// Export both decorated and undecorated names.
-//   GetFilterDll     - Undecorated name, which can be easily used with GetProcAddress
-//						Win32 API function.
-//   _GetFilterDll@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetFilterDll=_GetFilterDll@0")
-
 extern "C" FTNOIR_FILTER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
 {
 	return new FTNoIR_FilterDll;