FunctionConfig files don't need to be here.

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

6 files changed, 112 insertions, 200 deletions

diff --git a/bin/FunctionConfig.h b/bin/FunctionConfig.h
deleted file mode 100644
index 9777d887..00000000
--- a/bin/FunctionConfig.h
+++ /dev/null
diff --git a/bin/Settings/ArmA.ini b/bin/Settings/ArmA.ini
index 7777dbfc..2fdcf98c 100644
--- a/bin/Settings/ArmA.ini
+++ b/bin/Settings/ArmA.ini
@@ -25,7 +25,8 @@ powCurve=5
 maxSmooth=70

 

 [GameProtocol]

-Selection=0

+Selection=2

+DLL=FTNoIR_Protocol_FT.dll

 

 [Curves]

 Roll_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\b\0\0\0\0\0\0)

@@ -79,7 +80,7 @@ Inhibit_X=false
 Inhibit_Y=false

 Inhibit_Z=false

 SetZero=false

-SetEngineStop=false

+SetEngineStop=true

 Keycode_GameZero=0

 Shift_GameZero=false

 Ctrl_GameZero=false

@@ -88,9 +89,14 @@ Enable_ReverseAxis=false
 RA_Yaw=40

 RA_ZPos=0

 RA_ToZPos=100

+MouseKey_Center=0

+MouseKey_GameZero=0

+MouseKey_StartStop=0

+MouseKey_Inhibit=0

 

 [TrackerSource]

 Selection=2

+DLL=FTNoIR_Tracker_SM.dll

 

 [Curves-Yaw]

 point-count=1

@@ -145,3 +151,9 @@ useDummyExe=true
 RedetectMs=500

 CameraId=0

 VideoWidget=1

+

+[SMTracker]

+FilterLevel=1

+

+[Filter]

+DLL=FTNoIR_Filter_EWMA2.dll

diff --git a/bin/Settings/FlightGear.ini b/bin/Settings/FlightGear.ini
index 8a5479f6..4a73e286 100644
--- a/bin/Settings/FlightGear.ini
+++ b/bin/Settings/FlightGear.ini
@@ -18,10 +18,12 @@ powCurve=10
 maxSmooth=70

 

 [GameProtocol]

-Selection=1

+Selection=0

+DLL=FTNoIR_Protocol_FG.dll

 

 [TrackerSource]

-Selection=0

+Selection=1

+DLL=FTNoIR_Tracker_SM.dll

 

 [Curves]

 Yaw_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\x14\0\0\0\0\0\0)

@@ -78,3 +80,6 @@ IP-2=0
 IP-3=0

 IP-4=1

 PortNumber=5550

+

+[Filter]

+DLL=FTNoIR_Filter_Accela.dll

diff --git a/bin/Settings/SimConnect.ini b/bin/Settings/SimConnect.ini
index 1c323bb6..ae948471 100644
--- a/bin/Settings/SimConnect.ini
+++ b/bin/Settings/SimConnect.ini
@@ -1,5 +1,5 @@
 [Tracking]

-Smooth=10

+Smooth=5

 invertYaw=false

 invertPitch=false

 invertRoll=false

@@ -19,9 +19,11 @@ maxSmooth=70
 

 [GameProtocol]

 Selection=5

+DLL=FTNoIR_Protocol_SC.dll

 

 [TrackerSource]

 Selection=0

+DLL=FTNoIR_Tracker_SM.dll

 

 [Curves]

 Yaw_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x10\0\0\0\0\0\0)

@@ -86,3 +88,49 @@ IP-2=0
 IP-3=0

 IP-4=1

 PortNumber=5550

+

+[Curves-Accela-Scaling-Rotation]

+point-count=1

+point-0-x=4

+point-0-y=8

+point-1-x=3.03917525773196

+point-1-y=5.40377358490566

+

+[Curves-Accela-Scaling-Translation]

+point-count=2

+point-0-x=2

+point-0-y=4

+point-1-x=4

+point-1-y=8

+

+[Filter]

+DLL=FTNoIR_Filter_Accela.dll

+Selection=FTNoIR_Filter_Accela.dll

+

+[Curves-Yaw]

+point-count=2

+point-0-x=19.25

+point-0-y=122

+point-1-x=50

+point-1-y=180

+

+[Curves-PitchUp]

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

+

+[Curves-PitchDown]

+point-count=2

+point-0-x=49.75

+point-0-y=79

+point-1-x=50

+point-1-y=180

+

+[Curves-Roll]

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

diff --git a/bin/Settings/Wings of Prey.ini b/bin/Settings/Wings of Prey.ini
index f6882c18..563b3c80 100644
--- a/bin/Settings/Wings of Prey.ini
+++ b/bin/Settings/Wings of Prey.ini
@@ -1,5 +1,5 @@
 [Tracking]

-Smooth=10

+Smooth=5

 NeutralZone=5

 sensYaw=200

 sensPitch=200

@@ -25,7 +25,8 @@ powCurve=5
 maxSmooth=70

 

 [GameProtocol]

-Selection=4

+Selection=3

+DLL=FTNoIR_Protocol_FTIR.dll

 

 [KB_Shortcuts]

 Keycode_Center=199

@@ -46,12 +47,16 @@ Inhibit_Roll=false
 Inhibit_X=false

 Inhibit_Y=false

 Inhibit_Z=false

-SetZero=true

+SetZero=false

 SetEngineStop=false

 Keycode_GameZero=210

 Shift_GameZero=false

 Ctrl_GameZero=false

 Alt_GameZero=false

+Enable_ReverseAxis=false

+RA_Yaw=40

+RA_ZPos=-20

+RA_ToZPos=50

 

 [Curves]

 Yaw_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x14\0\0\0\0\0\0)

@@ -83,4 +88,37 @@ Z_point4=@Variant(\0\0\0\x1a@V\0\0\0\0\0\0@I\0\0\0\0\0\0)
 useTIRViews=true

 

 [TrackerSource]

-Selection=0

+Selection=1

+DLL=FTNoIR_Tracker_SM.dll

+

+[Curves-Yaw]

+point-count=2

+point-0-x=20

+point-0-y=80

+point-1-x=40

+point-1-y=160

+

+[Curves-PitchUp]

+point-count=2

+point-0-x=20

+point-0-y=80

+point-1-x=40

+point-1-y=160

+

+[Curves-PitchDown]

+point-count=2

+point-0-x=20

+point-0-y=80

+point-1-x=40

+point-1-y=160

+

+[Curves-Roll]

+point-count=2

+point-0-x=20

+point-0-y=80

+point-1-x=40

+point-1-y=160

+

+[Filter]

+DLL=FTNoIR_Filter_Accela.dll

+Selection=FTNoIR_Filter_Accela.dll

diff --git a/bin/qfunctionconfigurator.h b/bin/qfunctionconfigurator.h
deleted file mode 100644
index e1f70c5a..00000000
--- a/bin/qfunctionconfigurator.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/********************************************************************************

-* 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	http://facetracknoir.sourceforge.net/home/default.htm				*

-*																				*

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

-*																				*

-* The FunctionConfigurator was made by Stanislaw Halik, and adapted to          *

-* FaceTrackNoIR.																*

-*																				*

-* All credits for this nice piece of code should go to Stanislaw.				*

-*																				*

-* Copyright (c) 2011-2012, Stanislaw Halik <sthalik@misaki.pl>					*

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

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

-#ifndef QFUNCTIONCONFIGURATOR_H

-#define QFUNCTIONCONFIGURATOR_H

-

-#include <QtGui>

-#include <QtDesigner/QDesignerExportWidget>

-#include <QPointF>

-#include "FunctionConfig.h"

-

-//

-// The FunctionConfigurator Widget is used to display and configure a function (curve).

-// The Function is used by FaceTrackNoIR to 'translate' the actual head-pose to the virtual headpose. Every axis is configured by a separate Function.

-//

-// The Function is coded in a separate Class and can exists, without the Widget. When the widget is displayed (therefore 'created'), the Function can be attached to the

-// Widget and the Widget used to change the Function.

-//

-class QDESIGNER_WIDGET_EXPORT QFunctionConfigurator : public QWidget

-{

-	Q_OBJECT

-    Q_PROPERTY(int maxInputEGU READ maxInputEGU WRITE setmaxInputEGU);

-    Q_PROPERTY(int maxOutputEGU READ maxOutputEGU WRITE setmaxOutputEGU);

-    Q_PROPERTY(int pixPerEGU_Input READ pixPerEGU_Input WRITE setpixPerEGU_Input);

-

-	Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier);

-    Q_PROPERTY(QColor colorBackground READ colorBackground WRITE setColorBackground);

-    Q_PROPERTY(QString stringInputEGU READ stringInputEGU WRITE setInputEGU);

-    Q_PROPERTY(QString stringOutputEGU READ stringOutputEGU WRITE setOutputEGU);

-    Q_PROPERTY(QString stringCaption READ stringCaption WRITE setCaption);

-

-	// Return the current value to Designer

-	int maxInputEGU() const

-    {

-        return MaxInput;

-    }

-	int maxOutputEGU() const

-    {

-        return MaxOutput;

-    }

-	int pixPerEGU_Input() const

-    {

-        return pPerEGU_Input;

-    }

-	int pixPerEGU_Output() const

-    {

-        return pPerEGU_Output;

-    }

-

-	// Return the current color to Designer

-	QColor colorBezier() const

-    {

-        return colBezier;

-    }

-	// Return the current color to Designer

-	QColor colorBackground() const

-    {

-        return colBackground;

-    }

-	// Return the current string to Designer

-	QString stringInputEGU() const

-    {

-        return strInputEGU;

-    }

-	// Return the current string to Designer

-	QString stringOutputEGU() const

-    {

-        return strOutputEGU;

-    }

-	// Return the current string to Designer

-	QString stringCaption() const

-    {

-        return strCaption;

-    }

-

-public:

-	QFunctionConfigurator(QWidget *parent = 0);

-	~QFunctionConfigurator();

-	FunctionConfig* config();

-

-	void setConfig(FunctionConfig* config);			// Connect the FunctionConfig to the Widget.

-	void loadSettings(QSettings& settings);			// Load the FunctionConfig (points) from the INI-file

-	void saveSettings(QSettings& settings);			// Save the FunctionConfig (points) to the INI-file

-

-signals:

-    void CurveChanged(bool);

-

-public slots:

-    void setmaxInputEGU(int);

-    void setmaxOutputEGU(int);

-    void setpixPerEGU_Input(int);

-    void setpixPerEGU_Output(int);

-

-    void setColorBezier(QColor);

-    void setColorBackground(QColor);

-    void setInputEGU(QString);

-    void setOutputEGU(QString);

-    void setCaption(QString);

-

-	void resetCurve() {

-		QSettings iniFile( strSettingsFile, QSettings::IniFormat );		// Application settings (in INI-file)

-		loadSettings( iniFile );

-	}

-

-protected slots:

-	void paintEvent(QPaintEvent *e);

-	void mousePressEvent(QMouseEvent *e);

-	void mouseMoveEvent(QMouseEvent *e);

-	void mouseReleaseEvent(QMouseEvent *e);

-      

-protected:

-	void drawBackground(const QRectF &rect);

-	void drawFunction(const QRectF &rect);

-	void drawPoint(QPainter *painter, const QPointF &pt, QColor colBG );

-	void drawLine(QPainter *painter, const QPointF &start, const QPointF &end, QPen pen);

-	bool markContains(const QPointF &pt, const QPointF &coord) const;

-//	bool withinRange( const QPointF &coord ) const;

-	bool withinRect( const QPointF &coord, const QRectF &rect ) const;

-

-protected:

-	virtual void resizeEvent(QResizeEvent *);

-

-private:

-	QRectF  range;										// The actual rectangle for the Bezier-curve

-	QPointF lastPoint;									// The right-most point of the Function

-	QPointF normalizePoint (QPointF point) const;		// Convert the graphical Point to a real-life Point

-	QPointF graphicalizePoint (QPointF point) const;	// Convert the Point to a graphical Point

-

-	QPointF *moving;

-	int     movingPoint;

-

-	int MaxInput;					// Maximum input limit

-	int MaxOutput;					// Maximum output limit

-	int pPerEGU_Input;				// Number of pixels, per EGU of Input

-	int pPerEGU_Output;				// Number of pixels, per EGU of Output

-

-	QColor colBezier;				// Color of Bezier curve

-	QColor colBackground;			// Color of widget background

-	QString strInputEGU;			// Engineering Units input (vertical axis)

-	QString strOutputEGU;			// Engineering Units output (horizontal axis)

-	QString strCaption;				// Caption of the graph

-	QString strSettingsFile;		// Name of last read INI-file

-	QPushButton *btnReset;			// Reset Curve

-

-	bool _draw_background;			// Flag to determine if the background should be (re-)drawn on the QPixmap

-	QPixmap _background;			// Image of the static parts (axis, lines, etc.)

-	bool _draw_function;			// Flag to determine if the function should be (re-)drawn on the QPixmap

-	QPixmap _function;				// Image of the function (static unless edited by the user)

-

-	//

-	// Properties of the CurveConfigurator Widget

-	//

-	QString _title;								// Title do display in Widget and to load Settings

-	FunctionConfig* _config;

-	QList<QPointF> _points;			// Function-points

-	QList<QPointF> _draw_points;	// Curve-points needed for drawing

-	HANDLE _mutex;

-};

-

-#endif // QFUNCTIONCONFIGURATOR_H