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

3 files changed, 4 insertions, 4 deletions

diff --git a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h
index 9e064474..b1638e7b 100644
--- a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h
+++ b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h
@@ -13,7 +13,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);

@@ -50,7 +50,7 @@ public:
     virtual ~TrackerControls();

 	void showEvent ( QShowEvent * event );

 

-    void Initialize(QWidget *parent, int numTracker);

+    void Initialize(QWidget *parent);

 	void registerTracker(ITracker *tracker) {};

 	void unRegisterTracker() {};

 

diff --git a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp
index 31952b54..ecf0e5dd 100644
--- a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp
+++ b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp
@@ -118,7 +118,7 @@ quint16 senderPort;
 	}

 }

 

-void FTNoIR_Tracker::Initialize( QFrame *videoframe, int numTracker )

+void FTNoIR_Tracker::Initialize( QFrame *videoframe )

 {

 	qDebug() << "FTNoIR_Tracker::Initialize says: Starting ";

 	loadSettings();

diff --git a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp_dialog.cpp b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp_dialog.cpp
index f65fb7c3..c5bee64f 100644
--- a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp_dialog.cpp
+++ b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp_dialog.cpp
@@ -59,7 +59,7 @@ TrackerControls::~TrackerControls() {
 //

 // Initialize tracker-client-dialog

 //

-void TrackerControls::Initialize(QWidget *parent, int numTracker) {

+void TrackerControls::Initialize(QWidget *parent) {

 

 	QPoint offsetpos(100, 100);

 	if (parent) {