diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 452b0b2..bd8d6af 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -117,7 +117,7 @@ QAreaSeries::~QAreaSeries() } -QAbstractSeries::QSeriesType QAreaSeries::type() const +QAbstractSeries::SeriesType QAreaSeries::type() const { return QAbstractSeries::SeriesTypeArea; } diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h index daa49c6..a03b17e 100644 --- a/src/areachart/qareaseries.h +++ b/src/areachart/qareaseries.h @@ -38,7 +38,7 @@ public: ~QAreaSeries(); public: - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; QLineSeries* upperSeries() const; QLineSeries* lowerSeries() const; diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index 13dac90..08aecbb 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -91,7 +91,7 @@ QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) : /*! Returns the type of series. Derived classes override this. */ -QAbstractSeries::QSeriesType QBarSeries::type() const +QAbstractSeries::SeriesType QBarSeries::type() const { return QAbstractSeries::SeriesTypeBar; } diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index 42c00ae..9d79229 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -42,7 +42,7 @@ public: explicit QBarSeries(QBarCategories categories, QObject *parent = 0); virtual ~QBarSeries(); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; void appendBarSet(QBarSet *set); // Takes ownership of set void removeBarSet(QBarSet *set); // Releases ownership, doesn't delete set diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp index a9e1b61..9277f30 100644 --- a/src/barchart/qpercentbarseries.cpp +++ b/src/barchart/qpercentbarseries.cpp @@ -58,7 +58,7 @@ QPercentBarSeries::QPercentBarSeries(QBarCategories categories, QObject *parent) { } -QAbstractSeries::QSeriesType QPercentBarSeries::type() const +QAbstractSeries::SeriesType QPercentBarSeries::type() const { return QAbstractSeries::SeriesTypePercentBar; } diff --git a/src/barchart/qpercentbarseries.h b/src/barchart/qpercentbarseries.h index feabf0f..e8141ec 100644 --- a/src/barchart/qpercentbarseries.h +++ b/src/barchart/qpercentbarseries.h @@ -33,7 +33,7 @@ class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries Q_OBJECT public: explicit QPercentBarSeries(QBarCategories categories, QObject *parent = 0); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; private: Q_DECLARE_PRIVATE(QPercentBarSeries) Q_DISABLE_COPY(QPercentBarSeries) diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp index d31d893..3ef6dfe 100644 --- a/src/barchart/qstackedbarseries.cpp +++ b/src/barchart/qstackedbarseries.cpp @@ -57,7 +57,7 @@ QStackedBarSeries::QStackedBarSeries(QBarCategories categories, QObject *parent) { } -QAbstractSeries::QSeriesType QStackedBarSeries::type() const +QAbstractSeries::SeriesType QStackedBarSeries::type() const { return QAbstractSeries::SeriesTypeStackedBar; } diff --git a/src/barchart/qstackedbarseries.h b/src/barchart/qstackedbarseries.h index c3ac425..5e0f234 100644 --- a/src/barchart/qstackedbarseries.h +++ b/src/barchart/qstackedbarseries.h @@ -33,7 +33,7 @@ class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries Q_OBJECT public: explicit QStackedBarSeries(QBarCategories categories, QObject *parent = 0); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; private: Q_DECLARE_PRIVATE(QStackedBarSeries) Q_DISABLE_COPY(QStackedBarSeries) diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp index c3fa1d4..16ab992 100644 --- a/src/chartdataset.cpp +++ b/src/chartdataset.cpp @@ -220,7 +220,7 @@ void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size) domain->zoomOut(rect,size); } -int ChartDataSet::seriesCount(QAbstractSeries::QSeriesType type) +int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type) { int count=0; QMapIterator i(m_seriesAxisMap); diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h index c9913c0..e7c6f69 100644 --- a/src/chartdataset_p.h +++ b/src/chartdataset_p.h @@ -54,7 +54,7 @@ public: void zoomOutDomain(const QRectF& rect, const QSizeF& size); void scrollDomain(int dx,int dy,const QSizeF& size); - int seriesCount(QAbstractSeries::QSeriesType type); + int seriesCount(QAbstractSeries::SeriesType type); int seriesIndex(QAbstractSeries *series); Domain* domain(QAbstractSeries* series) const; diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp index 5b967ca..9898c9a 100644 --- a/src/linechart/qlineseries.cpp +++ b/src/linechart/qlineseries.cpp @@ -49,9 +49,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn virtual QSeriesType QLineSeries::type() const + \fn virtual SeriesType QLineSeries::type() const \brief Returns type of series. - \sa QAbstractSeries, QSeriesType + \sa QAbstractSeries, SeriesType */ /*! @@ -82,7 +82,7 @@ QLineSeries::~QLineSeries() } } -QAbstractSeries::QSeriesType QLineSeries::type() const +QAbstractSeries::SeriesType QLineSeries::type() const { return QAbstractSeries::SeriesTypeLine; } diff --git a/src/linechart/qlineseries.h b/src/linechart/qlineseries.h index ef087f1..4105651 100644 --- a/src/linechart/qlineseries.h +++ b/src/linechart/qlineseries.h @@ -35,7 +35,7 @@ public: explicit QLineSeries(QObject *parent = 0); ~QLineSeries(); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; protected: QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0); diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 091ebdc..031b3a5 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -130,7 +130,7 @@ QPieSeries::~QPieSeries() /*! Returns QChartSeries::SeriesTypePie. */ -QAbstractSeries::QSeriesType QPieSeries::type() const +QAbstractSeries::SeriesType QPieSeries::type() const { return QAbstractSeries::SeriesTypePie; } @@ -721,7 +721,7 @@ void QPieSeriesPrivate::initializePieFromModel() q->clear(); // create the initial slices set - if (m_mapOrientation == Qt::Vertical) { + if (m_mapOrientation == Qt::Vertical) { if (m_mapValues >= m_model->columnCount() || m_mapLabels >= m_model->columnCount()) return; // mapped columns are not existing diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h index 11b865c..3c21341 100644 --- a/src/piechart/qpieseries.h +++ b/src/piechart/qpieseries.h @@ -40,7 +40,7 @@ public: explicit QPieSeries(QObject *parent = 0); virtual ~QPieSeries(); - QSeriesType type() const; + QAbstractSeries::SeriesType type() const; bool append(QPieSlice* slice); bool append(QList slices); diff --git a/src/qabstractseries.cpp b/src/qabstractseries.cpp index e20105b..63f19d4 100644 --- a/src/qabstractseries.cpp +++ b/src/qabstractseries.cpp @@ -35,7 +35,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \enum QAbstractSeries::QSeriesType + \enum QAbstractSeries::SeriesType The type of the series object. diff --git a/src/qabstractseries.h b/src/qabstractseries.h index 427d5c6..9cc7760 100644 --- a/src/qabstractseries.h +++ b/src/qabstractseries.h @@ -36,10 +36,10 @@ class QTCOMMERCIALCHART_EXPORT QAbstractSeries : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) - Q_ENUMS(QSeriesType) + Q_ENUMS(SeriesType) public: - enum QSeriesType { + enum SeriesType { SeriesTypeLine, SeriesTypeArea, SeriesTypeBar, @@ -55,7 +55,7 @@ protected: public: ~QAbstractSeries(); - virtual QSeriesType type() const = 0; + virtual SeriesType type() const = 0; virtual bool setModel(QAbstractItemModel* model) = 0; QAbstractItemModel* model() const; int mapFirst() const; diff --git a/src/qchart.cpp b/src/qchart.cpp index ee5d48b..9489f48 100644 --- a/src/qchart.cpp +++ b/src/qchart.cpp @@ -407,6 +407,11 @@ bool QChart::isBackgroundDropShadowEnabled() const return d_ptr->m_presenter->m_backgroundItem->isDropShadowEnabled(); } +QList QChart::series() const +{ + return d_ptr->m_dataset->series(); +} + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// QChartPrivate::QChartPrivate(): diff --git a/src/qchart.h b/src/qchart.h index d1494d2..7ae90a2 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -67,6 +67,7 @@ public: void addSeries(QAbstractSeries *series, QAxis *axisY = 0); void removeSeries(QAbstractSeries *series); void removeAllSeries(); + QList series() const; void setTheme(QChart::ChartTheme theme); QChart::ChartTheme theme() const; diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp index f177edc..ba2a355 100644 --- a/src/scatterchart/qscatterseries.cpp +++ b/src/scatterchart/qscatterseries.cpp @@ -58,7 +58,7 @@ /*! \fn QChartSeriesType QScatterSeries::type() const \brief Returns QChartSeries::SeriesTypeScatter. - \sa QAbstractSeries, QSeriesType + \sa QAbstractSeries, SeriesType */ QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -77,7 +77,7 @@ QScatterSeries::~QScatterSeries() { } -QAbstractSeries::QSeriesType QScatterSeries::type() const +QAbstractSeries::SeriesType QScatterSeries::type() const { return QAbstractSeries::SeriesTypeScatter; } diff --git a/src/scatterchart/qscatterseries.h b/src/scatterchart/qscatterseries.h index 5472572..204d748 100644 --- a/src/scatterchart/qscatterseries.h +++ b/src/scatterchart/qscatterseries.h @@ -41,7 +41,7 @@ public: explicit QScatterSeries(QObject *parent = 0); ~QScatterSeries(); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; MarkerShape shape() const; void setShape(MarkerShape shape); diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp index 059424e..aea7c8e 100644 --- a/src/splinechart/qsplineseries.cpp +++ b/src/splinechart/qsplineseries.cpp @@ -75,7 +75,7 @@ QSplineSeries::~QSplineSeries() } } -QAbstractSeries::QSeriesType QSplineSeries::type() const +QAbstractSeries::SeriesType QSplineSeries::type() const { return QAbstractSeries::SeriesTypeSpline; } diff --git a/src/splinechart/qsplineseries.h b/src/splinechart/qsplineseries.h index 4399215..9399912 100644 --- a/src/splinechart/qsplineseries.h +++ b/src/splinechart/qsplineseries.h @@ -38,7 +38,7 @@ public: explicit QSplineSeries(QObject *parent = 0); ~QSplineSeries(); - QAbstractSeries::QSeriesType type() const; + QAbstractSeries::SeriesType type() const; QPointF controlPoint(int index) const;