HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1082:4c0668542a54

Bugfixes for spline vector allocation issues

Michal Klocek -

r1082:4c0668542a54

parent child

Context file:

r1082:4c0668542a54

src/chartpresenter.cpp +2 0

             {
                 QRectF r = rect.normalized();
                 r.translate(-m_chartMargins.topLeft());
+                if(!r.isValid()) return;
                 if(m_animator) {
                     QPointF point(r.center().x()/chartGeometry().width(),r.center().y()/chartGeometry().height());
                 QSizeF size = chartGeometry().size();
                 QRectF rect = chartGeometry();
                 rect.translate(-m_chartMargins.topLeft());
+                if(!rect.isValid()) return;
                 m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);
                 //m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());

src/splinechart/qsplineseries.cpp +8 0

             {
             }
+            QSplineSeries::~QSplineSeries()
+            {
+                Q_D(QSplineSeries);
+                if(d->m_dataset){
+                       d->m_dataset->removeSeries(this);
+                }
+            }
             QAbstractSeries::QSeriesType QSplineSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeSpline;

src/splinechart/qsplineseries.h +1 0

             public:
                 explicit QSplineSeries(QObject *parent = 0);
+                ~QSplineSeries();
                 QAbstractSeries::QSeriesType type() const;
                 QPointF controlPoint(int index) const;

src/splinechart/splinechartitem.cpp +7 -3

             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             }
             void SplineChartItem::updateLayout(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
+            {
                 QVector<QPointF> controlPoints;
-                controlPoints.resize(newPoints.count()*2-2);
+                if(newPoints.count()>=2){
+                    controlPoints.resize(newPoints.count()*2-2);
+                }
                 for (int i = 0; i < newPoints.size() - 1; i++) {
                     controlPoints[2*i] = calculateGeometryControlPoint(2 * i);
                 m_rect = splinePath.boundingRect();
                 XYChartItem::setLayout(points);
                 m_controlPoints=controlPoints;
             }
             //handlers
             {
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
+                qDebug()<<__FUNCTION__;
                 painter->save();
                 painter->setClipRect(clipRect());
                 painter->setPen(m_linePen);

src/xychart/qxyseries.cpp 0 -1

                     maxY=1.0;
                 }
                 for (int i = 0; i < points.count(); i++)
                 {
                     qreal x = points[i].x();

src/xychart/xychartitem.cpp +1 -1

             bool XYChartItem::isEmpty()
             {
-                return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY);
+                return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY) || m_series->points().isEmpty();
             }
             void XYChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

test/auto/qchart/tst_qchart.cpp +1 -5

                 QFETCH(bool, isBackgroundVisible);
                 m_chart->setBackgroundVisible(isBackgroundVisible);
                 QCOMPARE(m_chart->isBackgroundVisible(), isBackgroundVisible);
             }
             void tst_QChart::legend_data()
             }
             void tst_QChart::margins()
-            {QTest::addColumn<int>("seriesCount");
-            QTest::newRow("0") << 0;
-            QTest::newRow("-1") << -1;
                 createTestData();
                 QRectF rect = m_chart->geometry();
                 QVERIFY(m_chart->margins().top()+m_chart->margins().bottom() < rect.height());
                 QVERIFY(m_chart->margins().left()+m_chart->margins().right() < rect.width());
             }
             void tst_QChart::removeAllSeries_data()

General Comments 0

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

No TODOs yet

	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