Run dos2unix on the tree. No user-facing changes.

4 files changed, 536 insertions, 536 deletions

diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
index 43cfd102..b127c665 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
@@ -1,173 +1,173 @@
-/********************************************************************************

-* FaceTrackNoIR      This program is a private project of some enthusiastic     *

-*                    gamers from Holland, who don't like to pay much for        *

-*                    head-tracking.                                             *

-*                                                                               *

-* Copyright (C) 2012  Wim Vriend (Developing)                                   *

-*                     Ron Hendriks (Researching and Testing)                    *

-*                                                                               *

-* Homepage                                                                      *

-*                                                                               *

-* This program is free software; you can redistribute it and/or modify it       *

-* under the terms of the GNU General Public License as published by the         *

-* Free Software Foundation; either version 3 of the License, or (at your        *

-* option) any later version.                                                    *

-*                                                                               *

-* This program is distributed in the hope that it will be useful, but           *

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY    *

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for   *

-* more details.                                                                 *

-*                                                                               *

-* You should have received a copy of the GNU General Public License along       *

-* with this program; if not, see <http://www.gnu.org/licenses/>.                *

-*                                                                               *

-********************************************************************************/

-#include "ftnoir_filter_ewma2.h"

-#include "math.h"

-#include <QDebug>

-#include <QWidget>

-#include "facetracknoir/global-settings.h"

-#include <algorithm>

-#include <QMutexLocker>

-//#define LOG_OUTPUT

-

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

-//

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

-//

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

-

-FTNoIR_Filter::FTNoIR_Filter()

-{

-    first_run = true;

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

-    loadSettings();  // Load the Settings

-}

-

-FTNoIR_Filter::~FTNoIR_Filter()

-{

-}

-

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

-{

-    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 ();

-}

-

-void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position,

-                                       double *target_camera_position,

-                                       double *new_camera_position,

-                                       double *last_post_filter)

-{

-    double delta;

-    double new_alpha;

-    double scale[]={0.025f,0.025f,0.025f,6.0f,6.0f,6.0f};

-

-    //On the first run, initialize to output=target and return.

-    if (first_run==true) {

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

-            new_camera_position[i] = target_camera_position[i];

-            current_camera_position[i] = target_camera_position[i];

-            alpha[i] = 0.0f;

-        }

-        first_run=false;

-        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)));

-        // Update the smoothed alpha.

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

-    }

-

-    // Use the same (largest) smoothed alpha for each channel

-    //NB: larger alpha = *less* lag (opposite to what you'd expect)

-    float largest_alpha=0.0f;

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

-        largest_alpha=std::max<double>(largest_alpha, alpha[i]);

-    }

-

-    // Calculate the new camera position.

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

-        new_camera_position[i]=(largest_alpha*target_camera_position[i])+((1.0f-largest_alpha)*current_camera_position[i]);

-        //new_camera_position[i]=(alpha[i]*target_camera_position[i])+((1.0f-alpha[i])*current_camera_position[i]);

-    }

-

-#ifdef LOG_OUTPUT

-    // Use this for some debug-output to file...

-    QFile data(QCoreApplication::applicationDirPath() + "\\EWMA_output.txt");

-    if (data.open(QFile::WriteOnly | QFile::Append)) {

-        QTextStream out(&data);

-        out << "current:\t" << current_camera_position[0]

-            << "\t" << current_camera_position[1]

-            << "\t" << current_camera_position[2]

-            << "\t" << current_camera_position[3]

-            << "\t" << current_camera_position[4]

-            << "\t" << current_camera_position[5] << '\n';

-        out << "target:\t" << target_camera_position[0]

-            << "\t" << target_camera_position[1]

-            << "\t" << target_camera_position[2]

-            << "\t" << target_camera_position[3]

-            << "\t" << target_camera_position[4]

-            << "\t" << target_camera_position[5] << '\n';

-        out << "output:\t" << new_camera_position[0]

-            << "\t" << new_camera_position[1]

-            << "\t" << new_camera_position[2]

-            << "\t" << new_camera_position[3]

-            << "\t" << new_camera_position[4]

-            << "\t" << new_camera_position[5] << '\n';

-        out << "largest_alpha:\t" << largest_alpha << '\n';

-    }

-#endif

-

-    // Update the current camera position to the new position.

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

-        current_camera_position[i] = new_camera_position[i];

-    }

-}

-

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

-// Factory function that creates instances if the Filter object.

-

-// Export both decorated and undecorated names.

-//   GetFilter     - Undecorated name, which can be easily used with GetProcAddress

-//                   Win32 API function.

-//   _GetFilter@0  - Common name decoration for __stdcall functions in C language.

-//#pragma comment(linker, "/export:GetFilter=_GetFilter@0")

-

-extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()

-{

-    return new FTNoIR_Filter;

-}

+/********************************************************************************
+* FaceTrackNoIR      This program is a private project of some enthusiastic     *
+*                    gamers from Holland, who don't like to pay much for        *
+*                    head-tracking.                                             *
+*                                                                               *
+* Copyright (C) 2012  Wim Vriend (Developing)                                   *
+*                     Ron Hendriks (Researching and Testing)                    *
+*                                                                               *
+* Homepage                                                                      *
+*                                                                               *
+* This program is free software; you can redistribute it and/or modify it       *
+* under the terms of the GNU General Public License as published by the         *
+* Free Software Foundation; either version 3 of the License, or (at your        *
+* option) any later version.                                                    *
+*                                                                               *
+* This program is distributed in the hope that it will be useful, but           *
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY    *
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for   *
+* more details.                                                                 *
+*                                                                               *
+* You should have received a copy of the GNU General Public License along       *
+* with this program; if not, see <http://www.gnu.org/licenses/>.                *
+*                                                                               *
+********************************************************************************/
+#include "ftnoir_filter_ewma2.h"
+#include "math.h"
+#include <QDebug>
+#include <QWidget>
+#include "facetracknoir/global-settings.h"
+#include <algorithm>
+#include <QMutexLocker>
+//#define LOG_OUTPUT
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// EWMA Filter: Exponentially Weighted Moving Average filter with dynamic smoothing parameter
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+FTNoIR_Filter::FTNoIR_Filter()
+{
+    first_run = true;
+    alpha_smoothing = 0.02f;  // this is a constant for now, might be a parameter later
+    loadSettings();  // Load the Settings
+}
+
+FTNoIR_Filter::~FTNoIR_Filter()
+{
+}
+
+void FTNoIR_Filter::receiveSettings(double smin, double smax, double sexpt)
+{
+    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 ();
+}
+
+void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position,
+                                       double *target_camera_position,
+                                       double *new_camera_position,
+                                       double *last_post_filter)
+{
+    double delta;
+    double new_alpha;
+    double scale[]={0.025f,0.025f,0.025f,6.0f,6.0f,6.0f};
+
+    //On the first run, initialize to output=target and return.
+    if (first_run==true) {
+        for (int i=0;i<6;i++) {
+            new_camera_position[i] = target_camera_position[i];
+            current_camera_position[i] = target_camera_position[i];
+            alpha[i] = 0.0f;
+        }
+        first_run=false;
+        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)));
+        // Update the smoothed alpha.
+        alpha[i]=(alpha_smoothing*new_alpha)+((1.0f-alpha_smoothing)*alpha[i]);
+    }
+
+    // Use the same (largest) smoothed alpha for each channel
+    //NB: larger alpha = *less* lag (opposite to what you'd expect)
+    float largest_alpha=0.0f;
+    for (int i=0;i<6;i++) {
+        largest_alpha=std::max<double>(largest_alpha, alpha[i]);
+    }
+
+    // Calculate the new camera position.
+    for (int i=0;i<6;i++) {
+        new_camera_position[i]=(largest_alpha*target_camera_position[i])+((1.0f-largest_alpha)*current_camera_position[i]);
+        //new_camera_position[i]=(alpha[i]*target_camera_position[i])+((1.0f-alpha[i])*current_camera_position[i]);
+    }
+
+#ifdef LOG_OUTPUT
+    // Use this for some debug-output to file...
+    QFile data(QCoreApplication::applicationDirPath() + "\\EWMA_output.txt");
+    if (data.open(QFile::WriteOnly | QFile::Append)) {
+        QTextStream out(&data);
+        out << "current:\t" << current_camera_position[0]
+            << "\t" << current_camera_position[1]
+            << "\t" << current_camera_position[2]
+            << "\t" << current_camera_position[3]
+            << "\t" << current_camera_position[4]
+            << "\t" << current_camera_position[5] << '\n';
+        out << "target:\t" << target_camera_position[0]
+            << "\t" << target_camera_position[1]
+            << "\t" << target_camera_position[2]
+            << "\t" << target_camera_position[3]
+            << "\t" << target_camera_position[4]
+            << "\t" << target_camera_position[5] << '\n';
+        out << "output:\t" << new_camera_position[0]
+            << "\t" << new_camera_position[1]
+            << "\t" << new_camera_position[2]
+            << "\t" << new_camera_position[3]
+            << "\t" << new_camera_position[4]
+            << "\t" << new_camera_position[5] << '\n';
+        out << "largest_alpha:\t" << largest_alpha << '\n';
+    }
+#endif
+
+    // Update the current camera position to the new position.
+    for (int i = 0; i < 6; i++) {
+        current_camera_position[i] = new_camera_position[i];
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Factory function that creates instances if the Filter object.
+
+// Export both decorated and undecorated names.
+//   GetFilter     - Undecorated name, which can be easily used with GetProcAddress
+//                   Win32 API function.
+//   _GetFilter@0  - Common name decoration for __stdcall functions in C language.
+//#pragma comment(linker, "/export:GetFilter=_GetFilter@0")
+
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
+{
+    return new FTNoIR_Filter;
+}
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
index 18fec8d4..91f32816 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
@@ -1,116 +1,116 @@
-/********************************************************************************

-* FaceTrackNoIR      This program is a private project of some enthusiastic     *

-*                    gamers from Holland, who don't like to pay much for        *

-*                    head-tracking.                                             *

-*                                                                               *

-* Copyright (C) 2012  Wim Vriend (Developing)                                   *

-*                     Ron Hendriks (Researching and Testing)                    *

-*                                                                               *

-* Homepage                                                                      *

-*                                                                               *

-* This program is free software; you can redistribute it and/or modify it       *

-* under the terms of the GNU General Public License as published by the         *

-* Free Software Foundation; either version 3 of the License, or (at your        *

-* option) any later version.                                                    *

-*                                                                               *

-* This program is distributed in the hope that it will be useful, but           *

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY    *

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for   *

-* more details.                                                                 *

-*                                                                               *

-* You should have received a copy of the GNU General Public License along       *

-* with this program; if not, see <http://www.gnu.org/licenses/>.                *

-*                                                                               *

-********************************************************************************/

-#pragma once

-#ifndef INCLUDED_FTN_FILTER_H

-#define INCLUDED_FTN_FILTER_H

-

-#include "ftnoir_filter_base/ftnoir_filter_base.h"

-#include "facetracknoir/global-settings.h"

-#include "ui_ftnoir_ewma_filtercontrols.h"

-#include <QWidget>

-#include <QMutex>

-

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

-//

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

-//

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

-class FTNoIR_Filter : public IFilter

-{

-public:

-    FTNoIR_Filter();

-    ~FTNoIR_Filter();

-    void Initialize() {}

-

-    void FilterHeadPoseData(double *current_camera_position,

-                            double *target_camera_position,

-                            double *new_camera_position,

-                            double *last_post_filter);

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

-

-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;

-    

-    QMutex mutex;

-};

-

-//*******************************************************************************************************

-// FaceTrackNoIR Filter Settings-dialog.

-//*******************************************************************************************************

-

-// Widget that has controls for FTNoIR protocol filter-settings.

-class FilterControls: public QWidget, public IFilterDialog

-{

-    Q_OBJECT

-public:

-    explicit FilterControls();

-    virtual ~FilterControls();

-    void showEvent ( QShowEvent * event );

-    void Initialize(QWidget *parent);

-    void registerFilter(IFilter* flt);

-    void unregisterFilter();

-

-private:

-    Ui::UICFilterControls ui;

-    void loadSettings();

-    void save();

-

-    /** helper **/

-    bool settingsDirty;

-

-    FTNoIR_Filter* pFilter;

-

-private slots:

-    void doOK();

-    void doCancel();

-    void settingChanged() { settingsDirty = true; }

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

-};

-

-//*******************************************************************************************************

-// FaceTrackNoIR Filter DLL. Functions used to get general info on the Filter

-//*******************************************************************************************************

-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"); }

-    void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png"); }

-};

-

-#endif  //INCLUDED_FTN_FILTER_H

-//END

+/********************************************************************************
+* FaceTrackNoIR      This program is a private project of some enthusiastic     *
+*                    gamers from Holland, who don't like to pay much for        *
+*                    head-tracking.                                             *
+*                                                                               *
+* Copyright (C) 2012  Wim Vriend (Developing)                                   *
+*                     Ron Hendriks (Researching and Testing)                    *
+*                                                                               *
+* Homepage                                                                      *
+*                                                                               *
+* This program is free software; you can redistribute it and/or modify it       *
+* under the terms of the GNU General Public License as published by the         *
+* Free Software Foundation; either version 3 of the License, or (at your        *
+* option) any later version.                                                    *
+*                                                                               *
+* This program is distributed in the hope that it will be useful, but           *
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY    *
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for   *
+* more details.                                                                 *
+*                                                                               *
+* You should have received a copy of the GNU General Public License along       *
+* with this program; if not, see <http://www.gnu.org/licenses/>.                *
+*                                                                               *
+********************************************************************************/
+#pragma once
+#ifndef INCLUDED_FTN_FILTER_H
+#define INCLUDED_FTN_FILTER_H
+
+#include "ftnoir_filter_base/ftnoir_filter_base.h"
+#include "facetracknoir/global-settings.h"
+#include "ui_ftnoir_ewma_filtercontrols.h"
+#include <QWidget>
+#include <QMutex>
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// EWMA Filter: Exponentially Weighted Moving Average filter with dynamic smoothing parameter
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+class FTNoIR_Filter : public IFilter
+{
+public:
+    FTNoIR_Filter();
+    ~FTNoIR_Filter();
+    void Initialize() {}
+
+    void FilterHeadPoseData(double *current_camera_position,
+                            double *target_camera_position,
+                            double *new_camera_position,
+                            double *last_post_filter);
+    void receiveSettings(double smin, double smax, double sexpt);
+
+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;
+    
+    QMutex mutex;
+};
+
+//*******************************************************************************************************
+// FaceTrackNoIR Filter Settings-dialog.
+//*******************************************************************************************************
+
+// Widget that has controls for FTNoIR protocol filter-settings.
+class FilterControls: public QWidget, public IFilterDialog
+{
+    Q_OBJECT
+public:
+    explicit FilterControls();
+    virtual ~FilterControls();
+    void showEvent ( QShowEvent * event );
+    void Initialize(QWidget *parent);
+    void registerFilter(IFilter* flt);
+    void unregisterFilter();
+
+private:
+    Ui::UICFilterControls ui;
+    void loadSettings();
+    void save();
+
+    /** helper **/
+    bool settingsDirty;
+
+    FTNoIR_Filter* pFilter;
+
+private slots:
+    void doOK();
+    void doCancel();
+    void settingChanged() { settingsDirty = true; }
+    void settingChanged( int ) { settingsDirty = true; }
+};
+
+//*******************************************************************************************************
+// FaceTrackNoIR Filter DLL. Functions used to get general info on the Filter
+//*******************************************************************************************************
+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"); }
+    void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png"); }
+};
+
+#endif  //INCLUDED_FTN_FILTER_H
+//END
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
index ebcba5f1..91777213 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
@@ -1,198 +1,198 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of some enthusiastic		*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2012	Wim Vriend (Developing)									*

-*						Ron Hendriks (Researching and Testing)					*

-*																				*

-* Homepage																		*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-********************************************************************************/

-#include "ftnoir_filter_ewma2.h"

-#include "math.h"

-#include <QDebug>

-#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 );

-

-	QPoint offsetpos(100, 100);

-	//if (parent) {

-	//	this->move(parent->pos() + offsetpos);

-	//}

-

-	// 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();

-}

-

-//

-// Destructor for server-dialog

-//

-FilterControls::~FilterControls() {

-	qDebug() << "~FilterControls() says: started";

-}

-

-//

-// Initialize tracker-client-dialog

-//

-void FilterControls::Initialize(QWidget *parent) {

-	//

-	//

-	//

-	QPoint offsetpos(100, 100);

-	if (parent) {

-		this->move(parent->pos() + offsetpos);

-	}

-	show();

-}

-

-void FilterControls::registerFilter(IFilter* flt)

-{

-    pFilter = (FTNoIR_Filter*) flt;

-}

-

-void FilterControls::unregisterFilter()

-{

-    pFilter = NULL;

-}

-

-//

-// OK clicked on server-dialog

-//

-void FilterControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

-void FilterControls::showEvent ( QShowEvent * event ) {

-	loadSettings();

-}

-

-//

-// Cancel clicked on server-dialog

-//

-void FilterControls::doCancel() {

-	//

-	// Ask if changed Settings should be saved

-	//

-	if (settingsDirty) {

-		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();

-				this->close();

-				break;

-			case QMessageBox::Discard:

-				this->close();

-				break;

-			case QMessageBox::Cancel:

-				// Cancel was clicked

-				break;

-			default:

-				// should never be reached

-			break;

-		}

-	}

-	else {

-		this->close();

-	}

-}

-

-//

-// 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;

-    

-    if (pFilter)

-        pFilter->receiveSettings(smooth_min, smooth_max, smooth_expt);

-}

-

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

-// 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;

-}

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2012	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+#include "ftnoir_filter_ewma2.h"
+#include "math.h"
+#include <QDebug>
+#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 );
+
+	QPoint offsetpos(100, 100);
+	//if (parent) {
+	//	this->move(parent->pos() + offsetpos);
+	//}
+
+	// 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();
+}
+
+//
+// Destructor for server-dialog
+//
+FilterControls::~FilterControls() {
+	qDebug() << "~FilterControls() says: started";
+}
+
+//
+// Initialize tracker-client-dialog
+//
+void FilterControls::Initialize(QWidget *parent) {
+	//
+	//
+	//
+	QPoint offsetpos(100, 100);
+	if (parent) {
+		this->move(parent->pos() + offsetpos);
+	}
+	show();
+}
+
+void FilterControls::registerFilter(IFilter* flt)
+{
+    pFilter = (FTNoIR_Filter*) flt;
+}
+
+void FilterControls::unregisterFilter()
+{
+    pFilter = NULL;
+}
+
+//
+// OK clicked on server-dialog
+//
+void FilterControls::doOK() {
+	save();
+	this->close();
+}
+
+// override show event
+void FilterControls::showEvent ( QShowEvent * event ) {
+	loadSettings();
+}
+
+//
+// Cancel clicked on server-dialog
+//
+void FilterControls::doCancel() {
+	//
+	// Ask if changed Settings should be saved
+	//
+	if (settingsDirty) {
+		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();
+				this->close();
+				break;
+			case QMessageBox::Discard:
+				this->close();
+				break;
+			case QMessageBox::Cancel:
+				// Cancel was clicked
+				break;
+			default:
+				// should never be reached
+			break;
+		}
+	}
+	else {
+		this->close();
+	}
+}
+
+//
+// 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;
+    
+    if (pFilter)
+        pFilter->receiveSettings(smooth_min, smooth_max, smooth_expt);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// 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 48c9d3be..087ede1b 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
@@ -1,49 +1,49 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of some enthusiastic		*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2012	Wim Vriend (Developing)									*

-*						Ron Hendriks (Researching and Testing)					*

-*																				*

-* Homepage																		*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-********************************************************************************/

-#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;

-}

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2012	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+#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;
+}