HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1251:3e42cdbd748d

Small fixes to piemodelmapper and one more test

Marek Rosa -

r1251:3e42cdbd748d

parent child

Context file:

r1251:3e42cdbd748d

Collapse all files

src/piechart/qpiemodelmapper.cpp +31 -3

                     return m_model->index(m_labelsIndex, slicePos + m_first);
             }
+            bool QPieModelMapperPrivate::isLabelIndex(QModelIndex index) const
+            {
+                if (m_orientation == Qt::Vertical && index.column() == m_labelsIndex)
+                    return true;
+                else if (m_orientation == Qt::Horizontal && index.row() == m_labelsIndex)
+                    return true;
+                return false;
+            }
+            bool QPieModelMapperPrivate::isValueIndex(QModelIndex index) const
+            {
+                if (m_orientation == Qt::Vertical && index.column() == m_valuesIndex)
+                    return true;
+                else if (m_orientation == Qt::Horizontal && index.row() == m_valuesIndex)
+                    return true;
+                return false;
+            }
             void QPieModelMapperPrivate::slicesAdded(QList<QPieSlice*> slices)
             {
                 if (m_seriesSignalsBlock)
                         index = topLeft.sibling(row, column);
                         slice = pieSlice(index);
                         if (slice) {
-                            slice->setValue(m_model->data(index, Qt::DisplayRole).toReal());
+                            if (isValueIndex(index))
-                            slice->setLabel(m_model->data(index, Qt::DisplayRole).toString());
+                                slice->setValue(m_model->data(index, Qt::DisplayRole).toReal());
+                            if (isLabelIndex(index))
+                                slice->setLabel(m_model->data(index, Qt::DisplayRole).toString());
                         }
                     }
                 }
             void QPieModelMapperPrivate::insertData(int start, int end)
             {
+                if (m_model == 0 || m_series == 0)
+                    return;
                 if (m_count != -1 && start >= m_first + m_count) {
                     return;
                 } else {
             void QPieModelMapperPrivate::removeData(int start, int end)
             {
+                if (m_model == 0 || m_series == 0)
+                    return;
                 int removedCount = end - start + 1;
                 if (m_count != -1 && start >= m_first + m_count) {
                     return;
                     connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                     m_series->append(slice);
                     m_slices.append(slice);
-            //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
+                    //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                     slicePos++;
                     valueIndex = valueModelIndex(slicePos);
                     labelIndex = labelModelIndex(slicePos);

src/piechart/qpiemodelmapper_p.h +2 0

             private:
                 QPieSlice* pieSlice(QModelIndex index) const;
+                bool isLabelIndex(QModelIndex index) const;
+                bool isValueIndex(QModelIndex index) const;
                 QModelIndex valueModelIndex(int slicePos);
                 QModelIndex labelModelIndex(int slicePos);
                 void insertData(int start, int end);

tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +31 -2

                 void horizontalMapper();
                 void horizontalMapperCustomMapping_data();
                 void horizontalMapperCustomMapping();
+                void seriesUpdated();
                 private:
                 QCOMPARE(m_series->count(), expectedCount);
-                // change values column mappings to invalid
+                // change values column mapping to invalid
                 mapper->setValuesColumn(-1);
                 mapper->setLabelsColumn(1);
                 QCOMPARE(m_series->count(), expectedCount);
-                // change values column mappings to invalid
+                // change values row mapping to invalid
                 mapper->setValuesRow(-1);
                 mapper->setLabelsRow(1);
                 mapper = 0;
             }
+            void tst_piemodelmapper::seriesUpdated()
+            {
+                QStandardItemModel *otherModel = new QStandardItemModel;
+                for (int row = 0; row < m_modelRowCount; ++row) {
+                    for (int column = 0; column < m_modelColumnCount; column++) {
+                        QStandardItem *item = new QStandardItem(row * column);
+                        otherModel->setItem(row, column, item);
+                    }
+                }
+                QVPieModelMapper *mapper = new QVPieModelMapper;
+                mapper->setValuesColumn(0);
+                mapper->setLabelsColumn(1);
+                mapper->setModel(otherModel);
+                mapper->setSeries(m_series);
+                QCOMPARE(m_series->count(), m_modelRowCount);
+                m_series->append("1000", 1000);
+                QCOMPARE(m_series->count(), m_modelRowCount + 1);
+                m_series->remove(m_series->slices().last());
+                QCOMPARE(m_series->count(), m_modelRowCount);
+                otherModel->clear();
+                delete otherModel;
+                otherModel = 0;
+            }
             QTEST_MAIN(tst_piemodelmapper)
             #include "tst_qpiemodelmapper.moc"

tests/tablemodelchart/tablewidget.cpp +24 -20

                 QPushButton* removeColumnButton = new QPushButton("Remove column");
                 connect(removeColumnButton, SIGNAL(clicked()), this, SLOT(removeColumn()));
-                QPushButton* specialPieButton = new QPushButton("Add slices from series");
+                QPushButton* specialPieButton = new QPushButton("Add slices using series API");
                 connect(specialPieButton, SIGNAL(clicked()), this, SLOT(testPie()));
-                QPushButton* specialPieButton2 = new QPushButton("Remove slices from series");
+                QPushButton* specialPieButton2 = new QPushButton("Remove slices using series API");
                 connect(specialPieButton2, SIGNAL(clicked()), this, SLOT(testPie2()));
-                QPushButton* specialPieButton3 = new QPushButton("Remove slices from series");
+                QPushButton* specialPieButton3 = new QPushButton("Modify slices using series API");
                 connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
                         m_pieMapper->setSeries(m_pieSeries);
                         m_pieMapper->setModel(m_model);
                         m_pieMapper->setFirst(2);
-            //                        m_pieMapper->setCount(5);
+                        //                        m_pieMapper->setCount(5);
                         //                    pieSeries->setModelMapper(mapper);
                         m_pieSeries->setLabelsVisible(true);
-                        m_pieSeries->setPieSize(0.75);
+                        m_pieSeries->setPieSize(0.35);
-                        //            pieSeries->setHorizontalPosition(0.2);
+                        m_pieSeries->setHorizontalPosition(0.25);
-                        //            pieSeries->setVerticalPosition(0.3);
+                        m_pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(m_pieSeries);
                         seriesColorHex = "#" + QString::number(m_pieSeries->slices().at(m_pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
-                        m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 5));
+                        m_model->addMapping(seriesColorHex, QRect(1, 2, 1, 50));
                         //                            pieSeries->slices().at(0)->setValue(400);
                         //                            pieSeries->slices().at(0)->setLabel(QString("36"));
-                        //            // pie 2
+                        // pie 2
-                        //            pieSeries = new QPieSeries;
+                        m_pieSeries2 = new QPieSeries;
-                        //            pieSeries->setModel(m_model);
-                        //            pieSeries->setModelMapping(1,1, Qt::Vertical);
+                        m_pieMapper = new QVPieModelMapper;
-                        //            pieSeries->setModelMappingRange(2, -1);
+                        m_pieMapper->setValuesColumn(0);
-                        //            pieSeries->setLabelsVisible(true);
+                        m_pieMapper->setLabelsColumn(7);
-                        //            pieSeries->setPieSize(0.35);
+                        m_pieMapper->setSeries(m_pieSeries2);
-                        //            pieSeries->setHorizontalPosition(0.8);
+                        m_pieMapper->setModel(m_model);
-                        //            pieSeries->setVerticalPosition(0.3);
+                        m_pieMapper->setFirst(2);
-                        //            m_chart->addSeries(pieSeries);
-                        //            seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
+                        m_pieSeries2->setLabelsVisible(true);
-                        //            m_model->addMapping(seriesColorHex, QRect(1, 2, 1, 1000));
+                        m_pieSeries2->setPieSize(0.35);
+                        m_pieSeries2->setHorizontalPosition(0.75);
+                        m_pieSeries2->setVerticalPosition(0.65);
+                        m_chart->addSeries(m_pieSeries2);
+                        seriesColorHex = "#" + QString::number(m_pieSeries2->slices().at(m_pieSeries2->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
+                        m_model->addMapping(seriesColorHex, QRect(0, 2, 1, 1000));
                         //            // pie 3
                         //            pieSeries = new QPieSeries;

tests/tablemodelchart/tablewidget.h +2 0

                 QSpinBox* m_linesCountSpinBox;
                 QVPieModelMapper *m_pieMapper;
                 QPieSeries* m_pieSeries;
+                QVPieModelMapper *m_pieMapper2;
+                QPieSeries* m_pieSeries2;
             //    QPieSeries* specialPie;
             };

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