New effort to embrace faceAPI 3.2.6

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

1 files changed, 7 insertions, 4 deletions

diff --git a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.h b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.h
index 12bfbe80..9af25800 100644
--- a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.h
+++ b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.h
@@ -1,5 +1,6 @@
 #include "..\ftnoir_tracker_base\ftnoir_tracker_base.h"

 #include "ui_FTNoIR_SMClientcontrols.h"

+#include "mainwindow.h"

 

 #include "sm_api_qt.h"

 #include <QMessageBox>

@@ -11,6 +12,7 @@ using namespace std;
 //using namespace sm::faceapi::samplecode;

 using namespace sm::faceapi;

 using namespace sm::faceapi::qt;

+using namespace sm::faceapi::samplecode;

 

 class FTNoIR_Tracker_SM : public ITracker

 {

@@ -19,8 +21,8 @@ public:
 	~FTNoIR_Tracker_SM();

 

 	void Release();

-    void Initialize();

-    void StartTracker();

+    void Initialize( QFrame *videoframe );

+    void StartTracker( HWND parent_window );

     void StopTracker();

 	bool GiveHeadPoseData(THeadPoseData *data);				// Returns true if confidence is good

 	void loadSettings();

@@ -31,8 +33,9 @@ private:
 	/** face api variables **/

 	APIScope *faceapi_scope;

     QSharedPointer<EngineBase> _engine;

-	smEngineHandle _engine_handle;

-

+	VideoDisplayWidget *_display;

+	QVBoxLayout *l;

+	MainWindow *main_window;

 	//parameter list for the filter-function(s)

 	enum

 	{