summaryrefslogtreecommitdiffhomepage
path: root/tracker-aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-12-03 22:23:08 +0100
committerStanislaw Halik <sthalik@misaki.pl>2017-12-04 12:19:26 +0100
commitb256886a5cb9f2ae3ebda70a2045b19ed9f4233e (patch)
tree4fa1e46de224cf834a05824dc1eb86001bdb3300 /tracker-aruco
parente89709a801e7874bc02c66848c638c6a0ccc85c1 (diff)
api: add status check for modules
Diffstat (limited to 'tracker-aruco')
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.cpp4
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index 37e34246..a1bde523 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -73,7 +73,7 @@ aruco_tracker::~aruco_tracker()
camera.release();
}
-void aruco_tracker::start_tracker(QFrame* videoframe)
+module_status aruco_tracker::start_tracker(QFrame* videoframe)
{
videoframe->show();
videoWidget = std::make_unique<cv_video_widget>(videoframe);
@@ -83,6 +83,8 @@ void aruco_tracker::start_tracker(QFrame* videoframe)
videoframe->setLayout(layout.get());
videoWidget->show();
start();
+
+ return status_ok();
}
void aruco_tracker::getRT(cv::Matx33d& r_, cv::Vec3d& t_)
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h
index fd42d722..72f52eb8 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.h
+++ b/tracker-aruco/ftnoir_tracker_aruco.h
@@ -65,7 +65,7 @@ struct settings : opts {
class aruco_dialog;
-class aruco_tracker : protected QThread, public ITracker
+class aruco_tracker : protected virtual QThread, public ITracker
{
Q_OBJECT
friend class aruco_dialog;
@@ -73,7 +73,7 @@ class aruco_tracker : protected QThread, public ITracker
public:
aruco_tracker();
~aruco_tracker() override;
- void start_tracker(QFrame* frame) override;
+ module_status start_tracker(QFrame* frame) override;
void data(double *data) override;
void run() override;
void getRT(cv::Matx33d &r, cv::Vec3d &t);