HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1238:8de78239061c

pie: fix bug with qmlchart demo...

Jani Honkonen -

r1238:8de78239061c

parent child

Context file:

r1238:8de78239061c

Collapse all files

src/piechart/piechartitem.cpp +11 -7

                 connect(d, SIGNAL(piePositionChanged()), this, SLOT(updateLayout()));
                 connect(d, SIGNAL(pieSizeChanged()), this, SLOT(updateLayout()));
-                QTimer::singleShot(0, this, SLOT(initialize())); // TODO: get rid of this
                 // Note: the following does not affect as long as the item does not have anything to paint
                 setZValue(ChartPresenter::PieSeriesZValue);
+                // Note: will not create slice items until we have a proper rectangle to draw on.
             }
             PieChartItem::~PieChartItem()
                 prepareGeometryChange();
                 m_rect = rect;
                 updateLayout();
+                // This is for delayed initialization of the slice items during startup.
+                // It ensures that startup animation originates from the correct position.
+                if (m_sliceItems.isEmpty())
+                    handleSlicesAdded(m_series->slices());
             }
             void PieChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
                 // does not apply to pie
             }
-            void PieChartItem::initialize()
-                handleSlicesAdded(m_series->slices());
             void PieChartItem::updateLayout()
             {
                 // find pie center coordinates
             void PieChartItem::handleSlicesAdded(QList<QPieSlice*> slices)
             {
+                // delay creating slice items until there is a proper rectangle
+                if (!m_rect.isValid() && m_sliceItems.isEmpty())
+                    return;
                 presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
                 bool startupAnimation = m_sliceItems.isEmpty();

src/piechart/piechartitem_p.h 0 -1

                 virtual void rangeXChanged(qreal min, qreal max, int tickXCount);
                 virtual void rangeYChanged(qreal min, qreal max, int tickYCount);
-                void initialize();
                 void updateLayout();
                 void handleSlicesAdded(QList<QPieSlice*> slices);
                 void handleSlicesRemoved(QList<QPieSlice*> slices);

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