summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ftnoir_tracker_aruco/ar_video_widget.cpp4
-rw-r--r--ftnoir_tracker_aruco/ar_video_widget.h10
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.cpp4
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.h15
-rw-r--r--ftnoir_tracker_pt/pt_video_widget.cpp3
-rw-r--r--ftnoir_tracker_pt/pt_video_widget.h11
6 files changed, 10 insertions, 37 deletions
diff --git a/ftnoir_tracker_aruco/ar_video_widget.cpp b/ftnoir_tracker_aruco/ar_video_widget.cpp
index 2d9e3052..70c26e55 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.cpp
+++ b/ftnoir_tracker_aruco/ar_video_widget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Patrick Ruoff
+/* Copyright (c) 2014 Stanislaw Halik
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -7,8 +7,6 @@
#include "ar_video_widget.h"
-#include <QDebug>
-
using namespace std;
void ArucoVideoWidget::update_image(const cv::Mat& frame)
diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h
index 638b0ab4..6df2d626 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.h
+++ b/ftnoir_tracker_aruco/ar_video_widget.h
@@ -1,24 +1,20 @@
-/* Copyright (c) 2012 Patrick Ruoff
+/* Copyright (c) 2014 Stanislaw Halik
*
* 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.
*/
-#ifndef VIDEOWIDGET_H
-#define VIDEOWIDGET_H
+#pragma once
#include <QTimer>
#include <QWidget>
#include <QMutex>
#include <QMutexLocker>
-#include <QLabel>
#include <QPainter>
#include <QPaintEvent>
-#include <QTimer>
#include <opencv/cv.hpp>
-// ----------------------------------------------------------------------------
class ArucoVideoWidget : public QWidget
{
Q_OBJECT
@@ -35,5 +31,3 @@ public:
void update_image(const cv::Mat& frame);
void paintEvent( QPaintEvent*) override;
};
-
-#endif // VIDEOWIDGET_H
diff --git a/ftnoir_tracker_ht/ht_video_widget.cpp b/ftnoir_tracker_ht/ht_video_widget.cpp
index 1c5f565c..ef58c98f 100644
--- a/ftnoir_tracker_ht/ht_video_widget.cpp
+++ b/ftnoir_tracker_ht/ht_video_widget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Patrick Ruoff
+/* Copyright (c) 2014 Stanislaw Halik
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -7,8 +7,6 @@
#include "ht_video_widget.h"
-#include <QDebug>
-
using namespace std;
void HTVideoWidget::update_image(unsigned char *frame, int width, int height)
diff --git a/ftnoir_tracker_ht/ht_video_widget.h b/ftnoir_tracker_ht/ht_video_widget.h
index be4aee44..054b2cf4 100644
--- a/ftnoir_tracker_ht/ht_video_widget.h
+++ b/ftnoir_tracker_ht/ht_video_widget.h
@@ -1,27 +1,21 @@
-/* Copyright (c) 2012 Patrick Ruoff
+/* Copyright (c) 2014 Stanislaw Halik
*
* 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
-#ifndef VIDEOWIDGET_H
-#define VIDEOWIDGET_H
-
-#include <QTime>
+#include <QTimer>
#include <QWidget>
#include <QMutex>
#include <QMutexLocker>
-#include <QLabel>
#include <QPainter>
#include <QPaintEvent>
-#include <QTimer>
-// ----------------------------------------------------------------------------
class HTVideoWidget : public QWidget
{
Q_OBJECT
-
public:
HTVideoWidget(QWidget *parent) : QWidget(parent), fb(), width(0), height(0), fresh(false) {
connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()));
@@ -35,7 +29,6 @@ protected slots:
painter.drawImage(e->rect(), texture);
}
void update_and_repaint();
-
private:
QMutex mtx;
QImage texture;
@@ -44,5 +37,3 @@ private:
int width,height;
bool fresh;
};
-
-#endif // VIDEOWIDGET_H
diff --git a/ftnoir_tracker_pt/pt_video_widget.cpp b/ftnoir_tracker_pt/pt_video_widget.cpp
index 12f01413..15fc5a86 100644
--- a/ftnoir_tracker_pt/pt_video_widget.cpp
+++ b/ftnoir_tracker_pt/pt_video_widget.cpp
@@ -9,9 +9,6 @@
#include "pt_video_widget.h"
-#include <QDebug>
-#include <QHBoxLayout>
-
using namespace cv;
using namespace std;
diff --git a/ftnoir_tracker_pt/pt_video_widget.h b/ftnoir_tracker_pt/pt_video_widget.h
index 09818254..af1d60fd 100644
--- a/ftnoir_tracker_pt/pt_video_widget.h
+++ b/ftnoir_tracker_pt/pt_video_widget.h
@@ -1,4 +1,5 @@
/* Copyright (c) 2012 Patrick Ruoff
+ * Copyright (c) 2014 Stanislaw Halik <sthalik@misaki.pl>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -8,15 +9,9 @@
#pragma once
#include <QObject>
-#include <QTime>
-#include <QDialog>
+#include <QWidget>
#include <opencv2/core/core.hpp>
-#ifndef OPENTRACK_API
-# include <QGLWidget>
-# include <boost/shared_ptr.hpp>
-#else
-# include <memory>
-#endif
+#include <memory>
#include <QPainter>
#include <QPaintEvent>
#include <QTimer>