meta: get rid of Initialize(), now RAII

4 files changed, 1 insertions, 62 deletions

diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
index 3547dd6b..6fef2db0 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
@@ -403,7 +403,6 @@ void FTNoIR_Tracker::GetHeadPoseData(THeadPoseData *data)
 		CptError=0;
         return;
 	}
-#ifdef OPENTRACK_API
 	data[frame_cnt] = (long) HAT.Code;
 
     struct Fun {
@@ -446,39 +445,6 @@ void FTNoIR_Tracker::GetHeadPoseData(THeadPoseData *data)
         if (settings.InvertZ)  data[TZ] =  HAT.Trans[Fun::clamp3(settings.ZAxe)]*  -1.0f;
         else data[TZ] =  HAT.Trans[Fun::clamp3(settings.ZAxe)];
 	}
-#else
-	data->frame_number =  (long) HAT.Code;
-
-	if (bEnableYaw) {
-		if (bInvertYaw )	data->yaw = (double) HAT.Rot[iYawAxe] *  -1.0f;
-		else 	data->yaw = (double) HAT.Rot[iYawAxe];
-	}	
-
-	if (bEnablePitch) {
-		if (bInvertPitch)data->pitch = (double) HAT.Rot[iPitchAxe] *  -1.0f;
-		else data->pitch = (double) HAT.Rot[iPitchAxe];
-	}
-
-	if (bEnableRoll) {
-		if (bInvertRoll) data->roll = (double) HAT.Rot[iRollAxe] *  -1.0f; 
-		else data->roll = (double) HAT.Rot[iRollAxe];
-	}
-
-	if (bEnableX) {
-		if (bInvertX) data->x = (double) HAT.Trans[iXAxe]*  -1.0f;
-		else data->x = (double) HAT.Trans[iXAxe];
-	}
-
-	if (bEnableY) {
-		if (bInvertY) data->y = (double) HAT.Trans[iYAxe]*  -1.0f;
-		else data->y = (double) HAT.Trans[iYAxe];
-	}
-
-	if (bEnableZ) {
-		if (bInvertZ)  data->z = (double) HAT.Trans[iZAxe]*  -1.0f;
-		else data->z = (double) HAT.Trans[iZAxe];
-	}
-#endif
 }
 
 void FTNoIR_Tracker::applysettings(const TrackerSettings& settings){
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
index a4243c38..57ead58d 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
@@ -27,15 +27,8 @@ public:
 	FTNoIR_Tracker();
 	~FTNoIR_Tracker();
 
-#ifdef OPENTRACK_API
     virtual void StartTracker(QFrame*);
     virtual void GetHeadPoseData(double* data);
-#else
-    void Initialize( QFrame *videoframe );
-	virtual void StartTracker(HWND parent_window);
-    virtual void StopTracker(bool exit);
-    virtual bool GetHeadPoseData(THeadPoseData *data);
-#endif
 	void applysettings(const TrackerSettings& settings);
 	void notifyCenter();
 	bool notifyZeroed();
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
index 0ef723c9..2ef75b89 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
@@ -147,24 +147,6 @@ TrackerControls::TrackerControls() : theTracker(NULL), timer(this)
 }
 
 //
-// Destructor for server-dialog
-//
-TrackerControls::~TrackerControls() {
-}
-
-//
-// Initialize tracker-client-dialog
-//
-void TrackerControls::Initialize(QWidget *parent) {
-	QPoint offsetpos(100, 100);
-	if (parent) {
-		this->move(parent->pos() + offsetpos);
-	}
-	show();
-}
-
-
-//
 // Center asked to ARDUINO
 //
 void TrackerControls::doCenter() {
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
index 82c69e0d..fe16e5e8 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
@@ -21,8 +21,6 @@ class TrackerControls: public QWidget, public ITrackerDialog
     Q_OBJECT
 public:
 	explicit TrackerControls();
-    virtual ~TrackerControls();
-    void Initialize(QWidget *parent) virt_override;
     void registerTracker(ITracker *tracker) virt_override;
     void unRegisterTracker() virt_override;
 private:
@@ -30,7 +28,7 @@ private:
 	FTNoIR_Tracker *theTracker;
 	QTime last_time;
 	
-public  slots:
+public slots:
     void WriteMsgInfo(const QByteArray &MsgInfo);
 
 protected slots: