HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2598:764a09c2b2a5

Improve theme initialization performance for bar series...

Titta Heikkala -

r2598:764a09c2b2a5

parent child

Context file:

r2598:764a09c2b2a5

Collapse all files

src/barchart/abstractbarchartitem.cpp +2 0

             void AbstractBarChartItem::handleUpdatedBars()
             {
+                if (!m_series->d_func()->blockBarUpdate()) {
                     // Handle changes in pen, brush, labels etc.
                     int categoryCount = m_series->d_func()->categoryCount();
                     int setCount = m_series->count();
                         }
                     }
                 }
+            }
             #include "moc_abstractbarchartitem_p.cpp"

src/barchart/qabstractbarseries.cpp +10 -2

                 QAbstractSeriesPrivate(q),
                 m_barWidth(0.5),  // Default value is 50% of category width
                 m_labelsVisible(false),
-                m_visible(true)
+                m_visible(true),
+                m_blockBarUpdate(false)
             {
             }
                 return bottom;
             }
+            bool QAbstractBarSeriesPrivate::blockBarUpdate()
+            {
+                return m_blockBarUpdate;
+            }
             void QAbstractBarSeriesPrivate::initializeDomain()
             {
             void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
+                m_blockBarUpdate = true; // Ensures that the bars are not updated before the theme is ready
                 const QList<QGradient> gradients = theme->seriesGradients();
                 qreal takeAtPos = 0.5;
                         else
                             m_barSets.at(i)->setLabelBrush(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0));
                     }
                     if (forced || QChartPrivate::defaultPen() == m_barSets.at(i)->d_ptr->m_pen) {
                         QColor c = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0);
                         m_barSets.at(i)->setPen(c);
                     }
                 }
+                m_blockBarUpdate = false;
+                emit updatedBars();
             }
             void QAbstractBarSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)

src/barchart/qabstractbarseries_p.h +3 0

                 qreal top();
                 qreal bottom();
+                bool blockBarUpdate();
             Q_SIGNALS:
                 void clicked(int index, QBarSet *barset);
                 void updatedBars();
                 qreal m_barWidth;
                 bool m_labelsVisible;
                 bool m_visible;
+                bool m_blockBarUpdate;
             private:
                 Q_DECLARE_PUBLIC(QAbstractBarSeries)

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