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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 46 insertions, 0 deletions

diff --git a/ftnoir_tracker_pt/pt_video_widget.cpp b/ftnoir_tracker_pt/pt_video_widget.cpp
new file mode 100644
index 00000000..aefb8199
--- /dev/null
+++ b/ftnoir_tracker_pt/pt_video_widget.cpp
@@ -0,0 +1,46 @@
+/* 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.
+ *
+ * 20130312, WVR: Add 7 lines to resizeGL after resize_frame. This should lower CPU-load.
+ */
+
+#include "pt_video_widget.h"
+
+#include <QDebug>
+#include <QHBoxLayout>
+
+using namespace cv;
+using namespace std;
+
+void PTVideoWidget::update_image(const cv::Mat& frame)
+{
+    QMutexLocker foo(&mtx);
+    _frame = frame.clone();
+    freshp = true;
+}
+
+void PTVideoWidget::update_and_repaint()
+{
+    QMutexLocker foo(&mtx);
+    if (_frame.empty() || !freshp)
+        return;
+    freshp = false;
+    QImage qframe = QImage(_frame.cols, _frame.rows, QImage::Format_RGB888);
+    uchar* data = qframe.bits();
+    const int pitch = qframe.bytesPerLine();
+    for (int y = 0; y < _frame.rows; y++)
+        for (int x = 0; x < _frame.cols; x++)
+        {
+            const auto& elt = _frame.at<Vec3b>(y, x);
+            const cv::Scalar elt2 = static_cast<cv::Scalar>(elt);
+            data[y * pitch + x * 3 + 0] = elt2.val[2];
+            data[y * pitch + x * 3 + 1] = elt2.val[1];
+            data[y * pitch + x * 3 + 2] = elt2.val[0];
+        }
+    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
+    texture = qframe;
+    update();
+}