diff options
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | 13 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.h | 6 |
2 files changed, 2 insertions, 17 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index a221c2ff..099c1f85 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -127,7 +127,6 @@ void Tracker::load_settings() Tracker::Tracker() { - fresh = false; stop = false; videoWidget = NULL; layout = NULL; @@ -158,20 +157,11 @@ void Tracker::StartTracker(QFrame* videoframe) videoWidget->show(); this->layout = layout; load_settings(); - connect(&timer, SIGNAL(timeout()), this, SLOT(paint_widget())); - timer.start(50); start(); for (int i = 0; i < 6; i++) pose[i] = 0; } -void Tracker::paint_widget() { - if (fresh) { - fresh = false; - videoWidget->update(); - } -} - #define HT_PI 3.1415926535 void Tracker::run() @@ -232,10 +222,9 @@ void Tracker::run() frame = color; - if (frame.rows > 0 && !fresh) + if (frame.rows > 0) { videoWidget->update_image(frame.data, frame.cols, frame.rows); - fresh = true; } if (markers.size() == 1 && markers[0].size() == 4) { diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h index 815ca91c..8d532b4c 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h @@ -12,7 +12,6 @@ #include "ui_aruco-trackercontrols.h" #include "ar_video_widget.h" #include <QObject> -#include <QTimer> #include <QThread> #include <QMutex> #include <QHBoxLayout> @@ -31,10 +30,9 @@ public: void run(); private: QMutex mtx; - QTimer timer; ArucoVideoWidget* videoWidget; QHBoxLayout* layout; - volatile bool fresh, stop; + volatile bool stop; float fov; int camera_index; float dc[5]; @@ -42,8 +40,6 @@ private: void load_settings(); double pose[6]; cv::Mat frame; -private slots: - void paint_widget(); }; // Widget that has controls for FTNoIR protocol client-settings. |