HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1194:d962cd819f79

Renamed appendBarSet to append, removeBarSet to remove

sauimone -

r1194:d962cd819f79

parent child

Context file:

r1194:d962cd819f79

Collapse all files

demos/chartthemes/themewidget.cpp +1 -1

                     QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                     foreach (Data data, m_dataTable[i])
                         *set << data.first.y();
-                    series->appendBarSet(set);
+                    series->append(set);
                 }
                 chart->addSeries(series);

examples/barchart/main.cpp +5 -5

             //![3]
                 QBarSeries* series = new QBarSeries();
                 series->setCategories(categories);
-                series->appendBarSet(set0);
+                series->append(set0);
-                series->appendBarSet(set1);
+                series->append(set1);
-                series->appendBarSet(set2);
+                series->append(set2);
-                series->appendBarSet(set3);
+                series->append(set3);
-                series->appendBarSet(set4);
+                series->append(set4);
             //![3]

examples/groupedbarchart/main.cpp +5 -5

             //![3]
                 QGroupedBarSeries* series = new QGroupedBarSeries();
                 series->setCategories(categories);
-                series->appendBarSet(set0);
+                series->append(set0);
-                series->appendBarSet(set1);
+                series->append(set1);
-                series->appendBarSet(set2);
+                series->append(set2);
-                series->appendBarSet(set3);
+                series->append(set3);
-                series->appendBarSet(set4);
+                series->append(set4);
             //![3]

examples/percentbarchart/main.cpp +5 -5

             //![3]
                 QPercentBarSeries* series = new QPercentBarSeries();
                 series->setCategories(categories);
-                series->appendBarSet(set0);
+                series->append(set0);
-                series->appendBarSet(set1);
+                series->append(set1);
-                series->appendBarSet(set2);
+                series->append(set2);
-                series->appendBarSet(set3);
+                series->append(set3);
-                series->appendBarSet(set4);
+                series->append(set4);
             //![3]
             //![4]

examples/stackedbarchart/main.cpp +5 -5

             //![3]
                 QStackedBarSeries* series = new QStackedBarSeries();
                 series->setCategories(categories);
-                series->appendBarSet(set0);
+                series->append(set0);
-                series->appendBarSet(set1);
+                series->append(set1);
-                series->appendBarSet(set2);
+                series->append(set2);
-                series->appendBarSet(set3);
+                series->append(set3);
-                series->appendBarSet(set4);
+                series->append(set4);
             //![3]
             //![4]

examples/stackedbarchartdrilldown/main.cpp +2 -2

                         foreach (QString week, weeks )
                             *weeklyCrop << (qrand() % 20);
                         // Get the drilldown series from season series and add crop to it.
-                        seasonSeries->drilldownSeries(month)->appendBarSet(weeklyCrop);
+                        seasonSeries->drilldownSeries(month)->append(weeklyCrop);
                         *monthlyCrop << weeklyCrop->sum();
                     }
-                    seasonSeries->appendBarSet(monthlyCrop);
+                    seasonSeries->append(monthlyCrop);
                 }
             //! [5]

src/barchart/qbarseries.cpp +6 -6

             /*!
                 Adds a set of bars to series. Takes ownership of \a set.
             */
-            bool QBarSeries::appendBarSet(QBarSet *set)
+            bool QBarSeries::append(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 if ((d->m_barSets.contains(set)) || (set == 0)) {
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
             */
-            bool QBarSeries::removeBarSet(QBarSet *set)
+            bool QBarSeries::remove(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 if (!d->m_barSets.contains(set)) {
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
             */
-            bool QBarSeries::appendBarSets(QList<QBarSet* > sets)
+            bool QBarSeries::append(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 foreach (QBarSet* set, sets) {
             /*!
                 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
             */
-            bool QBarSeries::removeBarSets(QList<QBarSet* > sets)
+            bool QBarSeries::remove(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + rowCount; m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
-                        q->appendBarSet(barSet);
+                        q->append(barSet);
                     }
                 } else {
                     if (m_mapCategories >= m_model->rowCount())
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + columnCount; m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
-                        q->appendBarSet(barSet);
+                        q->append(barSet);
                     }
                 }
                 emit restructuredBars();

src/barchart/qbarseries.h +4 -4

                 QAbstractSeries::SeriesType type() const;
                 void setCategories(QBarCategories categories);
-                bool appendBarSet(QBarSet *set);            // Takes ownership of set
+                bool append(QBarSet *set);            // Takes ownership of set
-                bool removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
+                bool remove(QBarSet *set);            // Releases ownership, doesn't delete set
-                bool appendBarSets(QList<QBarSet* > sets);
+                bool append(QList<QBarSet* > sets);
-                bool removeBarSets(QList<QBarSet* > sets);
+                bool remove(QList<QBarSet* > sets);
                 int barsetCount() const;
                 int categoryCount() const;
                 QList<QBarSet*> barSets() const;

test/auto/qbarseries/tst_qbarseries.cpp +42 -42

                 void type();
                 void setCategories_data();
                 void setCategories();
-                void appendBarSet_data();
+                void append_data();
-                void appendBarSet();
+                void append();
-                void removeBarSet_data();
+                void remove_data();
-                void removeBarSet();
+                void remove();
-                void appendBarSets_data();
+                void appendList_data();
-                void appendBarSets();
+                void appendList();
-                void removeBarSets_data();
+                void removeList_data();
-                void removeBarSets();
+                void removeList();
                 void barsetCount_data();
                 void barsetCount();
                 void categoryCount_data();
                 for (int i=0; i<5; i++) {
                     m_testSets.append(new QBarSet("testset"));
-                    m_barseries_with_sets->appendBarSet(m_testSets.at(i));
+                    m_barseries_with_sets->append(m_testSets.at(i));
                 }
             }
             void tst_QBarSeries::cleanup()
             {
                 foreach(QBarSet* s, m_testSets) {
-                    m_barseries_with_sets->removeBarSet(s);
+                    m_barseries_with_sets->remove(s);
                     delete s;
                 }
                 m_testSets.clear();
                 }
             }
-            void tst_QBarSeries::appendBarSet_data()
+            void tst_QBarSeries::append_data()
             {
             }
-            void tst_QBarSeries::appendBarSet()
+            void tst_QBarSeries::append()
             {
                 QVERIFY(m_barseries->barsetCount() == 0);
                 // Try adding barset
                 QBarSet *barset = new QBarSet("testset");
-                ret = m_barseries->appendBarSet(barset);
+                ret = m_barseries->append(barset);
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries->barsetCount() == 1);
                 // Try adding another set
                 QBarSet *barset2 = new QBarSet("testset2");
-                ret = m_barseries->appendBarSet(barset2);
+                ret = m_barseries->append(barset2);
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries->barsetCount() == 2);
                 // Try adding same set again
-                ret = m_barseries->appendBarSet(barset2);
+                ret = m_barseries->append(barset2);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries->barsetCount() == 2);
                 // Try adding null set
-                ret = m_barseries->appendBarSet(0);
+                ret = m_barseries->append(0);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries->barsetCount() == 2);
             }
-            void tst_QBarSeries::removeBarSet_data()
+            void tst_QBarSeries::remove_data()
             {
             }
-            void tst_QBarSeries::removeBarSet()
+            void tst_QBarSeries::remove()
             {
                 int count = m_testSets.count();
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 // Try to remove null pointer (should not remove, should not crash)
                 bool ret = false;
-                ret = m_barseries_with_sets->removeBarSet(0);
+                ret = m_barseries_with_sets->remove(0);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 // Try to remove invalid pointer (should not remove, should not crash)
-                ret = m_barseries_with_sets->removeBarSet((QBarSet*) (m_testSets.at(0) + 1) );
+                ret = m_barseries_with_sets->remove((QBarSet*) (m_testSets.at(0) + 1) );
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 // remove some sets
-                ret = m_barseries_with_sets->removeBarSet(m_testSets.at(2));
+                ret = m_barseries_with_sets->remove(m_testSets.at(2));
                 QVERIFY(ret == true);
-                ret = m_barseries_with_sets->removeBarSet(m_testSets.at(3));
+                ret = m_barseries_with_sets->remove(m_testSets.at(3));
                 QVERIFY(ret == true);
-                ret = m_barseries_with_sets->removeBarSet(m_testSets.at(4));
+                ret = m_barseries_with_sets->remove(m_testSets.at(4));
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries_with_sets->barsetCount() == 2);
                 // Try removing all sets again (should be ok, even if some sets have already been removed)
                 ret = false;
                 for (int i=0; i<count; i++) {
-                    ret |= m_barseries_with_sets->removeBarSet(m_testSets.at(i));
+                    ret |= m_barseries_with_sets->remove(m_testSets.at(i));
                 }
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
             }
-            void tst_QBarSeries::appendBarSets_data()
+            void tst_QBarSeries::appendList_data()
             {
             }
-            void tst_QBarSeries::appendBarSets()
+            void tst_QBarSeries::appendList()
             {
                 int count = 5;
                 QVERIFY(m_barseries->barsetCount() == 0);
                 // Append new sets (should succeed, count should match the count of sets)
                 bool ret = false;
-                ret = m_barseries->appendBarSets(sets);
+                ret = m_barseries->append(sets);
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries->barsetCount() == count);
                 // Append same sets again (should fail, count should remain same)
-                ret = m_barseries->appendBarSets(sets);
+                ret = m_barseries->append(sets);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries->barsetCount() == count);
                 // Try append empty list (should succeed, but count should remain same)
                 QList<QBarSet*> invalidList;
-                ret = m_barseries->appendBarSets(invalidList);
+                ret = m_barseries->append(invalidList);
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries->barsetCount() == count);
                 // Try append list with one new and one existing set (should fail, count remains same)
                 invalidList.append(new QBarSet("ok set"));
                 invalidList.append(sets.at(0));
-                ret = m_barseries->appendBarSets(invalidList);
+                ret = m_barseries->append(invalidList);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries->barsetCount() == count);
                 invalidList2.append(0);
                 invalidList2.append(0);
                 invalidList2.append(0);
-                ret = m_barseries->appendBarSets(invalidList2);
+                ret = m_barseries->append(invalidList2);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries->barsetCount() == count);
             }
-            void tst_QBarSeries::removeBarSets_data()
+            void tst_QBarSeries::removeList_data()
             {
             }
-            void tst_QBarSeries::removeBarSets()
+            void tst_QBarSeries::removeList()
             {
                 int count = m_testSets.count();
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 // Try removing empty list of sets (should return false, since no barsets were removed)
                 bool ret = false;
                 QList<QBarSet*> invalidList;
-                ret = m_barseries_with_sets->removeBarSets(invalidList);
+                ret = m_barseries_with_sets->remove(invalidList);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 invalidList.append(0);
                 // Try removing null pointers from list (should return false, should not crash, should not remove anything)
-                ret = m_barseries_with_sets->removeBarSets(invalidList);
+                ret = m_barseries_with_sets->remove(invalidList);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == count);
                 // remove all sets (should return true, since sets were removed)
-                ret = m_barseries_with_sets->removeBarSets(m_testSets);
+                ret = m_barseries_with_sets->remove(m_testSets);
                 QVERIFY(ret == true);
                 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
                 // Try removing invalid list again (should return false, since no barsets were removed)
-                ret = m_barseries_with_sets->removeBarSets(invalidList);
+                ret = m_barseries_with_sets->remove(invalidList);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
                 // remove all sets again (should return false, since barsets were already removed)
-                ret = m_barseries_with_sets->removeBarSets(m_testSets);
+                ret = m_barseries_with_sets->remove(m_testSets);
                 QVERIFY(ret == false);
                 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
             }
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << QPointF(0.5,10) << QPointF(1.5,10) << QPointF(2.5,10);
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(clicked(QString)));
                 QSignalSpy setSpy2(set2, SIGNAL(clicked(QString)));
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10);
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << QPointF(0.4,10) << QPointF(1.4,10) << QPointF(2.4,10);
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
                 QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));

test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +4 -4

                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(clicked(QString)));
                 QSignalSpy setSpy2(set2, SIGNAL(clicked(QString)));
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
                 QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));

test/auto/qpercentbarseries/tst_qpercentbarseries.cpp +4 -4

                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(clicked(QString)));
                 QSignalSpy setSpy2(set2, SIGNAL(clicked(QString)));
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
                 QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));

test/auto/qstackedbarseries/tst_qstackedbarseries.cpp +4 -4

                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(clicked(QString)));
                 QSignalSpy setSpy2(set2, SIGNAL(clicked(QString)));
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
-                series->appendBarSet(set1);
+                series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << 10 << 10 << 10;
-                series->appendBarSet(set2);
+                series->append(set2);
                 QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
                 QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));

test/chartwidgettest/mainwidget.cpp +1 -1

                         QBarSet *set = new QBarSet("set" + QString::number(j));
                         for (int i(0); i < column.count(); i++)
                             *set << column.at(i);
-                        series->appendBarSet(set);
+                        series->append(set);
                     }
                     m_chart->addSeries(series);

test/gdpbarchart/widget.cpp +1 -1

                                 qDebug() << "Putting 0 for the missing data" << " : " << QString("%1").arg(selectedYearsInts[i]);
                             }
                         }
-                        series0->appendBarSet(barSet);
+                        series0->append(barSet);
                     }
                     // add the serie to the chart
                     chartView->chart()->addSeries(series0);

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