Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 7 insertions, 15 deletions

diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h
index e2cf4d9f..820ba7d0 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.h
+++ b/ftnoir_tracker_aruco/ar_video_widget.h
@@ -22,26 +22,18 @@
 class ArucoVideoWidget : public QWidget
 {
 	Q_OBJECT
-
-public:
-    ArucoVideoWidget(QWidget *parent) : QWidget(parent) {
-        connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()));
-        timer.start(60);
-	}
-    void update_image(const cv::Mat& frame);
-protected slots:
-    void paintEvent( QPaintEvent* e ) {
-        QMutexLocker foo(&mtx);
-        QPainter painter(this);
-        painter.drawImage(e->rect(), texture);
-    }
-    void update_and_repaint();
-
+    
 private:
     QMutex mtx;
     QImage texture;
     QTimer timer;
     cv::Mat _frame;
+private slots:
+    void update_and_repaint(); 
+public:
+    ArucoVideoWidget(QWidget *parent);
+    void update_image(const cv::Mat& frame);   
+    void paintEvent( QPaintEvent*) override;
 };
 
 #endif // VIDEOWIDGET_H