HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1206:080b090a9a03

pie: change the order of parameters when creating slices to be more intuitive

Jani Honkonen -

r1206:080b090a9a03

parent child

Context file:

r1206:080b090a9a03

Collapse all files

demos/chartthemes/themewidget.cpp +1 -1

                 for (int i = 0; i < m_dataTable.count(); i++) {
                     QPieSeries *series = new QPieSeries(chart);
                     foreach (Data data, m_dataTable[i]) {
-                        QPieSlice *slice = series->append(data.first.y(), data.second);
+                        QPieSlice *slice = series->append(data.second, data.first.y());
                         if (data == m_dataTable[i].first()) {
                             slice->setLabelVisible();
                             slice->setExploded();

demos/piechartcustomization/customslice.cpp +2 -2

             QTCOMMERCIALCHART_USE_NAMESPACE
-            CustomSlice::CustomSlice(qreal value, QString label)
+            CustomSlice::CustomSlice(QString label, qreal value)
-                :QPieSlice(value, label)
+                :QPieSlice(label, value)
             {
                 connect(this, SIGNAL(hovered(bool)), this, SLOT(showHighlight(bool)));
             }

demos/piechartcustomization/customslice.h +1 -1

                 Q_OBJECT
             public:
-                CustomSlice(qreal value, QString label);
+                CustomSlice(QString label, qreal value);
             public:
                 QBrush originalBrush();

demos/piechartcustomization/mainwidget.cpp +7 -7

                 // create series
                 m_series = new QPieSeries();
-                *m_series << new CustomSlice(10.0, "Slice 1");
+                *m_series << new CustomSlice("Slice 1", 10.0);
-                *m_series << new CustomSlice(20.0, "Slice 2");
+                *m_series << new CustomSlice("Slice 2", 20.0);
-                *m_series << new CustomSlice(30.0, "Slice 3");
+                *m_series << new CustomSlice("Slice 3", 30.0);
-                *m_series << new CustomSlice(40.0, "Slice 4");
+                *m_series << new CustomSlice("Slice 4", 40.0);
-                *m_series << new CustomSlice(50.0, "Slice 5");
+                *m_series << new CustomSlice("Slice 5", 50.0);
                 m_series->setLabelsVisible();
                 chart->addSeries(m_series);
             void MainWidget::appendSlice()
             {
-                *m_series << new CustomSlice(10.0, "Slice " + QString::number(m_series->count()+1));
+                *m_series << new CustomSlice("Slice " + QString::number(m_series->count()+1), 10.0);
             }
             void MainWidget::insertSlice()
                 int i = m_series->slices().indexOf(m_slice);
-                m_series->insert(i, new CustomSlice(10.0, "Slice " + QString::number(m_series->count()+1)));
+                m_series->insert(i, new CustomSlice("Slice " + QString::number(m_series->count()+1), 10.0));
             }
             void MainWidget::removeSlice()

examples/piechart/main.cpp +5 -5

             //![1]
                 QPieSeries *series = new QPieSeries();
-                series->append(1, "Jane");
+                series->append("Jane", 1);
-                series->append(2, "Joe");
+                series->append("Joe", 2);
-                series->append(3, "Andy");
+                series->append("Andy", 3);
-                series->append(4, "Barbara");
+                series->append("Barbara", 4);
-                series->append(5, "Axel");
+                series->append("Axel", 5);
             //![1]
             //![2]

plugins/declarative/declarativepieseries.cpp +1 -1

             QPieSlice* DeclarativePieSeries::append(QString name, qreal value)
             {
                 // TODO: parameter order is wrong, switch it:
-                return QPieSeries::append(value, name);
+                return QPieSeries::append(name, value);
             }
             void DeclarativePieSeries::setPieModel(DeclarativeTableModel *model)

src/piechart/qpieseries.cpp +5 -5

             /*!
-                Appends a single slice to the series with give \a value and \a name.
+                Appends a single slice to the series with give \a value and \a label.
                 Slice ownership is passed to the series.
             */
-            QPieSlice* QPieSeries::append(qreal value, QString name)
+            QPieSlice* QPieSeries::append(QString label, qreal value)
             {
-                QPieSlice* slice = new QPieSlice(value, name);
+                QPieSlice* slice = new QPieSlice(label, value);
                 append(slice);
                 return slice;
             }
                     else
                         sliceCount = qMin(m_mapper->count(), m_model->rowCount() - m_mapper->first());
                     for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
-                        q->append(m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString());
+                        q->append(m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString(), m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble());
                 } else {
                     if (m_mapper->mapValues() >= m_model->rowCount() || m_mapper->mapLabels() >= m_model->rowCount())
                         return;   // mapped columns are not existing
                     else
                         sliceCount = qMin(m_mapper->count(), m_model->columnCount() - m_mapper->first());
                     for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
-                        q->append(m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
+                        q->append(m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString(), m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble());
                 }
                 q->setLabelsVisible(true);
             }

src/piechart/qpieseries.h +1 -1

                 bool append(QPieSlice* slice);
                 bool append(QList<QPieSlice*> slices);
                 QPieSeries& operator << (QPieSlice* slice);
-                QPieSlice* append(qreal value, QString name);
+                QPieSlice* append(QString label, qreal value);
                 bool insert(int index, QPieSlice* slice);
                 bool remove(QPieSlice* slice);
                 void clear();

src/piechart/qpieslice.cpp +1 -1

                 Constructs an empty slice with given \a value, \a label and a \a parent.
                 \sa QPieSeries::append(), QPieSeries::insert()
             */
-            QPieSlice::QPieSlice(qreal value, QString label, QObject *parent)
+            QPieSlice::QPieSlice(QString label, qreal value, QObject *parent)
                 :QObject(parent),
                 d(new PieSliceData())
             {

src/piechart/qpieslice.h +1 -1

             public:
                 explicit QPieSlice(QObject *parent = 0);
-                QPieSlice(qreal value, QString label, QObject *parent = 0);
+                QPieSlice(QString label, qreal value, QObject *parent = 0);
                 virtual ~QPieSlice();
                 void setValue(qreal value);

tests/auto/qpieseries/tst_qpieseries.cpp +22 -22

                 // append pointer
                 QPieSlice *slice1 = 0;
                 QVERIFY(!s.append(slice1));
-                slice1 = new QPieSlice(1, "slice 1");
+                slice1 = new QPieSlice("slice 1", 1);
                 QVERIFY(s.append(slice1));
                 QVERIFY(!s.append(slice1));
                 QCOMPARE(s.count(), 1);
                 list << (QPieSlice *) 0;
                 QVERIFY(!s.append(list));
                 list.clear();
-                list << new QPieSlice(2, "slice 2");
+                list << new QPieSlice("slice 2", 2);
-                list << new QPieSlice(3, "slice 3");
+                list << new QPieSlice("slice 3", 3);
                 QVERIFY(s.append(list));
                 QVERIFY(!s.append(list));
                 QCOMPARE(s.count(), 3);
                 // append operator
-                s << new QPieSlice(4, "slice 4");
+                s << new QPieSlice("slice 4", 4);
                 s << slice1; // fails because already added
                 QCOMPARE(s.count(), 4);
                 // append with params
-                QPieSlice *slice5 = s.append(5, "slice 5");
+                QPieSlice *slice5 = s.append("slice 5", 5);
                 QVERIFY(slice5 != 0);
                 QCOMPARE(slice5->value(), 5.0);
                 QCOMPARE(slice5->label(), QString("slice 5"));
                 // insert one slice
                 QPieSlice *slice1 = 0;
                 QVERIFY(!s.insert(0, slice1));
-                slice1 = new QPieSlice(1, "slice 1");
+                slice1 = new QPieSlice("slice 1", 1);
                 QVERIFY(!s.insert(-1, slice1));
                 QVERIFY(!s.insert(5, slice1));
                 QVERIFY(s.insert(0, slice1));
                 QCOMPARE(s.count(), 1);
                 // add some more slices
-                s.append(2, "slice 2");
+                s.append("slice 2", 2);
-                s.append(4, "slice 4");
+                s.append("slice 4", 4);
                 QCOMPARE(s.count(), 3);
                 // insert between slices
-                s.insert(2, new QPieSlice(3, "slice 3"));
+                s.insert(2, new QPieSlice("slice 3", 3));
                 QCOMPARE(s.count(), 4);
                 // check slices
                 QPieSeries s;
                 // add some slices
-                QPieSlice *slice1 = s.append(1, "slice 1");
+                QPieSlice *slice1 = s.append("slice 1", 1);
-                QPieSlice *slice2 = s.append(2, "slice 2");
+                QPieSlice *slice2 = s.append("slice 2", 2);
-                QPieSlice *slice3 = s.append(3, "slice 3");
+                QPieSlice *slice3 = s.append("slice 3", 3);
                 QSignalSpy spy1(slice1, SIGNAL(destroyed()));
                 QSignalSpy spy2(slice2, SIGNAL(destroyed()));
                 QSignalSpy spy3(slice3, SIGNAL(destroyed()));
                 QPieSeries s;
                 // add a slice
-                QPieSlice *slice1 = s.append(1, "slice 1");
+                QPieSlice *slice1 = s.append("slice 1", 1);
                 verifyCalculatedData(s, &ok);
                 if (!ok)
                     return;
                 // add some more slices
                 QList<QPieSlice *> list;
-                list << new QPieSlice(2, "slice 2");
+                list << new QPieSlice("slice 2", 2);
-                list << new QPieSlice(3, "slice 3");
+                list << new QPieSlice("slice 3", 3);
                 s.append(list);
                 verifyCalculatedData(s, &ok);
                 if (!ok)
                     return;
                 // insert a slice
-                s.insert(0, new QPieSlice(1, "Slice 4"));
+                s.insert(0, new QPieSlice("Slice 4", 4));
                 verifyCalculatedData(s, &ok);
                 if (!ok)
                     return;
                 // create a pie series
                 QPieSeries *series = new QPieSeries();
                 series->setPieSize(1.0);
-                QPieSlice *s1 = series->append(1, "slice 1");
+                QPieSlice *s1 = series->append("slice 1", 1);
-                series->append(2, "slice 2");
+                series->append("slice 2", 2);
-                series->append(3, "slice 3");
+                series->append("slice 3", 3);
                 QSignalSpy clickSpy1(series, SIGNAL(clicked(QPieSlice*)));
                 // add series to the chart
                 // create a pie series
                 QPieSeries *series = new QPieSeries();
                 series->setPieSize(1.0);
-                QPieSlice *s1 = series->append(1, "slice 1");
+                QPieSlice *s1 = series->append("slice 1", 1);
-                series->append(2, "slice 2");
+                series->append("slice 2", 2);
-                series->append(3, "slice 3");
+                series->append("slice 3", 3);
                 // add series to the chart
                 QChartView view(new QChart());

tests/auto/qpieslice/tst_qpieslice.cpp +12 -12

                 QCOMPARE(slice1.endAngle(), 0.0);
                 // value and label params
-                QPieSlice slice2(1.0, "foobar");
+                QPieSlice slice2("foobar", 1.0);
                 QCOMPARE(slice2.value(), 1.0);
                 QCOMPARE(slice2.label(), QString("foobar"));
                 QVERIFY(!slice2.isLabelVisible());
             {
                 // create a pie series
                 QPieSeries *series = new QPieSeries();
-                QPieSlice *s1 = series->append(1, "slice 1");
+                QPieSlice *s1 = series->append("slice 1", 1);
-                QPieSlice *s2 = series->append(2, "slice 2");
+                QPieSlice *s2 = series->append("slice 2", 2);
-                series->append(3, "slice 3");
+                series->append("slice 3", 3);
                 // customize a slice
                 QPen p1(Qt::red);
                 QCOMPARE(s1->labelFont(), f1);
                 // add a slice
-                series->append(4, "slice 4");
+                series->append("slice 4", 4);
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
                 QCOMPARE(s1->labelPen(), p1);
                 QCOMPARE(s1->labelFont(), f1);
                 // insert a slice
-                series->insert(0, new QPieSlice(5, "slice 5"));
+                series->insert(0, new QPieSlice("slice 5", 5));
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
                 QCOMPARE(s1->labelPen(), p1);
                 // create a pie series
                 QPieSeries *series = new QPieSeries();
                 series->setPieSize(1.0);
-                QPieSlice *s1 = series->append(1, "slice 1");
+                QPieSlice *s1 = series->append("slice 1", 1);
-                QPieSlice *s2 = series->append(2, "slice 2");
+                QPieSlice *s2 = series->append("slice 2", 2);
-                QPieSlice *s3 = series->append(3, "slice 3");
+                QPieSlice *s3 = series->append("slice 3", 3);
                 QSignalSpy clickSpy1(s1, SIGNAL(clicked()));
                 QSignalSpy clickSpy2(s2, SIGNAL(clicked()));
                 QSignalSpy clickSpy3(s3, SIGNAL(clicked()));
                 // create a pie series
                 QPieSeries *series = new QPieSeries();
                 series->setPieSize(1.0);
-                QPieSlice *s1 = series->append(1, "slice 1");
+                QPieSlice *s1 = series->append("slice 1", 1);
-                series->append(2, "slice 2");
+                series->append("slice 2", 2);
-                series->append(3, "slice 3");
+                series->append("slice 3", 3);
                 // add series to the chart
                 QChartView view(new QChart());

tests/chartwidgettest/mainwidget.cpp +1 -1

                         QPieSeries *series = new QPieSeries();
                         QList<qreal> column = data.at(j);
                         for (int i(0); i < column.count(); i++)
-                            series->append(column.at(i), labels.at(i));
+                            series->append(labels.at(i), column.at(i));
                         m_chart->addSeries(series);
                     }
                 } else if (seriesName == "Bar"

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