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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 56 insertions, 0 deletions

diff --git a/ftnoir_tracker_pt/pt_video_widget.h b/ftnoir_tracker_pt/pt_video_widget.h
new file mode 100644
index 00000000..f2b41d63
--- /dev/null
+++ b/ftnoir_tracker_pt/pt_video_widget.h
@@ -0,0 +1,56 @@
+/* Copyright (c) 2012 Patrick Ruoff
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QTime>
+#include <QDialog>
+#include <opencv2/core/core.hpp>
+#ifndef OPENTRACK_API
+#   include <QGLWidget>
+#   include <boost/shared_ptr.hpp>
+#else
+#   include <memory>
+#   if defined(_WIN32)
+#       include <dshow.h>
+#   endif
+#endif
+#include <QPainter>
+#include <QPaintEvent>
+#include <QTimer>
+#include <QMutex>
+#include <QMutexLocker>
+
+class PTVideoWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    PTVideoWidget(QWidget *parent) :
+        QWidget(parent),
+        freshp(false)
+    {
+        connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()));
+        timer.start(40);
+    }
+    void update_image(const cv::Mat &frame);
+    void update_frame_and_points() {}
+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;
+    volatile bool freshp;
+};