From a8ed8052414ff834a84745b4d51a99a4a42feb25 2012-02-24 09:27:21 From: Tero Ahola Date: 2012-02-24 09:27:21 Subject: [PATCH] Documenting QChartSeries continues --- diff --git a/qmlplugin/declarativeseries.cpp b/qmlplugin/declarativeseries.cpp index 4213e6d..cd253f5 100644 --- a/qmlplugin/declarativeseries.cpp +++ b/qmlplugin/declarativeseries.cpp @@ -50,40 +50,19 @@ void DeclarativeSeries::initSeries() Q_ASSERT(chart); switch (m_seriesType) { - case SeriesTypeLine: { - m_series = new QLineChartSeries(this); - for (qreal i(0.0); i < 100.0; i += 1.0) - ((QLineChartSeries *)m_series)->add(i, i); - chart->addSeries(m_series); - break; - } - case SeriesTypeBar: - // fallthrough; bar and scatter use the same test data - case SeriesTypeScatter: { - m_series = new QScatterSeries(); - chart->addSeries(m_series); - QScatterSeries *scatter = qobject_cast(m_series); - Q_ASSERT(scatter); - for (qreal i = 0; i < 100; i += 0.1) - scatter->addData(QPointF(i + (rand() % 5), - abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5))); - break; - } - case SeriesTypeStackedBar: - break; - case SeriesTypePercentBar: - break; case SeriesTypePie: { - m_series = new QPieSeries(); - chart->addSeries(m_series); + QPieSeries *pieSeries = new QPieSeries(); + chart->addSeries(pieSeries); QList data; data << 1.0; data << 12.0; data << 4.0; - Q_ASSERT(m_series->setData(data)); + Q_ASSERT(pieSeries->setData(data)); + m_series = pieSeries; break; } default: + Q_ASSERT(false); break; } } diff --git a/qmlplugin/declarativeseries.h b/qmlplugin/declarativeseries.h index 0392a95..11c163b 100644 --- a/qmlplugin/declarativeseries.h +++ b/qmlplugin/declarativeseries.h @@ -16,8 +16,8 @@ class DeclarativeSeries : public QDeclarativeItem public: // TODO: how to re-use the existing enum from QChart? enum SeriesType { - SeriesTypeInvalid = QChartSeries::SeriesTypeInvalid, - SeriesTypeLine, + SeriesTypeInvalid = -1, + SeriesTypeLine = QChartSeries::SeriesTypeLine, // SeriesTypeArea, SeriesTypeBar, SeriesTypeStackedBar, diff --git a/src/qchartseries.cpp b/src/qchartseries.cpp index c1d14d6..5df08fc 100644 --- a/src/qchartseries.cpp +++ b/src/qchartseries.cpp @@ -4,6 +4,9 @@ \class QChartSeries \brief Base class for all QtCommercial Chart series. \mainclass + + Usually you use the series type specific inherited classes instead of the base class. + \sa QScatterSeries */ /*!