HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2505:618c94f22285

Fix quick2 support with multithreaded scenegraph rendering....

Heikkinen Miikka -

r2505:618c94f22285

parent child

Context file:

r2505:618c94f22285

Collapse all files

plugins/declarative/declarativechart.cpp +43 -3

             #include <QGraphicsSceneMouseEvent>
             #include <QGraphicsSceneHoverEvent>
             #include <QApplication>
+            #include <QTimer>
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             void DeclarativeChart::initChart(QChart::ChartType type)
             {
             #ifdef CHARTS_FOR_QUICK2
+                m_currentSceneImage = 0;
                 if (type == QChart::ChartTypePolar)
                     m_chart = new QPolarChart();
                 else
                 m_scene->addItem(m_chart);
                 setAntialiasing(QQuickItem::antialiasing());
-                connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(update()));
+                connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(sceneChanged(QList<QRectF>)));
                 connect(this, SIGNAL(antialiasingChanged(bool)), this, SLOT(handleAntialiasingChanged(bool)));
                 setAcceptedMouseButtons(Qt::AllButtons);
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
+            #ifdef CHARTS_FOR_QUICK2
+                m_sceneImageLock.lock();
+                delete m_currentSceneImage;
+                m_currentSceneImage = 0;
+                m_sceneImageLock.unlock();
+            #endif
             }
             void DeclarativeChart::childEvent(QChildEvent *event)
             }
             #ifdef CHARTS_FOR_QUICK2
+            void DeclarativeChart::sceneChanged(QList<QRectF> region)
+            {
+                Q_UNUSED(region);
+                if (!m_updatePending) {
+                    m_updatePending = true;
+                    // Do async render to avoid some unnecessary renders.
+                    QTimer::singleShot(0, this, SLOT(renderScene()));
+                }
+            }
+            void DeclarativeChart::renderScene()
+            {
+                m_updatePending = false;
+                m_sceneImageLock.lock();
+                delete m_currentSceneImage;
+                m_currentSceneImage = new QImage(m_chart->size().toSize(), QImage::Format_ARGB32);
+                m_currentSceneImage->fill(Qt::transparent);
+                QPainter painter(m_currentSceneImage);
+                QRect renderRect(QPoint(0, 0), m_chart->size().toSize());
+                m_scene->render(&painter, renderRect, renderRect);
+                m_sceneImageLock.unlock();
+                update();
+            }
             void DeclarativeChart::paint(QPainter *painter)
             {
-                QRectF renderRect(QPointF(0, 0), m_chart->size());
+                m_sceneImageLock.lock();
-                m_scene->render(painter, renderRect, renderRect);
+                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();
             }
             void DeclarativeChart::mousePressEvent(QMouseEvent *event)

plugins/declarative/declarativechart.h +6 0

             #include <QtQuick/QQuickItem>
             #include <QtQuick/QQuickPaintedItem>
             #include <QtWidgets/QGraphicsScene>
+            #include <QtCore/QMutex>
             #else
             #include <QtDeclarative/QDeclarativeItem>
             #endif
                 void hoverMoveEvent(QHoverEvent *event);
             private Q_SLOTS:
                 void handleAntialiasingChanged(bool enable);
+                void sceneChanged(QList<QRectF> region);
+                void renderScene();
             #endif
             public:
                 QPoint m_lastMouseMoveScreenPoint;
                 Qt::MouseButton m_mousePressButton;
                 Qt::MouseButtons m_mousePressButtons;
+                QMutex m_sceneImageLock;
+                QImage *m_currentSceneImage;
+                bool m_updatePending;
             #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