summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-10-15 08:52:25 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-10-15 08:52:25 +0200
commit864910a1fb753629d2852a91ffae4ebba374358c (patch)
tree7fbee6d32dd5312e592ab3a41219a7daa9cf56ae /ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
parenta73f49c89299ec69dda73e3e7a16cebe76da373e (diff)
fix trackers for qt5
Assorted changes: - make filenames unique, since automoc made a boo-boo - adjust include paths, "QtGui" -> "" - use std::shared_ptr in c++11 mode (thanks Patrick!) - make class names unique, automoc sucks, but saves typing - add a dummy class in one file since moronic automoc thinks every target contains Q_OBJECTS!!!
Diffstat (limited to 'ftnoir_tracker_aruco/ftnoir_tracker_aruco.h')
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 98aba2cf..ddbdd179 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -10,12 +10,13 @@
#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
#include "ui_aruco-trackercontrols.h"
-#include "video_widget.h"
+#include "ar_video_widget.h"
#include <QObject>
#include <QTimer>
#include <QThread>
#include <QMutex>
#include <QHBoxLayout>
+#include <QDialog>
#include <opencv2/opencv.hpp>
class Tracker : public QThread, public ITracker
@@ -31,7 +32,7 @@ public:
private:
QMutex mtx;
QTimer timer;
- VideoWidget* videoWidget;
+ ArucoVideoWidget* videoWidget;
QHBoxLayout* layout;
volatile bool fresh, stop;
float fov;