From acdb0aaf27e2ca623a9e32ea7efcc484aecde498 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Mon, 26 Nov 2012 21:00:55 +0000 Subject: Reversed the numTracker tryout to accomodate the secondary Tracker: the user-interface was confusing. Now, the 1st Tracker overwrites the values, if the same axis were selected in both trackers. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@196 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Tracker_FD/FTNoIR_Tracker_FD.h | 4 ++-- FTNoIR_Tracker_FD/ftnoir_tracker_facedetect.cpp | 2 +- FTNoIR_Tracker_FD/ftnoir_tracker_facedetect_dialog.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'FTNoIR_Tracker_FD') diff --git a/FTNoIR_Tracker_FD/FTNoIR_Tracker_FD.h b/FTNoIR_Tracker_FD/FTNoIR_Tracker_FD.h index eccc7ad7..5b476758 100644 --- a/FTNoIR_Tracker_FD/FTNoIR_Tracker_FD.h +++ b/FTNoIR_Tracker_FD/FTNoIR_Tracker_FD.h @@ -37,7 +37,7 @@ public: FTNoIR_Tracker(); ~FTNoIR_Tracker(); - void Initialize( QFrame *videoframe, int numTracker ); + void Initialize( QFrame *videoframe ); void StartTracker( HWND parent_window ); void StopTracker( bool exit ); bool GiveHeadPoseData(THeadPoseData *data); // Returns true if confidence is good @@ -66,7 +66,7 @@ public: explicit TrackerControls(); virtual ~TrackerControls(); void Release(); // Member functions which are accessible from outside the DLL - void Initialize(QWidget *parent, int numTracker); + void Initialize(QWidget *parent); void registerTracker(ITracker *tracker) {}; void unRegisterTracker() {}; void NotifyZeroing(); diff --git a/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect.cpp b/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect.cpp index f5d7931d..620fb9fd 100644 --- a/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect.cpp +++ b/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect.cpp @@ -94,7 +94,7 @@ FTNoIR_Tracker::~FTNoIR_Tracker() //CloseHandle(hMutex); } -void FTNoIR_Tracker::Initialize( QFrame *videoframe, int numTracker ) +void FTNoIR_Tracker::Initialize( QFrame *videoframe ) { qDebug("FTNoIR_Tracker::Initialize()"); WaitForSingleObject(hMutex, INFINITE); diff --git a/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect_dialog.cpp b/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect_dialog.cpp index aaa95637..71b19242 100644 --- a/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect_dialog.cpp +++ b/FTNoIR_Tracker_FD/ftnoir_tracker_facedetect_dialog.cpp @@ -117,7 +117,7 @@ void TrackerControls::Release() // // Initialize tracker-client-dialog // -void TrackerControls::Initialize(QWidget *parent, int numTracker) { +void TrackerControls::Initialize(QWidget *parent) { QPoint offsetpos(200, 200); if (parent) { -- cgit v1.2.3