HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1339:495016ed1794

fixed crash in barseries with empty sets

sauimone -

r1339:495016ed1794

parent child

Context file:

r1339:495016ed1794

Collapse all files

src/barchart/barchartitem.cpp +11 -7

             {
                 setFlag(ItemClipsChildrenToShape);
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
-                connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(labelsVisibleChanged(bool)));
+                connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
+                connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
-                dataChanged();
+                handleDataStructureChanged();
             }
             BarChartItem::~BarChartItem()
                 return m_rect;
             }
-            void BarChartItem::dataChanged()
+            void BarChartItem::handleDataStructureChanged()
             {
                 foreach(QGraphicsItem *item, childItems()) {
                     delete item;
                 // TODO: Is this the right place to call it?
             //    presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                handleLayoutChanged();
             }
             QVector<QRectF> BarChartItem::calculateLayout()
             void BarChartItem::applyLayout(const QVector<QRectF> &layout)
             {
-                if (animator())
+                if (animator()) {
                     animator()->updateLayout(this, m_layout, layout);
-                else
+                } else {
                     setLayout(layout);
+                }
             }
             void BarChartItem::setLayout(const QVector<QRectF> &layout)
             {
                 m_layout = layout;
-                for (int i=0; i < m_bars.count(); i++)
+                for (int i=0; i < m_bars.count(); i++) {
                     m_bars.at(i)->setRect(layout.at(i));
+                }
                 update();
             }
                 update();
             }
-            void BarChartItem::labelsVisibleChanged(bool visible)
+            void BarChartItem::handleLabelsVisibleChanged(bool visible)
             {
                 foreach (QGraphicsSimpleTextItem* label, m_labels) {
                     label->setVisible(visible);

src/barchart/barchartitem_p.h +2 -3

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
-                virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
                 virtual QVector<QRectF> calculateLayout();
                 void applyLayout(const QVector<QRectF> &layout);
                 void setLayout(const QVector<QRectF> &layout);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);
                 void handleLayoutChanged();
-                void labelsVisibleChanged(bool visible);
+                void handleLabelsVisibleChanged(bool visible);
+                void handleDataStructureChanged();     // structure of of series has changed, recreate graphic items
             protected:

src/barchart/qbarseries.cpp +8 -9

                 return max;
             }
-            void QBarSeriesPrivate::barsetChanged()
-                emit updatedBars();
             void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                     return false;
                 }
                 m_barSets.append(set);
-                QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
+                QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
+                QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                     return false;
                 }
                 m_barSets.removeOne(set);
-                QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
+                QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
+                QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.append(set);
-                    QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
+                    QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
+                    QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 foreach (QBarSet* set, sets) {
                     if (m_barSets.contains(set)) {
                         m_barSets.removeOne(set);
-                        QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
+                        QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
+                        QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                         setsRemoved = true;
                     }
                 }

src/barchart/qbarseries_p.h 0 -3

                 void categoriesUpdated();
                 void labelsVisibleChanged(bool visible);
-            private Q_SLOTS:
-                void barsetChanged();
             protected:
                 QList<QBarSet *> m_barSets;
                 QStringList m_categories;

tests/auto/qbarset/tst_qbarset.cpp +2 -1

                 // Append set1 to series
                 QGroupedBarSeries *series = new QGroupedBarSeries();
-                series->append(set1);
+                bool success = series->append(set1);
+                QVERIFY(success);
                 // Add series to the chart
                 QChartView view(new QChart());

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