Updated vc9 project files.

PT: Undo of Wim's last wrong commit, some code cleanup, added preliminary resolution change support.


git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@184 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 7 insertions, 16 deletions

diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
index 6b6af060..5461d133 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
@@ -27,9 +27,6 @@ public:
 	Tracker();

 	~Tracker();

 

-	void CenterTracker();

-	

-

 	// ITracker interface

 	void Initialize(QFrame *videoframe);

 	void StartTracker(HWND parent_window);

@@ -38,9 +35,14 @@ public:
 	void refreshVideo();

 

 	void apply(const TrackerSettings& settings);

-	void apply_without_camindex(const TrackerSettings& settings); // changing the camindex is expensive and not suitable for realtime editing

+	void center();

+	void reset();	// reset the trackers internal state variables

 	void run();

 

+	void get_pose(FrameTrafo* X_CM) { QMutexLocker lock(&mutex); *X_CM = point_tracker.get_pose(); }

+	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:	

 	FrameTrafo X_CH_0; // for centering

 

@@ -58,7 +60,7 @@ protected:
 	Camera camera;

 	PointExtractor point_extractor;

 	PointTracker point_tracker;

-	FrameTrafo X_MH;

+	cv::Vec3f t_MH;

 	bool draw_frame;

 	int sleep_time;

 	

@@ -68,15 +70,4 @@ protected:
 	QTime time;

 };

 

-//-----------------------------------------------------------------------------

-class TrackerDll : public ITrackerDll

-{

-	// ITrackerDll interface

-	void Initialize() {}

-	void getFullName(QString *strToBeFilled);

-	void getShortName(QString *strToBeFilled);

-	void getDescription(QString *strToBeFilled);

-	void getIcon(QIcon *icon);

-};

-

 #endif // FTNOIR_TRACKER_PT_H