summaryrefslogtreecommitdiffhomepage
path: root/cv/video-widget.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'cv/video-widget.hpp')
-rw-r--r--cv/video-widget.hpp40
1 files changed, 7 insertions, 33 deletions
diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp
index 15430e2f..24f8d7f3 100644
--- a/cv/video-widget.hpp
+++ b/cv/video-widget.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012 Patrick Ruoff
- * Copyright (c) 2014-2016 Stanislaw Halik <sthalik@misaki.pl>
+/* Copyright (c) 2019 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,39 +7,14 @@
#pragma once
-#include <memory>
-#include <vector>
+#include "video/video-widget.hpp"
+#include <opencv2/core/mat.hpp>
-#include <opencv2/core.hpp>
-
-#include <QObject>
-#include <QWidget>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QTimer>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QSize>
-#include <QDebug>
-
-class cv_video_widget final : public QWidget
+struct cv_video_widget final : video_widget
{
- Q_OBJECT
-
-public:
- cv_video_widget(QWidget *parent);
+ using video_widget::video_widget;
void update_image(const cv::Mat& frame);
- void update_image(const QImage& image);
- void get_preview_size(int& w, int& h);
-private slots:
- void paintEvent(QPaintEvent*) override;
- void update_and_repaint();
+
private:
- QMutex mtx { QMutex::Recursive };
- QImage texture;
- std::vector<unsigned char> vec;
- QTimer timer;
- cv::Mat _frame, _frame2, _frame3;
- int width = 320, height = 240;
- bool freshp = false;
+ cv::Mat frame2, frame3;
};