summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-15 20:00:57 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-15 20:00:57 +0200
commitfc906d93916d04c81ae712e52045ed56c2788adc (patch)
tree24d05ee0358f83034e28227b14929429224f2682 /ftnoir_tracker_aruco
parente5644bff6531717503c14b209041c1a7524e9998 (diff)
Simplify tracker API
No need to have a separate finalization function, can just as well sleep in the destructor.
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp2
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index e40c92d2..b781f390 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -137,6 +137,8 @@ Tracker::Tracker()
Tracker::~Tracker()
{
+ stop = true;
+ wait();
if (layout)
delete layout;
if (videoWidget)
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 7f21f020..98aba2cf 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -27,13 +27,6 @@ public:
void StartTracker(QFrame* frame);
bool GiveHeadPoseData(double *data);
bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ;
- bool NeedsTimeToFinish() {
- return true;
- }
- void WaitForExit() {
- stop = true;
- wait();
- }
void run();
private:
QMutex mtx;