1 files changed, 26 insertions, 33 deletions

diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index c722ad5c..09f96147 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -44,31 +44,29 @@
 
 #include "ui_facetracknoir.h"
 
-#include "facetracknoir/options.h"
-using namespace options;
-
-#include "facetracknoir/main-settings.hpp"
-
-#include "facetracknoir/plugin-support.h"
-#include "tracker.h"
-#include "facetracknoir/shortcuts.h"
+#include "./options.h"
+#include "./main-settings.hpp"
+#include "./plugin-support.h"
+#include "./tracker.h"
+#include "./shortcuts.h"
+#include "./curve-config.h"
 
-class Tracker;				// pre-define class to avoid circular includes
-class FaceTrackNoIR;
-
-class KeybindingWorker;
+using namespace options;
 
 class FaceTrackNoIR : public QMainWindow, IDynamicLibraryProvider
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
     FaceTrackNoIR(QWidget *parent = 0);
-	~FaceTrackNoIR();
+    ~FaceTrackNoIR();
 
     QFrame *get_video_widget();
     Tracker *tracker;
     void bindKeyboardShortcuts();
+
+    // XXX this shit stinks -sh 20141004
+    // TODO move to separate class representing running tracker state
     DynamicLibrary* current_tracker1() override {
         return dlopen_trackers.value(ui.iconcomboTrackerSource->currentIndex(), (DynamicLibrary*) NULL);
     }
@@ -78,15 +76,12 @@ public:
     DynamicLibrary* current_filter() override {
         return dlopen_filters.value(ui.iconcomboFilter->currentIndex(), (DynamicLibrary*) NULL);
     }
-    THeadPoseDOF& axis(int idx) {
-        return pose.axes[idx];
-    }
 
 #if defined(_WIN32)
     Key keyCenter;
     Key keyToggle;
     KeybindingWorker* keybindingWorker;
-#else 
+#else
     QxtGlobalShortcut keyCenter;
     QxtGlobalShortcut keyToggle;
 #endif
@@ -95,22 +90,20 @@ public:
 public slots:
     void shortcutRecentered();
     void shortcutToggled();
-
 private:
-    HeadPoseData pose;
+    Mappings pose;
     Ui::OpentrackUI ui;
-	QTimer timUpdateHeadPose;
+    QTimer timUpdateHeadPose;
 
     ITrackerDialog* pTrackerDialog;
     IProtocolDialog* pProtocolDialog;
     IFilterDialog* pFilterDialog;
 
-	QWidget *_keyboard_shortcuts;
-	QWidget *_curve_config;
+    QWidget *shortcuts_widget;
+    CurveConfigurationDialog* mapping_widget;
 
-	void createIconGroupBox();
-
-	void loadSettings();
+    void createIconGroupBox();
+    void loadSettings();
     void updateButtonState(bool running, bool inertialp);
 
     QList<DynamicLibrary*> dlopen_filters;
@@ -118,33 +111,33 @@ private:
     QList<DynamicLibrary*> dlopen_protocols;
     QShortcut kbd_quit;
     int looping;
-    
+
     QLayout* video_frame_layout;
     QPixmap no_feed_pixmap;
 #ifndef _WIN32
     void bind_keyboard_shortcut(QxtGlobalShortcut&, key_opts& k);
 #endif
     void fill_profile_cbx();
-    
+
 private slots:
     void open();
     void save();
     void saveAs();
     void exit();
     void profileSelected(int index);
-    
+
     void showTrackerSettings();
-    
+
     void showServerControls();
     void showFilterControls();
     void showKeyboardShortcuts();
     void showCurveConfiguration();
-    
+
     void showHeadPose();
-    
+
     void startTracker();
     void stopTracker();
-    
+
 public:
     void save_mappings();
     void load_mappings();