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, 22 insertions, 0 deletions

diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h
new file mode 100644
index 00000000..0949cdc4
--- /dev/null
+++ b/facetracknoir/curve-config.h
@@ -0,0 +1,22 @@
+#pragma once
+#include <QWidget>
+#include <QPalette>
+#include "ui_ftnoir_curves.h"
+
+class FaceTrackNoIR;
+
+class CurveConfigurationDialog: public QWidget
+{
+    Q_OBJECT
+public:
+    CurveConfigurationDialog( FaceTrackNoIR *ftnoir, QWidget *parent );
+    void loadSettings();
+private:
+    Ui::UICCurveConfigurationDialog ui;
+    void save();
+    FaceTrackNoIR *mainApp;
+
+private slots:
+    void doOK();
+    void doCancel();
+};