summaryrefslogtreecommitdiffhomepage
path: root/tracker-easy/tracker-easy.h
diff options
context:
space:
mode:
authorStéphane Lenclud <github@lenclud.com>2019-04-16 18:01:57 +0200
committerStéphane Lenclud <github@lenclud.com>2019-04-24 18:46:12 +0200
commitbe51a114bca4f3f43ed88001cdc510ccf246079f (patch)
treeac0b3b4f2a3b7091cb4657a422469e13716e380c /tracker-easy/tracker-easy.h
parent1fb6122dce1a5bc117e925006d87828a52cfecb6 (diff)
Easy Tracker: Mostly code clean-up.
Diffstat (limited to 'tracker-easy/tracker-easy.h')
-rw-r--r--tracker-easy/tracker-easy.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/tracker-easy/tracker-easy.h b/tracker-easy/tracker-easy.h
index 257dd6ca..06551533 100644
--- a/tracker-easy/tracker-easy.h
+++ b/tracker-easy/tracker-easy.h
@@ -39,11 +39,16 @@ namespace EasyTracker
struct Tracker : QThread, ITracker
{
- public:
+ // We had problem where Qt slots would not get disconnected upon object destruction.
+ // Issue seems to be gone now even without Q_OBJECT declaration, go figure.
+ //Q_OBJECT
+ public:
friend class Dialog;
explicit Tracker();
~Tracker() override;
+
+ // From ITracker
module_status start_tracker(QFrame* parent_window) override;
void data(double* data) override;
bool center() override;
@@ -52,6 +57,7 @@ namespace EasyTracker
void CreateModelFromSettings();
void CreateCameraIntrinsicsMatrices();
+ // From QThread
void run() override;
bool maybe_reopen_camera();
@@ -60,7 +66,7 @@ namespace EasyTracker
QMutex camera_mtx;
- Settings s;
+ Settings iSettings;
std::unique_ptr<QLayout> layout;
std::vector<cv::Point> iPoints;