diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-15 08:52:25 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-15 08:52:25 +0200 |
commit | 864910a1fb753629d2852a91ffae4ebba374358c (patch) | |
tree | 7fbee6d32dd5312e592ab3a41219a7daa9cf56ae /ftnoir_tracker_aruco/video_widget.h | |
parent | a73f49c89299ec69dda73e3e7a16cebe76da373e (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/video_widget.h')
-rw-r--r-- | ftnoir_tracker_aruco/video_widget.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/ftnoir_tracker_aruco/video_widget.h b/ftnoir_tracker_aruco/video_widget.h deleted file mode 100644 index 87b6278a..00000000 --- a/ftnoir_tracker_aruco/video_widget.h +++ /dev/null @@ -1,39 +0,0 @@ -/* 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. - */ - -#ifndef VIDEOWIDGET_H -#define VIDEOWIDGET_H - -#include <QTime> -#include <QWidget> -#include <QMutex> -#include <QMutexLocker> -#include <QLabel> -#include <QPainter> -#include <QPaintEvent> - -// ---------------------------------------------------------------------------- -class VideoWidget : public QWidget -{ - Q_OBJECT - -public: - VideoWidget(QWidget *parent) : QWidget(parent), mtx() { - } - void update_image(unsigned char* frame, int width, int height); -protected slots: - void paintEvent( QPaintEvent* e ) { - QMutexLocker foo(&mtx); - QPainter painter(this); - painter.drawPixmap(e->rect(), pixmap, e->rect()); - } -private: - QMutex mtx; - QPixmap pixmap; -}; - -#endif // VIDEOWIDGET_H |