Optimize widget redraw

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

2 files changed, 25 insertions, 14 deletions

diff --git a/FTNoIR_Tracker_PT/pt_video_widget.cpp b/FTNoIR_Tracker_PT/pt_video_widget.cpp
index 03c42fc7..35a2c42b 100644
--- a/FTNoIR_Tracker_PT/pt_video_widget.cpp
+++ b/FTNoIR_Tracker_PT/pt_video_widget.cpp
@@ -18,19 +18,7 @@ using namespace std;
 void PTVideoWidget::update_image(const cv::Mat& frame)

 {

     QMutexLocker foo(&mtx);

-    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 int pos = 3 * (y*frame.cols + x);

-            data[y * pitch + x * 3 + 0] = frame.data[pos + 2];

-            data[y * pitch + x * 3 + 1] = frame.data[pos + 1];

-            data[y * pitch + x * 3 + 2] = frame.data[pos + 0];

-        }

-    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);

-    pixmap = QPixmap::fromImage(qframe);

+    _frame = frame;

 }

 

 // ----------------------------------------------------------------------------

@@ -50,3 +38,24 @@ VideoWidgetDialog::VideoWidgetDialog(QWidget *parent, FrameProvider* provider)
     setLayout(layout);

     resize(VIDEO_FRAME_WIDTH, VIDEO_FRAME_HEIGHT);

 }

+

+void PTVideoWidget::update_and_repaint()

+{

+    QMutexLocker foo(&mtx);

+    if (_frame.empty())

+        return;

+    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 int pos = 3 * (y*_frame.cols + x);

+            data[y * pitch + x * 3 + 0] = _frame.data[pos + 2];

+            data[y * pitch + x * 3 + 1] = _frame.data[pos + 1];

+            data[y * pitch + x * 3 + 2] = _frame.data[pos + 0];

+        }

+    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);

+    pixmap = QPixmap::fromImage(qframe);

+    update();

+}

diff --git a/FTNoIR_Tracker_PT/pt_video_widget.h b/FTNoIR_Tracker_PT/pt_video_widget.h
index e67e6d57..f5663e47 100644
--- a/FTNoIR_Tracker_PT/pt_video_widget.h
+++ b/FTNoIR_Tracker_PT/pt_video_widget.h
@@ -31,7 +31,7 @@ class PTVideoWidget : public QWidget, public FrameObserver
 

 public:

     PTVideoWidget(QWidget *parent, FrameProvider* provider) : QWidget(parent), /* to avoid linker errors */ FrameObserver(provider) {

-        connect(&timer, SIGNAL(timeout()), this, SLOT(update()));

+        connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()));

         timer.start(45);

     }

     void update_image(const cv::Mat &frame);

@@ -42,10 +42,12 @@ protected slots:
         QPainter painter(this);

         painter.drawPixmap(e->rect(), pixmap, e->rect());

     }

+    void update_and_repaint();

 private:

     QMutex mtx;

     QPixmap pixmap;

     QTimer timer;

+    cv::Mat _frame;

 };

 

 // ----------------------------------------------------------------------------