HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1085:e4375f6dc43e

XYSeries model support refactored

Marek Rosa -

r1085:e4375f6dc43e

parent child

Context file:

r1085:e4375f6dc43e

Collapse all files

src/linechart/linechartitem.cpp +1 0

             {
                 if(points.size()==0)
                 {
+                    m_path = QPainterPath();
                     XYChartItem::setLayout(points);
                     return;
                 }

src/scatterchart/scatterchartitem.cpp +1 0

             {
                 if(points.size()==0)
                 {
+                    deletePoints(m_items.childItems().count());
                     XYChartItem::setLayout(points);
                     return;
                 }

src/splinechart/qsplineseries.cpp +16 -4

                 }
             }
-            void QSplineSeriesPrivate::modelDataAdded(QModelIndex parent, int start, int end)
+            void QSplineSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 updateControlPoints();
-                QXYSeriesPrivate::modelDataAdded(parent, start, end);
+                QXYSeriesPrivate::modelRowsAdded(parent, start, end);
             }
-            void QSplineSeriesPrivate::modelDataRemoved(QModelIndex parent, int start, int end)
+            void QSplineSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
             {
                 updateControlPoints();
-                QXYSeriesPrivate::modelDataRemoved(parent, start, end);
+                QXYSeriesPrivate::modelRowsRemoved(parent, start, end);
+            }
+            void QSplineSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
+            {
+                updateControlPoints();
+                QXYSeriesPrivate::modelColumnsAdded(parent, start, end);
+            }
+            void QSplineSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
+            {
+                updateControlPoints();
+                QXYSeriesPrivate::modelColumnsRemoved(parent, start, end);
             }
             Chart* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)

src/splinechart/qsplineseries_p.h +4 -2

                 void updateControlPoints();
             protected Q_SLOTS:
-                void modelDataAdded(QModelIndex parent, int start, int end);
+                void modelRowsAdded(QModelIndex parent, int start, int end);
-                void modelDataRemoved(QModelIndex parent, int start, int end);
+                void modelRowsRemoved(QModelIndex parent, int start, int end);
+                void modelColumnsAdded(QModelIndex parent, int start, int end);
+                void modelColumnsRemoved(QModelIndex parent, int start, int end);
             private:
                 void calculateControlPoints();

src/splinechart/splinechartitem.cpp +4 0

             void SplineChartItem::setLayout(QVector<QPointF> &points)
             {
                 // Dummy implementation because of a bug in Clang compiler
+                if (points.size() < 2) {
+                    m_path = QPainterPath();
+                }
                 XYChartItem::setLayout(points);
             }
             void SplineChartItem::setLayout(QVector<QPointF> &points, QVector<QPointF> &controlPoints)
             {
                 if ((points.size()<2) || (controlPoints.size()<2)) {
+                    m_path = QPainterPath();
                     XYChartItem::setLayout(points);
                     m_controlPoints=controlPoints;
                     return;

src/xychart/qxyseries.cpp +47 -14

                     QList<QPointF> result;
                     if (d->m_mapOrientation == Qt::Vertical){
                         // consecutive data is read from model's column
+                        if (d->m_mapX >= d->m_model->columnCount() || d->m_mapY >= d->m_model->columnCount())
+                            return result;   // mapped columns are not existing
                         for(int i = d->m_mapFirst; i< d->m_mapFirst + count(); ++i) {
                             qreal x =  d->m_model->data(d->m_model->index(i, d->m_mapX), Qt::DisplayRole).toReal();
                     }
                     else{
                         // consecutive data is read from model's row
+                        if (d->m_mapX >= d->m_model->rowCount() || d->m_mapY >= d->m_model->rowCount())
+                            return result;   // mapped rows are not existing
                         for(int i = d->m_mapFirst; i<  d->m_mapFirst + count(); ++i) {
                             qreal x =  d->m_model->data(d->m_model->index(d->m_mapX, i), Qt::DisplayRole).toReal();
                             qreal y =  d->m_model->data(d->m_model->index(d->m_mapY, i), Qt::DisplayRole).toReal();
                     if (d->m_mapOrientation == Qt::Vertical) {
                         // data is in a column. Return the number of mapped items if the model's column have enough items
                         // or the number of items that can be mapped
-                        if (d->m_mapCount != -1)
+                        if (d->m_mapX >= d->m_model->columnCount() || d->m_mapY >= d->m_model->columnCount())
+                            return 0;   // mapped columns are not existing
+                        else if (d->m_mapCount != -1)
                             return qMin(d->m_mapCount, qMax(d->m_model->rowCount() - d->m_mapFirst, 0));
                         else
                             return qMax(d->m_model->rowCount() - d->m_mapFirst, 0);
                     } else {
                         // data is in a row. Return the number of mapped items if the model's row have enough items
                         // or the number of items that can be mapped
-                        if (d->m_mapCount != -1)
+                        if (d->m_mapX >= d->m_model->rowCount() || d->m_mapY >= d->m_model->rowCount())
+                            return 0;   // mapped rows are not existing
+                        else if (d->m_mapCount != -1)
                             return qMin(d->m_mapCount, qMax(d->m_model->columnCount() - d->m_mapFirst, 0));
                         else
                             return qMax(d->m_model->columnCount() - d->m_mapFirst, 0);
                 // connect the signals from the model
                 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                if (d->m_mapOrientation == Qt::Vertical) {
+            //    if (d->m_mapOrientation == Qt::Vertical) {
-                    connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
+                    connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
-                    connect(d->m_model,SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
+                    connect(d->m_model,SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
-                } else {
+            //    } else {
-                    connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
+                    connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
-                    connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
+                    connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
+            //    }
             }
             void QXYSeries::setModelMappingRange(int first, int count)
                     maxY = qMax(maxY, y);
                 }
-               domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
+                domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
             }
-            void QXYSeriesPrivate::modelDataAdded(QModelIndex parent, int start, int end)
+            void QXYSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
+            {
+                Q_UNUSED(parent);
+                if (m_mapOrientation == Qt::Vertical)
+                    emit pointsAdded(start, end);
+                else if (start <= m_mapX || start <= m_mapY)
+                    emit reinitialized();
+            }
+            void QXYSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
+            {
+                Q_UNUSED(parent);
+                if (m_mapOrientation == Qt::Vertical)
+                    emit pointsRemoved(start, end);
+                else if (start <= m_mapX || start <= m_mapY)
+                    emit reinitialized();
+            }
+            void QXYSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
-                emit pointsAdded(start, end);
+                if (m_mapOrientation == Qt::Horizontal)
+                    emit pointsAdded(start, end);
+                else if (start <= m_mapX || start <= m_mapY)
+                    emit reinitialized();
             }
-            void QXYSeriesPrivate::modelDataRemoved(QModelIndex parent, int start, int end)
+            void QXYSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
-                emit pointsRemoved(start, end);
+                if (m_mapOrientation == Qt::Horizontal)
+                    emit pointsRemoved(start, end);
+                else if (start <= m_mapX || start <= m_mapY)
+                    emit reinitialized();
             }
             #include "moc_qxyseries.cpp"

src/xychart/qxyseries_p.h +9 -4

             protected Q_SLOTS:
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
-                virtual void modelDataAdded(QModelIndex parent, int start, int end);
+                virtual void modelRowsAdded(QModelIndex parent, int start, int end);
-                virtual void modelDataRemoved(QModelIndex parent, int start, int end);
+                virtual void modelRowsRemoved(QModelIndex parent, int start, int end);
+                virtual void modelColumnsAdded(QModelIndex parent, int start, int end);
+                virtual void modelColumnsRemoved(QModelIndex parent, int start, int end);
+            private:
+                void insertData(int start, int end);
+                void removeData(int start, int end);
             Q_SIGNALS:
                 void updated();
                 void pointsRemoved(int start, int end);
                 void pointAdded(int index);
                 void pointsAdded(int start, int end);
+                void reinitialized();
             protected:
                 QVector<QPointF> m_points;

src/xychart/xychartitem.cpp +11 0

                 connect(series->d_func(),SIGNAL(pointsAdded(int, int)),this,SLOT(handlePointsAdded(int, int)));
                 connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
                 connect(series->d_func(),SIGNAL(pointsRemoved(int, int)),this,SLOT(handlePointsRemoved(int, int)));
+                connect(series->d_func(),SIGNAL(reinitialized()),this,SLOT(handleReinitialized()));
                 connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
             }
                 update();
             }
+            void XYChartItem::handleReinitialized()
+            {
+                QVector<QPointF> points = calculateGeometryPoints();
+                if (points.isEmpty())
+                    setLayout(points);
+                else
+                    updateLayout(m_points,points);
+                update();
+            }
             void XYChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 m_minX=minX;

src/xychart/xychartitem_p.h +1 0

                 void handlePointRemoved(int index);
                 void handlePointsRemoved(int start, int end);
                 void handlePointReplaced(int index);
+                void handleReinitialized();
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);

test/tablemodelchart/tablewidget.cpp +3 -2

                     }
-                    if (!m_barRadioButton->isChecked())
+                    if (!m_barRadioButton->isChecked()) {
                         m_chart->axisX()->setRange(0, 500);
-                    //        m_chart->axisY()->setRange(0, 120);
+                        m_chart->axisY()->setRange(0, 220);
+                    }
                     m_chart->legend()->setVisible(true);
                     // repaint table view colors

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