diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp index 171dff6..6f93a2f 100644 --- a/demos/chartthemes/themewidget.cpp +++ b/demos/chartthemes/themewidget.cpp @@ -259,7 +259,7 @@ QChart* ThemeWidget::createPieChart() const 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(); diff --git a/demos/piechartcustomization/customslice.cpp b/demos/piechartcustomization/customslice.cpp index bc01efd..7cf2a25 100644 --- a/demos/piechartcustomization/customslice.cpp +++ b/demos/piechartcustomization/customslice.cpp @@ -22,8 +22,8 @@ QTCOMMERCIALCHART_USE_NAMESPACE -CustomSlice::CustomSlice(qreal value, QString label) - :QPieSlice(value, label) +CustomSlice::CustomSlice(QString label, qreal value) + :QPieSlice(label, value) { connect(this, SIGNAL(hovered(bool)), this, SLOT(showHighlight(bool))); } diff --git a/demos/piechartcustomization/customslice.h b/demos/piechartcustomization/customslice.h index dd451aa..7192fbb 100644 --- a/demos/piechartcustomization/customslice.h +++ b/demos/piechartcustomization/customslice.h @@ -29,7 +29,7 @@ class CustomSlice : public QPieSlice Q_OBJECT public: - CustomSlice(qreal value, QString label); + CustomSlice(QString label, qreal value); public: QBrush originalBrush(); diff --git a/demos/piechartcustomization/mainwidget.cpp b/demos/piechartcustomization/mainwidget.cpp index 4f0c251..b65e862 100644 --- a/demos/piechartcustomization/mainwidget.cpp +++ b/demos/piechartcustomization/mainwidget.cpp @@ -45,11 +45,11 @@ MainWidget::MainWidget(QWidget* parent) // create series m_series = new QPieSeries(); - *m_series << new CustomSlice(10.0, "Slice 1"); - *m_series << new CustomSlice(20.0, "Slice 2"); - *m_series << new CustomSlice(30.0, "Slice 3"); - *m_series << new CustomSlice(40.0, "Slice 4"); - *m_series << new CustomSlice(50.0, "Slice 5"); + *m_series << new CustomSlice("Slice 1", 10.0); + *m_series << new CustomSlice("Slice 2", 20.0); + *m_series << new CustomSlice("Slice 3", 30.0); + *m_series << new CustomSlice("Slice 4", 40.0); + *m_series << new CustomSlice("Slice 5", 50.0); m_series->setLabelsVisible(); chart->addSeries(m_series); @@ -304,7 +304,7 @@ void MainWidget::showFontDialog() 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() @@ -314,7 +314,7 @@ 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() diff --git a/examples/piechart/main.cpp b/examples/piechart/main.cpp index 6206073..50045f3 100644 --- a/examples/piechart/main.cpp +++ b/examples/piechart/main.cpp @@ -32,11 +32,11 @@ int main(int argc, char *argv[]) //![1] QPieSeries *series = new QPieSeries(); - series->append(1, "Jane"); - series->append(2, "Joe"); - series->append(3, "Andy"); - series->append(4, "Barbara"); - series->append(5, "Axel"); + series->append("Jane", 1); + series->append("Joe", 2); + series->append("Andy", 3); + series->append("Barbara", 4); + series->append("Axel", 5); //![1] //![2] diff --git a/plugins/declarative/declarativepieseries.cpp b/plugins/declarative/declarativepieseries.cpp index ee98e13..c906365 100644 --- a/plugins/declarative/declarativepieseries.cpp +++ b/plugins/declarative/declarativepieseries.cpp @@ -81,7 +81,7 @@ QPieSlice* DeclarativePieSeries::find(QString label) 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) diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 0ce2106..efc3577 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -191,12 +191,12 @@ QPieSeries& QPieSeries::operator << (QPieSlice* slice) /*! - 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; } @@ -737,7 +737,7 @@ void QPieSeriesPrivate::initializePieFromModel() 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 @@ -748,7 +748,7 @@ void QPieSeriesPrivate::initializePieFromModel() 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); } diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h index 1d8dd26..3c03d0e 100644 --- a/src/piechart/qpieseries.h +++ b/src/piechart/qpieseries.h @@ -48,7 +48,7 @@ public: bool append(QPieSlice* slice); bool append(QList 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(); diff --git a/src/piechart/qpieslice.cpp b/src/piechart/qpieslice.cpp index 3507560..2e83523 100644 --- a/src/piechart/qpieslice.cpp +++ b/src/piechart/qpieslice.cpp @@ -68,7 +68,7 @@ QPieSlice::QPieSlice(QObject *parent) 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()) { diff --git a/src/piechart/qpieslice.h b/src/piechart/qpieslice.h index 9f382c0..114d9b8 100644 --- a/src/piechart/qpieslice.h +++ b/src/piechart/qpieslice.h @@ -39,7 +39,7 @@ class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject 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); diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 9ca0b1b..7a448bb 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -101,7 +101,7 @@ void tst_qpieseries::append() // 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); @@ -112,19 +112,19 @@ void tst_qpieseries::append() list << (QPieSlice *) 0; QVERIFY(!s.append(list)); list.clear(); - list << new QPieSlice(2, "slice 2"); - list << new QPieSlice(3, "slice 3"); + list << new QPieSlice("slice 2", 2); + 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")); @@ -145,7 +145,7 @@ void tst_qpieseries::insert() // 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)); @@ -153,12 +153,12 @@ void tst_qpieseries::insert() QCOMPARE(s.count(), 1); // add some more slices - s.append(2, "slice 2"); - s.append(4, "slice 4"); + s.append("slice 2", 2); + 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 @@ -173,9 +173,9 @@ void tst_qpieseries::remove() QPieSeries s; // add some slices - QPieSlice *slice1 = s.append(1, "slice 1"); - QPieSlice *slice2 = s.append(2, "slice 2"); - QPieSlice *slice3 = s.append(3, "slice 3"); + QPieSlice *slice1 = s.append("slice 1", 1); + QPieSlice *slice2 = s.append("slice 2", 2); + QPieSlice *slice3 = s.append("slice 3", 3); QSignalSpy spy1(slice1, SIGNAL(destroyed())); QSignalSpy spy2(slice2, SIGNAL(destroyed())); QSignalSpy spy3(slice3, SIGNAL(destroyed())); @@ -208,15 +208,15 @@ void tst_qpieseries::calculatedValues() 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 list; - list << new QPieSlice(2, "slice 2"); - list << new QPieSlice(3, "slice 3"); + list << new QPieSlice("slice 2", 2); + list << new QPieSlice("slice 3", 3); s.append(list); verifyCalculatedData(s, &ok); if (!ok) @@ -229,7 +229,7 @@ void tst_qpieseries::calculatedValues() 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; @@ -271,9 +271,9 @@ void tst_qpieseries::clickedSignal() // create a pie series QPieSeries *series = new QPieSeries(); series->setPieSize(1.0); - QPieSlice *s1 = series->append(1, "slice 1"); - series->append(2, "slice 2"); - series->append(3, "slice 3"); + QPieSlice *s1 = series->append("slice 1", 1); + series->append("slice 2", 2); + series->append("slice 3", 3); QSignalSpy clickSpy1(series, SIGNAL(clicked(QPieSlice*))); // add series to the chart @@ -296,9 +296,9 @@ void tst_qpieseries::hoverSignal() // create a pie series QPieSeries *series = new QPieSeries(); series->setPieSize(1.0); - QPieSlice *s1 = series->append(1, "slice 1"); - series->append(2, "slice 2"); - series->append(3, "slice 3"); + QPieSlice *s1 = series->append("slice 1", 1); + series->append("slice 2", 2); + series->append("slice 3", 3); // add series to the chart QChartView view(new QChart()); diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 02a6565..5123970 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -88,7 +88,7 @@ void tst_qpieslice::construction() 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()); @@ -136,9 +136,9 @@ void tst_qpieslice::customize() { // create a pie series QPieSeries *series = new QPieSeries(); - QPieSlice *s1 = series->append(1, "slice 1"); - QPieSlice *s2 = series->append(2, "slice 2"); - series->append(3, "slice 3"); + QPieSlice *s1 = series->append("slice 1", 1); + QPieSlice *s2 = series->append("slice 2", 2); + series->append("slice 3", 3); // customize a slice QPen p1(Qt::red); @@ -171,14 +171,14 @@ void tst_qpieslice::customize() 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); @@ -198,9 +198,9 @@ void tst_qpieslice::mouseClick() // create a pie series QPieSeries *series = new QPieSeries(); series->setPieSize(1.0); - QPieSlice *s1 = series->append(1, "slice 1"); - QPieSlice *s2 = series->append(2, "slice 2"); - QPieSlice *s3 = series->append(3, "slice 3"); + QPieSlice *s1 = series->append("slice 1", 1); + QPieSlice *s2 = series->append("slice 2", 2); + QPieSlice *s3 = series->append("slice 3", 3); QSignalSpy clickSpy1(s1, SIGNAL(clicked())); QSignalSpy clickSpy2(s2, SIGNAL(clicked())); QSignalSpy clickSpy3(s3, SIGNAL(clicked())); @@ -231,9 +231,9 @@ void tst_qpieslice::mouseHover() // create a pie series QPieSeries *series = new QPieSeries(); series->setPieSize(1.0); - QPieSlice *s1 = series->append(1, "slice 1"); - series->append(2, "slice 2"); - series->append(3, "slice 3"); + QPieSlice *s1 = series->append("slice 1", 1); + series->append("slice 2", 2); + series->append("slice 3", 3); // add series to the chart QChartView view(new QChart()); diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index 8963887..519e944 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -261,7 +261,7 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS QPieSeries *series = new QPieSeries(); QList 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"