Modified sendHeadposeToGame, so it also sends raw data.

Unified the code by adding the Dll class to the protocols and moving the dialog to a separate source.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@173 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

2 files changed, 4 insertions, 42 deletions

diff --git a/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h b/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h
index f313d154..18afe3bd 100644
--- a/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h
+++ b/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h
@@ -107,15 +107,11 @@ public:
 	void Release();

     void Initialize();

 

-	void getFullName(QString *strToBeFilled);

-	void getShortName(QString *strToBeFilled);

-	void getDescription(QString *strToBeFilled);

-	void getIcon(QIcon *icon);

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

 

-private:

-	QString filterFullName;									// Filters' name and description

-	QString filterShortName;

-	QString filterDescription;

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

 };

 

 #endif						//INCLUDED_FTN_FILTER_H

diff --git a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma_dll.cpp b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma_dll.cpp
index c9867f1b..4e644446 100644
--- a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma_dll.cpp
+++ b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma_dll.cpp
@@ -34,10 +34,6 @@
 #include <QDebug>

 

 FTNoIR_FilterDll::FTNoIR_FilterDll() {

-	//populate the description strings

-	filterFullName = "EWMA Filter Mk2";

-	filterShortName = "EWMA";

-	filterDescription = "Exponentially Weighted Moving Average filter with dynamic smoothing parameter";

 }

 

 FTNoIR_FilterDll::~FTNoIR_FilterDll()

@@ -45,36 +41,6 @@ FTNoIR_FilterDll::~FTNoIR_FilterDll()
 

 }

 

-void FTNoIR_FilterDll::Release()

-{

-    delete this;

-}

-

-void FTNoIR_FilterDll::Initialize()

-{

-	return;

-}

-

-void FTNoIR_FilterDll::getFullName(QString *strToBeFilled)

-{

-	*strToBeFilled = filterFullName;

-};

-

-void FTNoIR_FilterDll::getShortName(QString *strToBeFilled)

-{

-	*strToBeFilled = filterShortName;

-};

-

-void FTNoIR_FilterDll::getDescription(QString *strToBeFilled)

-{

-	*strToBeFilled = filterDescription;

-};

-

-void FTNoIR_FilterDll::getIcon(QIcon *icon)

-{

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

-};

-

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

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