HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2506:59c477efbea1

Further fixes to threaded rendering...

Miikka Heikkinen -

r2506:59c477efbea1

parent child

Context file:

r2506:59c477efbea1

Collapse all files

plugins/declarative/declarativechart.cpp +37 -10

             #include <QGraphicsSceneHoverEvent>
             #include <QApplication>
             #include <QTimer>
+            #include <QThread>
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
             #ifdef CHARTS_FOR_QUICK2
                 m_currentSceneImage = 0;
+                m_guiThreadId = QThread::currentThreadId();
+                m_paintThreadId = 0;
                 if (type == QChart::ChartTypePolar)
                     m_chart = new QPolarChart();
             {
                 Q_UNUSED(region);
-                if (!m_updatePending) {
+                if (m_guiThreadId == m_paintThreadId) {
-                    m_updatePending = true;
+                    // Rendering in gui thread, no need for shenannigans, just update
-                    // Do async render to avoid some unnecessary renders.
+                    update();
-                    QTimer::singleShot(0, this, SLOT(renderScene()));
+                } else {
+                    // Multi-threaded rendering, need to ensure scene is actually rendered in gui thread
+                    if (!m_updatePending) {
+                        m_updatePending = true;
+                        // Do async render to avoid some unnecessary renders.
+                        QTimer::singleShot(0, this, SLOT(renderScene()));
+                    }
                 }
             }
                 m_currentSceneImage = new QImage(m_chart->size().toSize(), QImage::Format_ARGB32);
                 m_currentSceneImage->fill(Qt::transparent);
                 QPainter painter(m_currentSceneImage);
+                if (antialiasing())
+                    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
                 QRect renderRect(QPoint(0, 0), m_chart->size().toSize());
                 m_scene->render(&painter, renderRect, renderRect);
                 m_sceneImageLock.unlock();
             void DeclarativeChart::paint(QPainter *painter)
             {
-                m_sceneImageLock.lock();
+                if (!m_paintThreadId) {
-                if (m_currentSceneImage) {
+                    m_paintThreadId = QThread::currentThreadId();
-                    QRect imageRect(QPoint(0, 0), m_currentSceneImage->size());
+                    if (m_guiThreadId == m_paintThreadId) {
-                    QRect itemRect(QPoint(0, 0), QSize(width(), height()));
+                        // No need for scene image in single threaded rendering, so delete
-                    painter->drawImage(itemRect, *m_currentSceneImage, imageRect);
+                        // the one that got made by default before the rendering type was
+                        // detected.
+                        delete m_currentSceneImage;
+                        m_currentSceneImage = 0;
+                    }
+                }
+                if (m_guiThreadId == m_paintThreadId) {
+                    QRectF renderRect(QPointF(0, 0), m_chart->size());
+                    m_scene->render(painter, renderRect, renderRect);
+                } else {
+                    m_sceneImageLock.lock();
+                    if (m_currentSceneImage) {
+                        QRect imageRect(QPoint(0, 0), m_currentSceneImage->size());
+                        QRect itemRect(QPoint(0, 0), QSize(width(), height()));
+                        painter->drawImage(itemRect, *m_currentSceneImage, imageRect);
+                    }
+                    m_sceneImageLock.unlock();
                 }
-                m_sceneImageLock.unlock();
             }
             void DeclarativeChart::mousePressEvent(QMouseEvent *event)

plugins/declarative/declarativechart.h +2 0

                 QMutex m_sceneImageLock;
                 QImage *m_currentSceneImage;
                 bool m_updatePending;
+                Qt::HANDLE m_paintThreadId;
+                Qt::HANDLE m_guiThreadId;
             #endif
                 DeclarativeMargins *m_margins;
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages