Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 30 insertions, 141 deletions

diff --git a/qfunctionconfigurator/qfunctionconfigurator.h b/qfunctionconfigurator/qfunctionconfigurator.h
index 963f6b13..1f6b4f78 100644
--- a/qfunctionconfigurator/qfunctionconfigurator.h
+++ b/qfunctionconfigurator/qfunctionconfigurator.h
@@ -1,44 +1,16 @@
-/********************************************************************************
-* 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.													*
-********************************************************************************/
+/* Copyright (c) 2011-2012 Stanislaw Halik <sthalik@misaki.pl>
+ *                         Adapted to FaceTrackNoIR by Wim Vriend.
+ * 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 <QWidget>
 #include <QtGui>
-#include <QtDesigner/QDesignerExportWidget>
 #include <QPointF>
+#include <QElapsedTimer>
 #include "qfunctionconfigurator/functionconfig.h"
 #include "ftnoir_tracker_base/ftnoir_tracker_base.h"
 
@@ -49,104 +21,27 @@
 // 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 FTNOIR_TRACKER_BASE_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(int pixPerEGU_Output READ pixPerEGU_Output WRITE setpixPerEGU_Output);
-    Q_PROPERTY(int gridDistEGU_Input READ gridDistEGU_Input WRITE setgridDistEGU_Input);
-    Q_PROPERTY(int gridDistEGU_Output READ gridDistEGU_Output WRITE setgridDistEGU_Output);
-
-	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;
-    }
-	int gridDistEGU_Input() const
-    {
-        return gDistEGU_Input;
-    }
-	int gridDistEGU_Output() const
-    {
-        return gDistEGU_Output;
-    }
-
-	// Return the current color to Designer
-	QColor colorBezier() const
+    Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier)
+    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);
 	FunctionConfig* config();
 
-	void setConfig(FunctionConfig* config, QString settingsFile);		// Connect the FunctionConfig to the Widget.
-	void loadSettings(QString settingsFile);							// Load the FunctionConfig (points) from the INI-file
-	void saveSettings(QString settingsFile);							// Save the FunctionConfig (points) to the INI-file
+    void setConfig(FunctionConfig* config);
+    void saveSettings(QString settingsFile);
 
 signals:
     void CurveChanged(bool);
 
 public slots:
-    void setmaxInputEGU(int);
-    void setmaxOutputEGU(int);
-    void setpixPerEGU_Input(int);
-    void setpixPerEGU_Output(int);
-    void setgridDistEGU_Input(int);
-    void setgridDistEGU_Output(int);
-
     void setColorBezier(QColor);
-    void setColorBackground(QColor);
-    void setInputEGU(QString);
-    void setOutputEGU(QString);
-    void setCaption(QString);
-
-	void resetCurve() {
-		qDebug() << "QFunctionConfigurator::resetCurve = " << strSettingsFile;
-		loadSettings( strSettingsFile );
-	}
-
 protected slots:
 	void paintEvent(QPaintEvent *e);
 	void mousePressEvent(QMouseEvent *e);
@@ -154,50 +49,44 @@ protected slots:
 	void mouseReleaseEvent(QMouseEvent *e);
       
 protected:
-	void drawBackground(const QRectF &rect);
-	void drawFunction(const QRectF &rect);
+    void drawBackground();
+	void drawFunction();
 	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;
+    bool point_within_pixel(QPointF pt, QPointF pixel) const;
 
 protected:
 	virtual void resizeEvent(QResizeEvent *);
 
 private:
+    void update_range() {
+        if (!_config)
+            return;
+        double w = width(), h = height();
+        const double mwl = 40, mhl = 20;
+        const double mwr = 15, mhr = 35;
+        range = QRectF(mwl, mhl, (w - mwl - mwr), (h - mhl - mhr));
+        c = QPointF(range.width() / _config->maxInput(), range.height() / _config->maxOutput());
+        _draw_function = _draw_background = true;
+    }
+
 	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, QString source = "") const;	// Convert the Point to a graphical Point
+    QPointF pixel_coord_to_point (QPointF point) const;						// Convert the graphical Point to a real-life Point
+    QPointF point_to_pixel (QPointF point) const;	// Convert the Point to a graphical Point
 
     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
-	int gDistEGU_Input;				// Distance of the grid, in EGU of Input
-	int gDistEGU_Output;			// Distance of the grid, in EGU of Output
+    QElapsedTimer timer;
+    QPointF c;
 
 	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
 
 	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
 };
 
 #endif // QFUNCTIONCONFIGURATOR_H