From ba45d8d68ad669ef8a581a7956c6167f7495e49a Mon Sep 17 00:00:00 2001
From: justayak <julian.tanke@googlemail.com>
Date: Fri, 13 Nov 2015 13:34:27 +0000
Subject: [PATCH] unify paints
---
SampleTracker.cpp | 14 ++++++--------
SampleTracker.h | 3 +--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/SampleTracker.cpp b/SampleTracker.cpp
index 5fd99af..ce3b8be 100644
--- a/SampleTracker.cpp
+++ b/SampleTracker.cpp
@@ -65,8 +65,13 @@ void SampleTracker::track(ulong, const cv::Mat &imgOriginal) {
_imageChanged = true;
}
-void SampleTracker::paint(ProxyPaintObject &p , const View &view) {
+void SampleTracker::paint(ProxyPaintObject &p , QPainter *painter, const View &view) {
if (view.name != _currentView || _imageChanged) {
+ painter->drawRoundRect(QRectF(QPointF(100, 100), QPointF(1000, 1000)));
+ if (_showSelectorRec) {
+ drawRectangle(painter);
+ }
+
_currentView = view.name;
// getting image object will force videoView to upload it to graphic mem
@@ -81,13 +86,6 @@ void SampleTracker::paint(ProxyPaintObject &p , const View &view) {
}
}
-void SampleTracker::paintOverlay(QPainter *painter) {
- painter->drawRoundRect(QRectF(QPointF(100, 100), QPointF(1000, 1000)));
- if (_showSelectorRec) {
- drawRectangle(painter);
- }
-}
-
//this will draw a basic rectangle
void SampleTracker::drawRectangle(QPainter *painter) {
QColor color(Qt::cyan);
diff --git a/SampleTracker.h b/SampleTracker.h
index 78d919c..ba6f342 100644
--- a/SampleTracker.h
+++ b/SampleTracker.h
@@ -14,8 +14,7 @@ class SampleTracker : public TrackingAlgorithm {
SampleTracker(Settings &settings, QWidget *parent);
void track(ulong frameNumber, const cv::Mat &frame) override;
- void paint(ProxyPaintObject &,View const &view = OriginalView) override;
- void paintOverlay(QPainter *painter) override;
+ void paint(ProxyPaintObject &, QPainter *, View const &view = OriginalView) override;
void postConnect() override;
--
GitLab