Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 97 insertions, 97 deletions

diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index c4c85372..76fcacf2 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -1,97 +1,97 @@
-#include "ftnoir_tracker_base/ftnoir_tracker_base.h"

-#include "ui_ftnoir_ftnclientcontrols.h"

-#include <QThread>

-#include <QUdpSocket>

-#include <QMessageBox>

-#include <QSettings>

-#include <QMutex>

-#include <QWaitCondition>

-#include <math.h>

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

-

-class FTNoIR_Tracker : public ITracker, public QThread

-{

-public:

-	FTNoIR_Tracker();

-	~FTNoIR_Tracker();

-

-    void StartTracker( QFrame *videoframe );

-    bool GiveHeadPoseData(double *data);

-	void loadSettings();

-    volatile bool should_quit;

-    void WaitForExit() {

-        should_quit = true;

-        wait();

-    }

-

-protected:

-	void run();												// qthread override run method

-

-private:

-	// UDP socket-variables

-	QUdpSocket *inSocket;									// Receive from ...

-	QUdpSocket *outSocket;									// Send to ...

-	QHostAddress destIP;									// Destination IP-address

-	QHostAddress srcIP;										// Source IP-address

-

-    double newHeadPose[6];								// Structure with new headpose

-

-	float portAddress;										// Port-number

-	bool bEnableRoll;

-	bool bEnablePitch;

-	bool bEnableYaw;

-	bool bEnableX;

-	bool bEnableY;

-	bool bEnableZ;

-    QMutex mutex;

-};

-

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

-class TrackerControls: public QWidget, public ITrackerDialog

-{

-    Q_OBJECT

-public:

-

-	explicit TrackerControls();

-    ~TrackerControls();

-	void showEvent ( QShowEvent * event );

-

-    void Initialize(QWidget *parent);

-	void registerTracker(ITracker *tracker) {};

-	void unRegisterTracker() {};

-

-private:

-	Ui::UICFTNClientControls ui;

-	void loadSettings();

-	void save();

-

-	/** helper **/

-	bool settingsDirty;

-

-private slots:

-	void doOK();

-	void doCancel();

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

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

-};

-

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

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

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

-class FTNoIR_TrackerDll : public Metadata

-{

-public:

-	FTNoIR_TrackerDll();

-	~FTNoIR_TrackerDll();

-

-	void getFullName(QString *strToBeFilled);

-	void getShortName(QString *strToBeFilled);

-	void getDescription(QString *strToBeFilled);

-	void getIcon(QIcon *icon);

-

-private:

-	QString trackerFullName;									// Trackers' name and description

-	QString trackerShortName;

-	QString trackerDescription;

-};

-

+#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
+#include "ui_ftnoir_ftnclientcontrols.h"
+#include <QThread>
+#include <QUdpSocket>
+#include <QMessageBox>
+#include <QSettings>
+#include <QMutex>
+#include <QWaitCondition>
+#include <math.h>
+#include "facetracknoir/global-settings.h"
+
+class FTNoIR_Tracker : public ITracker, public QThread
+{
+public:
+	FTNoIR_Tracker();
+	~FTNoIR_Tracker();
+
+    void StartTracker( QFrame *videoframe );
+    bool GiveHeadPoseData(double *data);
+	void loadSettings();
+    volatile bool should_quit;
+    void WaitForExit() {
+        should_quit = true;
+        wait();
+    }
+
+protected:
+	void run();												// qthread override run method
+
+private:
+	// UDP socket-variables
+	QUdpSocket *inSocket;									// Receive from ...
+	QUdpSocket *outSocket;									// Send to ...
+	QHostAddress destIP;									// Destination IP-address
+	QHostAddress srcIP;										// Source IP-address
+
+    double newHeadPose[6];								// Structure with new headpose
+
+	float portAddress;										// Port-number
+	bool bEnableRoll;
+	bool bEnablePitch;
+	bool bEnableYaw;
+	bool bEnableX;
+	bool bEnableY;
+	bool bEnableZ;
+    QMutex mutex;
+};
+
+// Widget that has controls for FTNoIR protocol client-settings.
+class TrackerControls: public QWidget, public ITrackerDialog
+{
+    Q_OBJECT
+public:
+
+	explicit TrackerControls();
+    ~TrackerControls();
+	void showEvent ( QShowEvent * event );
+
+    void Initialize(QWidget *parent);
+	void registerTracker(ITracker *tracker) {};
+	void unRegisterTracker() {};
+
+private:
+	Ui::UICFTNClientControls ui;
+	void loadSettings();
+	void save();
+
+	/** helper **/
+	bool settingsDirty;
+
+private slots:
+	void doOK();
+	void doCancel();
+	void settingChanged() { settingsDirty = true; };
+	void settingChanged(int) { settingsDirty = true; };
+};
+
+//*******************************************************************************************************
+// FaceTrackNoIR Tracker DLL. Functions used to get general info on the Tracker
+//*******************************************************************************************************
+class FTNoIR_TrackerDll : public Metadata
+{
+public:
+	FTNoIR_TrackerDll();
+	~FTNoIR_TrackerDll();
+
+	void getFullName(QString *strToBeFilled);
+	void getShortName(QString *strToBeFilled);
+	void getDescription(QString *strToBeFilled);
+	void getIcon(QIcon *icon);
+
+private:
+	QString trackerFullName;									// Trackers' name and description
+	QString trackerShortName;
+	QString trackerDescription;
+};
+