fixup! PT tracker feature removal

Some PT features got under the knife:

- dynamic pose resolution velocity prediction model
- tracker dialog's tracker tab
- focal length coefficient

5 files changed, 5 insertions, 13 deletions

diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h
index 733cc61f..9836435c 100644
--- a/ftnoir_tracker_pt/camera.h
+++ b/ftnoir_tracker_pt/camera.h
@@ -65,7 +65,6 @@ protected:
 
         // update the camera using cam_desired, write res and f to cam_info if successful
         virtual void _set_device_index() = 0;
-        virtual void _set_f() = 0;
         virtual void _set_fps() = 0;
         virtual void _set_res() = 0;
 
@@ -94,7 +93,6 @@ public:
 protected:
 	virtual bool _get_frame(cv::Mat* frame);
 	virtual void _set_index();
-	virtual void _set_f();
 	virtual void _set_fps();
 	virtual void _set_res();
     virtual void _set_device_index();
@@ -116,7 +114,6 @@ public:
 protected:
 	virtual bool _get_frame(cv::Mat* frame);
 	virtual void _set_device_index();
-	virtual void _set_f();
 	virtual void _set_fps();
 	virtual void _set_res();
 
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index 49cefed2..82408ec6 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -35,7 +35,6 @@ Tracker::~Tracker()
 {
 	set_command(ABORT);
 	wait();
-    s.video_widget = false;
     delete video_widget;
     video_widget = NULL;
     if (video_frame->layout()) delete video_frame->layout();
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
index 238dcd8f..6ddfbe5d 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
@@ -53,7 +53,7 @@ public:
 	int  get_n_points() { QMutexLocker lock(&mutex); return point_extractor.get_points().size(); }
 	void get_cam_info(CamInfo* info) { QMutexLocker lock(&mutex); *info = camera.get_info(); }
 
-protected:
+private:
 	// --- MutexedFrameProvider interface ---
 	virtual bool get_frame_and_points(cv::Mat& frame, std::shared_ptr< std::vector<cv::Vec2f> >& points);
 
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
index 7faad9ed..365776e4 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
@@ -31,7 +31,6 @@ struct settings
 
     value<int> m01_x, m01_y, m01_z;
     value<int> m02_x, m02_y, m02_z;
-    value<bool> video_widget;
 
     value<int> t_MH_x, t_MH_y, t_MH_z;
 
@@ -59,7 +58,6 @@ struct settings
         m02_x(b, "m_02-x", 0),
         m02_y(b, "m_02-y", 0),
         m02_z(b, "m_02-z", 0),
-        video_widget(b, "video-widget", true),
         t_MH_x(b, "model-centroid-x", 0),
         t_MH_y(b, "model-centroid-y", 0),
         t_MH_z(b, "model-centroid-z", 0),
diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h
index 44bad28e..a1f6f041 100644
--- a/ftnoir_tracker_pt/point_tracker.h
+++ b/ftnoir_tracker_pt/point_tracker.h
@@ -96,19 +96,17 @@ public:
 	FrameTrafo get_pose() const { return X_CM; }
 	void reset();
 
-protected:
+private:
 	inline cv::Vec2f project(const cv::Vec3f& v_M, float f)
 	{
 		cv::Vec3f v_C = X_CM * v_M;
 		return cv::Vec2f(f*v_C[0]/v_C[2], f*v_C[1]/v_C[2]);
 	}
 
-	void find_correspondences(const std::vector<cv::Vec2f>& points, float f);
-
+    void find_correspondences(const std::vector<cv::Vec2f>& points, float f);
+    int POSIT(float f);  // The POSIT algorithm, returns the number of iterations
+    
 	cv::Vec2f p[PointModel::N_POINTS];	// the points in model order
-
-	int POSIT(float f);  // The POSIT algorithm, returns the number of iterations
-
 	FrameTrafo X_CM; // trafo from model to camera
 };