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

4 files changed, 426 insertions, 426 deletions

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index c2cda3515..0b3d6518e 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -1,90 +1,90 @@
-/* Copyright (c) 2012 Stanislaw Halik

- *

- * Permission to use, copy, modify, and/or distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- */

-#include "ftnoir_filter_accela/ftnoir_filter_accela.h"

-#include <cmath>

-#include <QDebug>

-#include <QMutexLocker>

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

-

-using namespace std;

-

-FTNoIR_Filter::FTNoIR_Filter()

-{

-	first_run = true;

-	loadSettings();

-}

-

-FTNoIR_Filter::~FTNoIR_Filter()

-{

-

-}

-

-void FTNoIR_Filter::loadSettings() {

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

-

-	iniFile.beginGroup ( "Accela" );

-    zoom_factor = iniFile.value("zoom-slowness", 0).toDouble();

-    rotation_alpha = iniFile.value("rotation-alpha", ACCELA_SMOOTHING_ROTATION).toDouble();

-    translation_alpha = iniFile.value("translation-alpha", ACCELA_SMOOTHING_TRANSLATION).toDouble();

-	iniFile.endGroup ();

-}

-

-void FTNoIR_Filter::receiveSettings(double rot, double trans, double zoom_fac)

-{

-    QMutexLocker foo(&mutex);

-    

-    rotation_alpha = rot;

-    translation_alpha = trans;

-    zoom_factor = zoom_fac;

-}

-

-static double parabola(const double a, const double x)

-{

-    const double a1 = 1./a;

-    return a1 * x * x;

-}

-

-void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position,

-                                       double *target_camera_position,

-                                       double *new_camera_position,

-                                       double *last_post_filter_values)

-{

-	if (first_run)

-	{

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

-        {

-            new_camera_position[i] = target_camera_position[i];

-            current_camera_position[i] = target_camera_position[i];

-        }

-

-		first_run = false;

-		return;

-	}

-    

-    QMutexLocker foo(&mutex);

-

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

-	{

-        const double vec = target_camera_position[i] - current_camera_position[i];

-		const int sign = vec < 0 ? -1 : 1;

-		const double x = fabs(vec);

-        const double a = i >= 3 ? rotation_alpha : translation_alpha;

-        const double reduction = 1. / std::max(1., 1. + zoom_factor * -last_post_filter_values[TZ] / 1000);

-        const double velocity = parabola(a, x) * reduction;

-		const double result = current_camera_position[i] + velocity * sign;

-        const bool done = sign > 0 ? result >= target_camera_position[i] : result <= target_camera_position[i];

-        new_camera_position[i] = current_camera_position[i] = done ? target_camera_position[i] : result;

-	}

-}

-

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

-{

-    return new FTNoIR_Filter;

-}

+/* Copyright (c) 2012 Stanislaw Halik
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+#include "ftnoir_filter_accela/ftnoir_filter_accela.h"
+#include <cmath>
+#include <QDebug>
+#include <QMutexLocker>
+#include "facetracknoir/global-settings.h"
+
+using namespace std;
+
+FTNoIR_Filter::FTNoIR_Filter()
+{
+	first_run = true;
+	loadSettings();
+}
+
+FTNoIR_Filter::~FTNoIR_Filter()
+{
+
+}
+
+void FTNoIR_Filter::loadSettings() {
+	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)
+
+	iniFile.beginGroup ( "Accela" );
+    zoom_factor = iniFile.value("zoom-slowness", 0).toDouble();
+    rotation_alpha = iniFile.value("rotation-alpha", ACCELA_SMOOTHING_ROTATION).toDouble();
+    translation_alpha = iniFile.value("translation-alpha", ACCELA_SMOOTHING_TRANSLATION).toDouble();
+	iniFile.endGroup ();
+}
+
+void FTNoIR_Filter::receiveSettings(double rot, double trans, double zoom_fac)
+{
+    QMutexLocker foo(&mutex);
+    
+    rotation_alpha = rot;
+    translation_alpha = trans;
+    zoom_factor = zoom_fac;
+}
+
+static double parabola(const double a, const double x)
+{
+    const double a1 = 1./a;
+    return a1 * x * x;
+}
+
+void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position,
+                                       double *target_camera_position,
+                                       double *new_camera_position,
+                                       double *last_post_filter_values)
+{
+	if (first_run)
+	{
+        for (int i = 0; i < 6; i++)
+        {
+            new_camera_position[i] = target_camera_position[i];
+            current_camera_position[i] = target_camera_position[i];
+        }
+
+		first_run = false;
+		return;
+	}
+    
+    QMutexLocker foo(&mutex);
+
+    for (int i=0;i<6;i++)
+	{
+        const double vec = target_camera_position[i] - current_camera_position[i];
+		const int sign = vec < 0 ? -1 : 1;
+		const double x = fabs(vec);
+        const double a = i >= 3 ? rotation_alpha : translation_alpha;
+        const double reduction = 1. / std::max(1., 1. + zoom_factor * -last_post_filter_values[TZ] / 1000);
+        const double velocity = parabola(a, x) * reduction;
+		const double result = current_camera_position[i] + velocity * sign;
+        const bool done = sign > 0 ? result >= target_camera_position[i] : result <= target_camera_position[i];
+        new_camera_position[i] = current_camera_position[i] = done ? target_camera_position[i] : result;
+	}
+}
+
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
+{
+    return new FTNoIR_Filter;
+}
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h
index 0c13c0e86..49b551e77 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.h
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.h
@@ -1,107 +1,107 @@
-/********************************************************************************

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

-

-#undef FTNOIR_TRACKER_BASE_LIB

-#define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_IMPORT

-

-#include "ftnoir_filter_base/ftnoir_filter_base.h"

-#include "ui_ftnoir_accela_filtercontrols.h"

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

-#include <QMutex>

-

-#define ACCELA_SMOOTHING_ROTATION 6.0

-#define ACCELA_SMOOTHING_TRANSLATION 3.0

-

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

-// FaceTrackNoIR Filter class.

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

-class FTNOIR_FILTER_BASE_EXPORT FTNoIR_Filter : public IFilter

-{

-public:

-	FTNoIR_Filter();

-	~FTNoIR_Filter();

-    void FilterHeadPoseData(double *current_camera_position, double *target_camera_position, double *new_camera_position, double *last_post_filter_values);

-    void Initialize() {

-        first_run = true;

-    }

-    void receiveSettings(double rot, double trans, double zoom_fac);

-private:

-    QMutex mutex;

-	void loadSettings();

-	bool first_run;

-    double rotation_alpha, translation_alpha, zoom_factor;

-};

-

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

-// FaceTrackNoIR Filter Settings-dialog.

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

-

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

-class FTNOIR_FILTER_BASE_EXPORT FilterControls: public QWidget, public IFilterDialog

-{

-    Q_OBJECT

-public:

-	explicit FilterControls();

-    virtual ~FilterControls();

-	void showEvent ( QShowEvent * event );

-    void Initialize(QWidget *parent);

-    void registerFilter(IFilter* filter);

-    void unregisterFilter();

-private:

-    Ui::AccelaUICFilterControls ui;

-	void loadSettings();

-	void save();

-	bool settingsDirty;

-    FTNoIR_Filter* accela_filter;

-private slots:

-	void doOK();

-	void doCancel();

-	void settingChanged(bool) { 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("Accela Filter Mk3"); }

-    void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Accela Mk3"); }

-    void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Accela filter Mk3"); }

-

-    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
+
+#undef FTNOIR_TRACKER_BASE_LIB
+#define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_IMPORT
+
+#include "ftnoir_filter_base/ftnoir_filter_base.h"
+#include "ui_ftnoir_accela_filtercontrols.h"
+#include "facetracknoir/global-settings.h"
+#include <QMutex>
+
+#define ACCELA_SMOOTHING_ROTATION 6.0
+#define ACCELA_SMOOTHING_TRANSLATION 3.0
+
+//*******************************************************************************************************
+// FaceTrackNoIR Filter class.
+//*******************************************************************************************************
+class FTNOIR_FILTER_BASE_EXPORT FTNoIR_Filter : public IFilter
+{
+public:
+	FTNoIR_Filter();
+	~FTNoIR_Filter();
+    void FilterHeadPoseData(double *current_camera_position, double *target_camera_position, double *new_camera_position, double *last_post_filter_values);
+    void Initialize() {
+        first_run = true;
+    }
+    void receiveSettings(double rot, double trans, double zoom_fac);
+private:
+    QMutex mutex;
+	void loadSettings();
+	bool first_run;
+    double rotation_alpha, translation_alpha, zoom_factor;
+};
+
+//*******************************************************************************************************
+// FaceTrackNoIR Filter Settings-dialog.
+//*******************************************************************************************************
+
+// Widget that has controls for FTNoIR protocol filter-settings.
+class FTNOIR_FILTER_BASE_EXPORT FilterControls: public QWidget, public IFilterDialog
+{
+    Q_OBJECT
+public:
+	explicit FilterControls();
+    virtual ~FilterControls();
+	void showEvent ( QShowEvent * event );
+    void Initialize(QWidget *parent);
+    void registerFilter(IFilter* filter);
+    void unregisterFilter();
+private:
+    Ui::AccelaUICFilterControls ui;
+	void loadSettings();
+	void save();
+	bool settingsDirty;
+    FTNoIR_Filter* accela_filter;
+private slots:
+	void doOK();
+	void doCancel();
+	void settingChanged(bool) { 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("Accela Filter Mk3"); }
+    void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Accela Mk3"); }
+    void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Accela filter Mk3"); }
+
+    void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png");	}
+};
+
+
+#endif						//INCLUDED_FTN_FILTER_H
+//END
+
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
index 8c7cd3862..3e74ad818 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
@@ -1,190 +1,190 @@
-/********************************************************************************

-* 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) 2013	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_accela/ftnoir_filter_accela.h"

-#include <math.h>

-#include <QDebug>

-#include <algorithm>

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

-

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

-// FaceTrackNoIR Filter Settings-dialog.

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

-//

-// Constructor for server-settings-dialog

-//

-FilterControls::FilterControls() :

-    QWidget(), accela_filter(NULL)

-{

-	ui.setupUi( this );

-

-	// Load the settings from the current .INI-file

-	loadSettings();

-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));

-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));

-    connect(ui.rotation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(int)));

-    connect(ui.translation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(int)));

-

-    connect(ui.slideZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));

-    connect(ui.spinZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));

-

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

-}

-

-//

-// Destructor for server-dialog

-//

-FilterControls::~FilterControls() {

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

-}

-

-//

-// Initialize tracker-client-dialog

-//

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

-    loadSettings();

-    

-	QPoint offsetpos(100, 100);

-	if (parent) {

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

-	}

-	show();

-}

-

-void FilterControls::registerFilter(IFilter* filter)

-{

-    accela_filter = (FTNoIR_Filter*) filter;

-}

-

-void FilterControls::unregisterFilter()

-{

-    accela_filter = NULL;

-}

-

-//

-// OK clicked on server-dialog

-//

-void FilterControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

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

-}

-

-//

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

-	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::loadSettings2 says: iniFile = " << currentFile;

-

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

-

-	iniFile.beginGroup ( "Accela" );

-    ui.slideZoom->setValue(iniFile.value("zoom-slowness", 0).toInt());

-    ui.spinZoom->setValue(iniFile.value("zoom-slowness", 0).toInt());

-    ui.rotation_alpha->setValue(iniFile.value("rotation-alpha", ACCELA_SMOOTHING_ROTATION).toDouble());

-    ui.translation_alpha->setValue(iniFile.value("translation-alpha", ACCELA_SMOOTHING_TRANSLATION).toDouble());

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

-

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

-    

-    double rot, trans, zoom;

-

-	iniFile.beginGroup ( "Accela" );

-    iniFile.setValue("zoom-slowness", zoom = ui.slideZoom->value());

-    iniFile.setValue("rotation-alpha", rot = ui.rotation_alpha->value());

-    iniFile.setValue("translation-alpha", trans = ui.translation_alpha->value());

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-    

-    if (accela_filter)

-        accela_filter->receiveSettings(rot, trans, zoom);

-}

-

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

-// 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) 2013	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_accela/ftnoir_filter_accela.h"
+#include <math.h>
+#include <QDebug>
+#include <algorithm>
+#include "facetracknoir/global-settings.h"
+
+//*******************************************************************************************************
+// FaceTrackNoIR Filter Settings-dialog.
+//*******************************************************************************************************
+//
+// Constructor for server-settings-dialog
+//
+FilterControls::FilterControls() :
+    QWidget(), accela_filter(NULL)
+{
+	ui.setupUi( this );
+
+	// Load the settings from the current .INI-file
+	loadSettings();
+	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+    connect(ui.rotation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(int)));
+    connect(ui.translation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(int)));
+
+    connect(ui.slideZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));
+    connect(ui.spinZoom, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));
+
+	qDebug() << "FilterControls() says: started";
+}
+
+//
+// Destructor for server-dialog
+//
+FilterControls::~FilterControls() {
+	qDebug() << "~FilterControls() says: started";
+}
+
+//
+// Initialize tracker-client-dialog
+//
+void FilterControls::Initialize(QWidget *parent) {
+    loadSettings();
+    
+	QPoint offsetpos(100, 100);
+	if (parent) {
+		this->move(parent->pos() + offsetpos);
+	}
+	show();
+}
+
+void FilterControls::registerFilter(IFilter* filter)
+{
+    accela_filter = (FTNoIR_Filter*) filter;
+}
+
+void FilterControls::unregisterFilter()
+{
+    accela_filter = NULL;
+}
+
+//
+// OK clicked on server-dialog
+//
+void FilterControls::doOK() {
+	save();
+	this->close();
+}
+
+// override show event
+void FilterControls::showEvent ( QShowEvent * event ) {
+}
+
+//
+// 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() {
+	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::loadSettings2 says: iniFile = " << currentFile;
+
+    //qDebug() << "FTNoIR_Filter::loadSettings2 says: size = " << NUM_OF(defScaleRotation);
+
+	iniFile.beginGroup ( "Accela" );
+    ui.slideZoom->setValue(iniFile.value("zoom-slowness", 0).toInt());
+    ui.spinZoom->setValue(iniFile.value("zoom-slowness", 0).toInt());
+    ui.rotation_alpha->setValue(iniFile.value("rotation-alpha", ACCELA_SMOOTHING_ROTATION).toDouble());
+    ui.translation_alpha->setValue(iniFile.value("translation-alpha", ACCELA_SMOOTHING_TRANSLATION).toDouble());
+	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)
+
+	qDebug() << "FTNoIR_Filter::save() says: iniFile = " << currentFile;
+    
+    double rot, trans, zoom;
+
+	iniFile.beginGroup ( "Accela" );
+    iniFile.setValue("zoom-slowness", zoom = ui.slideZoom->value());
+    iniFile.setValue("rotation-alpha", rot = ui.rotation_alpha->value());
+    iniFile.setValue("translation-alpha", trans = ui.translation_alpha->value());
+	iniFile.endGroup ();
+
+	settingsDirty = false;
+    
+    if (accela_filter)
+        accela_filter->receiveSettings(rot, trans, zoom);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// 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_accela/ftnoir_filter_accela_dll.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
index 0235c067a..d4a110287 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
@@ -1,39 +1,39 @@
-/********************************************************************************

-* 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_accela.h"

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

-

-FTNoIR_FilterDll::FTNoIR_FilterDll() {

-}

-

-FTNoIR_FilterDll::~FTNoIR_FilterDll()

-{

-

-}

-

-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_accela.h"
+#include "facetracknoir/global-settings.h"
+
+FTNoIR_FilterDll::FTNoIR_FilterDll() {
+}
+
+FTNoIR_FilterDll::~FTNoIR_FilterDll()
+{
+
+}
+
+extern "C" FTNOIR_FILTER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+{
+    return new FTNoIR_FilterDll;
+}