settings for mouse

4 files changed, 86 insertions, 246 deletions

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index 64e010a8..cc8aa11e 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -29,38 +29,12 @@
 #include "ftnoir_protocol_mouse.h"
 #include "facetracknoir/global-settings.h"
 
-/** constructor **/
-FTNoIR_Protocol::FTNoIR_Protocol()
-{
-	loadSettings();
-}
-
-/** destructor **/
-FTNoIR_Protocol::~FTNoIR_Protocol()
-{
-}
-
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void FTNoIR_Protocol::loadSettings() {
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	iniFile.beginGroup ( "Mouse" );
-	Mouse_X = (FTN_AngleName) (iniFile.value ( "Mouse_X", 0 ).toInt());
-	Mouse_Y = (FTN_AngleName) (iniFile.value ( "Mouse_Y", 0 ).toInt());
-	iniFile.endGroup ();
-}
-
-//
-// Update Headpose in Game.
-//
 void FTNoIR_Protocol::sendHeadposeToGame(const double *headpose ) {
-    float fMouse_X = 0;
-    float fMouse_Y = 0;
+    double fMouse_X = 0;
+    double fMouse_Y = 0;
+
+    int Mouse_X = s.Mouse_X;
+    int Mouse_Y = s.Mouse_Y;
 	
     if (Mouse_X > 0 && Mouse_X <= 6)
         fMouse_X = headpose[Mouse_X-1] / (Mouse_X < 3 ? 100 : 180);
@@ -77,24 +51,16 @@ void FTNoIR_Protocol::sendHeadposeToGame(const double *headpose ) {
     }
 }
 
-//
-// Returns 'true' if all seems OK.
-//
+void FTNoIR_Protocol::reload()
+{
+    s.b->reload();
+}
+
 bool FTNoIR_Protocol::checkServerInstallationOK()
 {   
-
-	return true;
+    return true;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol object.
-
-// Export both decorated and undecorated names.
-//   GetProtocol     - Undecorated name, which can be easily used with GetProcAddress
-//                Win32 API function.
-//   _GetProtocol@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
 {
     return new FTNoIR_Protocol;
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index 1ce72f69..01f283d3 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -41,37 +41,34 @@
 #include <windows.h>
 #include <winuser.h>
 #include "facetracknoir/global-settings.h"
+#include "facetracknoir/options.h"
+using namespace options;
+
+struct settings {
+    pbundle b;
+    value<int> Mouse_X, Mouse_Y;
+    settings() :
+        b(bundle("mouse-proto")),
+        Mouse_X(b, "mouse-x", 0),
+        Mouse_Y(b, "mouse-y", 0)
+    {}
+};
 
 #define MOUSE_AXIS_MIN 0
 #define MOUSE_AXIS_MAX 65535
 
-enum FTN_AngleName {
-    FTN_YAW = Yaw,
-    FTN_PITCH = Pitch,
-    FTN_ROLL = Roll,
-    FTN_X = TX,
-    FTN_Y = TY,
-    FTN_Z = TZ
-};
-
 class FTNoIR_Protocol : public IProtocol
 {
 public:
-	FTNoIR_Protocol();
-    virtual ~FTNoIR_Protocol();
+    FTNoIR_Protocol() {}
     bool checkServerInstallationOK();
     void sendHeadposeToGame( const double *headpose);
     QString getGameName() {
         return "Mouse tracker";
     }
+    void reload();
 private:
-	HANDLE h;
-	INPUT MouseStruct;
-
-	FTN_AngleName Mouse_X;			// Map one of the 6DOF's to this Mouse direction
-	FTN_AngleName Mouse_Y;
-	FTN_AngleName Mouse_Wheel;
-	void loadSettings();
+    struct settings s;
 };
 
 // Widget that has controls for FTNoIR protocol client-settings.
@@ -79,31 +76,20 @@ class MOUSEControls: public QWidget, public IProtocolDialog
 {
     Q_OBJECT
 public:
-
-	explicit MOUSEControls();
-    virtual ~MOUSEControls();
-	void showEvent ( QShowEvent * event );
-    void Initialize(QWidget *parent);
-	void registerProtocol(IProtocol *protocol) {
-		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol
-	}
-	void unRegisterProtocol() {
-		theProtocol = NULL;									// Reset the pointer
-	}
-
+    MOUSEControls();
+    void registerProtocol(IProtocol *protocol) {
+        _proto = (FTNoIR_Protocol *) protocol;
+    }
+    void unRegisterProtocol() {
+        _proto = NULL;
+    }
 private:
-	Ui::UICMOUSEControls ui;
-	void loadSettings();
-	void save();
-
-	/** helper **/
-	bool settingsDirty;
-	FTNoIR_Protocol *theProtocol;
-
+    Ui::UICMOUSEControls ui;
+    settings s;
+    FTNoIR_Protocol* _proto;
 private slots:
-	void doOK();
-	void doCancel();
-	void settingChanged( int setting ) { settingsDirty = true; }
+    void doOK();
+    void doCancel();
 };
 
 //*******************************************************************************************************
@@ -112,13 +98,9 @@ private slots:
 class FTNoIR_ProtocolDll : public Metadata
 {
 public:
-	FTNoIR_ProtocolDll();
-	~FTNoIR_ProtocolDll();
-
-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
-	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }
-
+    void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
+    void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
+    void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }
     void getIcon(QIcon *icon) { *icon = QIcon(":/images/mouse.png"); }
 };
 
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index c8d62a58..cc62b004 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -23,158 +23,68 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_protocol_mouse.h"
-#include <QDebug>
 #include "facetracknoir/global-settings.h"
 
-//*******************************************************************************************************
-// FaceTrackNoIR Client Settings-dialog.
-//*******************************************************************************************************
-
-//
-// Constructor for server-settings-dialog
-//
-MOUSEControls::MOUSEControls() :
-QWidget()
+MOUSEControls::MOUSEControls() : _proto(nullptr)
 {
-	ui.setupUi( this );
-	ui.cbxSelectMouse_X->addItem("None");
+    ui.setupUi( this );
+    ui.cbxSelectMouse_X->addItem("None");
     ui.cbxSelectMouse_X->addItem("X");
-	ui.cbxSelectMouse_X->addItem("Y");
-	ui.cbxSelectMouse_X->addItem("Z");
-	ui.cbxSelectMouse_X->addItem("Yaw");
+    ui.cbxSelectMouse_X->addItem("Y");
+    ui.cbxSelectMouse_X->addItem("Z");
+    ui.cbxSelectMouse_X->addItem("Yaw");
     ui.cbxSelectMouse_X->addItem("Pitch");
-	ui.cbxSelectMouse_X->addItem("Roll");
+    ui.cbxSelectMouse_X->addItem("Roll");
 
-	ui.cbxSelectMouse_Y->addItem("None");
-	ui.cbxSelectMouse_Y->addItem("X");
-	ui.cbxSelectMouse_Y->addItem("Y");
-	ui.cbxSelectMouse_Y->addItem("Z");
+    ui.cbxSelectMouse_Y->addItem("None");
+    ui.cbxSelectMouse_Y->addItem("X");
+    ui.cbxSelectMouse_Y->addItem("Y");
+    ui.cbxSelectMouse_Y->addItem("Z");
     ui.cbxSelectMouse_Y->addItem("Yaw");
-	ui.cbxSelectMouse_Y->addItem("Pitch");
-	ui.cbxSelectMouse_Y->addItem("Roll");
-	// Connect Qt signals to member-functions
-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
-	connect(ui.cbxSelectMouse_X, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));
-	connect(ui.cbxSelectMouse_Y, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));
-	theProtocol = NULL;
-	// Load the settings from the current .INI-file
-	loadSettings();
-}
-
-//
-// Destructor for server-dialog
-//
-MOUSEControls::~MOUSEControls() {
-	qDebug() << "~MOUSEControls() says: started";
-}
+    ui.cbxSelectMouse_Y->addItem("Pitch");
+    ui.cbxSelectMouse_Y->addItem("Roll");
 
-//
-// Initialize tracker-client-dialog
-//
-void MOUSEControls::Initialize(QWidget *parent) {
+    connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+    connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
 
-	QPoint offsetpos(100, 100);
-	if (parent) {
-		this->move(parent->pos() + offsetpos);
-	}
-	show();
+    tie_setting(s.Mouse_X, ui.cbxSelectMouse_X);
+    tie_setting(s.Mouse_Y, ui.cbxSelectMouse_Y);
 }
 
-//
-// OK clicked on server-dialog
-//
 void MOUSEControls::doOK() {
-	save();
-	this->close();
-}
-
-// override show event
-void MOUSEControls::showEvent ( QShowEvent * event ) {
-	loadSettings();
+    s.b->save();
+    if (_proto)
+        _proto->reload();
+    this->close();
 }
 
-//
-// Cancel clicked on server-dialog
-//
 void MOUSEControls::doCancel() {
-	//
-	// Ask if changed Settings should be saved
-	//
-	if (settingsDirty) {
-		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
-
-		qDebug() << "doCancel says: answer =" << ret;
-
-		switch (ret) {
-			case QMessageBox::Save:
-				save();
-				this->close();
-				break;
-			case QMessageBox::Discard:
-				this->close();
-				break;
-			case QMessageBox::Cancel:
-				// Cancel was clicked
-				break;
-			default:
-				// should never be reached
-			break;
-		}
-	}
-	else {
-		this->close();
-	}
-}
-
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void MOUSEControls::loadSettings() {
-	qDebug() << "loadSettings says: Starting ";
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	qDebug() << "loadSettings says: iniFile = " << currentFile;
-
-	iniFile.beginGroup ( "Mouse" );
-	ui.cbxSelectMouse_X->setCurrentIndex(iniFile.value ( "Mouse_X", 0 ).toInt() );
-	ui.cbxSelectMouse_Y->setCurrentIndex(iniFile.value ( "Mouse_Y", 0 ).toInt() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
+    if (s.b->modifiedp()) {
+        int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+
+        qDebug() << "doCancel says: answer =" << ret;
+
+        switch (ret) {
+        case QMessageBox::Save:
+            s.b->save();
+            this->close();
+            if (_proto)
+                _proto->reload();
+            break;
+        case QMessageBox::Discard:
+            s.b->revert();
+            this->close();
+            break;
+        case QMessageBox::Cancel:
+        default:
+            break;
+        }
+    }
+    else {
+        this->close();
+    }
 }
 
-//
-// Save the current Settings to the currently 'active' INI-file.
-//
-void MOUSEControls::save() {
-	qDebug() << "save() says: started";
-
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	iniFile.beginGroup ( "Mouse" );
-	iniFile.setValue ( "Mouse_X", ui.cbxSelectMouse_X->currentIndex() );
-	iniFile.setValue ( "Mouse_Y", ui.cbxSelectMouse_Y->currentIndex() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol-settings dialog object.
-
-// Export both decorated and undecorated names.
-//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress
-//                          Win32 API function.
-//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
 {
     return new MOUSEControls;
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
index d142934d..54f6b307 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
@@ -23,26 +23,8 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_protocol_mouse.h"
-#include <QDebug>
 #include "facetracknoir/global-settings.h"
 
-FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {
-}
-
-FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
-{
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol object.
-
-// Export both decorated and undecorated names.
-//   GetProtocolDll     - Undecorated name, which can be easily used with GetProcAddress
-//						Win32 API function.
-//   _GetProtocolDll@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocolDll=_GetProtocolDll@0")
-
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
 {
 	return new FTNoIR_ProtocolDll;