@@ -117,7 +117,7 QAreaSeries::~QAreaSeries() | |||
|
117 | 117 | } |
|
118 | 118 | |
|
119 | 119 | |
|
120 |
QAbstractSeries:: |
|
|
120 | QAbstractSeries::SeriesType QAreaSeries::type() const | |
|
121 | 121 | { |
|
122 | 122 | return QAbstractSeries::SeriesTypeArea; |
|
123 | 123 | } |
@@ -38,7 +38,7 public: | |||
|
38 | 38 | ~QAreaSeries(); |
|
39 | 39 | |
|
40 | 40 | public: |
|
41 |
QAbstractSeries:: |
|
|
41 | QAbstractSeries::SeriesType type() const; | |
|
42 | 42 | |
|
43 | 43 | QLineSeries* upperSeries() const; |
|
44 | 44 | QLineSeries* lowerSeries() const; |
@@ -91,7 +91,7 QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) : | |||
|
91 | 91 | /*! |
|
92 | 92 | Returns the type of series. Derived classes override this. |
|
93 | 93 | */ |
|
94 |
QAbstractSeries:: |
|
|
94 | QAbstractSeries::SeriesType QBarSeries::type() const | |
|
95 | 95 | { |
|
96 | 96 | return QAbstractSeries::SeriesTypeBar; |
|
97 | 97 | } |
@@ -42,7 +42,7 public: | |||
|
42 | 42 | explicit QBarSeries(QBarCategories categories, QObject *parent = 0); |
|
43 | 43 | virtual ~QBarSeries(); |
|
44 | 44 | |
|
45 |
QAbstractSeries:: |
|
|
45 | QAbstractSeries::SeriesType type() const; | |
|
46 | 46 | |
|
47 | 47 | void appendBarSet(QBarSet *set); // Takes ownership of set |
|
48 | 48 | void removeBarSet(QBarSet *set); // Releases ownership, doesn't delete set |
@@ -58,7 +58,7 QPercentBarSeries::QPercentBarSeries(QBarCategories categories, QObject *parent) | |||
|
58 | 58 | { |
|
59 | 59 | } |
|
60 | 60 | |
|
61 |
QAbstractSeries:: |
|
|
61 | QAbstractSeries::SeriesType QPercentBarSeries::type() const | |
|
62 | 62 | { |
|
63 | 63 | return QAbstractSeries::SeriesTypePercentBar; |
|
64 | 64 | } |
@@ -33,7 +33,7 class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries | |||
|
33 | 33 | Q_OBJECT |
|
34 | 34 | public: |
|
35 | 35 | explicit QPercentBarSeries(QBarCategories categories, QObject *parent = 0); |
|
36 |
QAbstractSeries:: |
|
|
36 | QAbstractSeries::SeriesType type() const; | |
|
37 | 37 | private: |
|
38 | 38 | Q_DECLARE_PRIVATE(QPercentBarSeries) |
|
39 | 39 | Q_DISABLE_COPY(QPercentBarSeries) |
@@ -57,7 +57,7 QStackedBarSeries::QStackedBarSeries(QBarCategories categories, QObject *parent) | |||
|
57 | 57 | { |
|
58 | 58 | } |
|
59 | 59 | |
|
60 |
QAbstractSeries:: |
|
|
60 | QAbstractSeries::SeriesType QStackedBarSeries::type() const | |
|
61 | 61 | { |
|
62 | 62 | return QAbstractSeries::SeriesTypeStackedBar; |
|
63 | 63 | } |
@@ -33,7 +33,7 class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries | |||
|
33 | 33 | Q_OBJECT |
|
34 | 34 | public: |
|
35 | 35 | explicit QStackedBarSeries(QBarCategories categories, QObject *parent = 0); |
|
36 |
QAbstractSeries:: |
|
|
36 | QAbstractSeries::SeriesType type() const; | |
|
37 | 37 | private: |
|
38 | 38 | Q_DECLARE_PRIVATE(QStackedBarSeries) |
|
39 | 39 | Q_DISABLE_COPY(QStackedBarSeries) |
@@ -220,7 +220,7 void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size) | |||
|
220 | 220 | domain->zoomOut(rect,size); |
|
221 | 221 | } |
|
222 | 222 | |
|
223 |
int ChartDataSet::seriesCount(QAbstractSeries:: |
|
|
223 | int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type) | |
|
224 | 224 | { |
|
225 | 225 | int count=0; |
|
226 | 226 | QMapIterator<QAbstractSeries*, QAxis*> i(m_seriesAxisMap); |
@@ -54,7 +54,7 public: | |||
|
54 | 54 | void zoomOutDomain(const QRectF& rect, const QSizeF& size); |
|
55 | 55 | void scrollDomain(int dx,int dy,const QSizeF& size); |
|
56 | 56 | |
|
57 |
int seriesCount(QAbstractSeries:: |
|
|
57 | int seriesCount(QAbstractSeries::SeriesType type); | |
|
58 | 58 | int seriesIndex(QAbstractSeries *series); |
|
59 | 59 | |
|
60 | 60 | Domain* domain(QAbstractSeries* series) const; |
@@ -49,9 +49,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||
|
49 | 49 | */ |
|
50 | 50 | |
|
51 | 51 | /*! |
|
52 |
\fn virtual |
|
|
52 | \fn virtual SeriesType QLineSeries::type() const | |
|
53 | 53 | \brief Returns type of series. |
|
54 |
\sa QAbstractSeries, |
|
|
54 | \sa QAbstractSeries, SeriesType | |
|
55 | 55 | */ |
|
56 | 56 | |
|
57 | 57 | /*! |
@@ -82,7 +82,7 QLineSeries::~QLineSeries() | |||
|
82 | 82 | } |
|
83 | 83 | } |
|
84 | 84 | |
|
85 |
QAbstractSeries:: |
|
|
85 | QAbstractSeries::SeriesType QLineSeries::type() const | |
|
86 | 86 | { |
|
87 | 87 | return QAbstractSeries::SeriesTypeLine; |
|
88 | 88 | } |
@@ -35,7 +35,7 public: | |||
|
35 | 35 | explicit QLineSeries(QObject *parent = 0); |
|
36 | 36 | ~QLineSeries(); |
|
37 | 37 | |
|
38 |
QAbstractSeries:: |
|
|
38 | QAbstractSeries::SeriesType type() const; | |
|
39 | 39 | |
|
40 | 40 | protected: |
|
41 | 41 | QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0); |
@@ -130,7 +130,7 QPieSeries::~QPieSeries() | |||
|
130 | 130 | /*! |
|
131 | 131 | Returns QChartSeries::SeriesTypePie. |
|
132 | 132 | */ |
|
133 |
QAbstractSeries:: |
|
|
133 | QAbstractSeries::SeriesType QPieSeries::type() const | |
|
134 | 134 | { |
|
135 | 135 | return QAbstractSeries::SeriesTypePie; |
|
136 | 136 | } |
@@ -721,7 +721,7 void QPieSeriesPrivate::initializePieFromModel() | |||
|
721 | 721 | q->clear(); |
|
722 | 722 | |
|
723 | 723 | // create the initial slices set |
|
724 |
if (m_mapOrientation == Qt::Vertical) { |
|
|
724 | if (m_mapOrientation == Qt::Vertical) { | |
|
725 | 725 | if (m_mapValues >= m_model->columnCount() || m_mapLabels >= m_model->columnCount()) |
|
726 | 726 | return; // mapped columns are not existing |
|
727 | 727 |
@@ -40,7 +40,7 public: | |||
|
40 | 40 | explicit QPieSeries(QObject *parent = 0); |
|
41 | 41 | virtual ~QPieSeries(); |
|
42 | 42 | |
|
43 | QSeriesType type() const; | |
|
43 | QAbstractSeries::SeriesType type() const; | |
|
44 | 44 | |
|
45 | 45 | bool append(QPieSlice* slice); |
|
46 | 46 | bool append(QList<QPieSlice*> slices); |
@@ -35,7 +35,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||
|
35 | 35 | */ |
|
36 | 36 | |
|
37 | 37 | /*! |
|
38 |
\enum QAbstractSeries:: |
|
|
38 | \enum QAbstractSeries::SeriesType | |
|
39 | 39 | |
|
40 | 40 | The type of the series object. |
|
41 | 41 |
@@ -36,10 +36,10 class QTCOMMERCIALCHART_EXPORT QAbstractSeries : public QObject | |||
|
36 | 36 | { |
|
37 | 37 | Q_OBJECT |
|
38 | 38 | Q_PROPERTY(QString name READ name WRITE setName) |
|
39 |
Q_ENUMS( |
|
|
39 | Q_ENUMS(SeriesType) | |
|
40 | 40 | |
|
41 | 41 | public: |
|
42 |
enum |
|
|
42 | enum SeriesType { | |
|
43 | 43 | SeriesTypeLine, |
|
44 | 44 | SeriesTypeArea, |
|
45 | 45 | SeriesTypeBar, |
@@ -55,7 +55,7 protected: | |||
|
55 | 55 | |
|
56 | 56 | public: |
|
57 | 57 | ~QAbstractSeries(); |
|
58 |
virtual |
|
|
58 | virtual SeriesType type() const = 0; | |
|
59 | 59 | virtual bool setModel(QAbstractItemModel* model) = 0; |
|
60 | 60 | QAbstractItemModel* model() const; |
|
61 | 61 | int mapFirst() const; |
@@ -407,6 +407,11 bool QChart::isBackgroundDropShadowEnabled() const | |||
|
407 | 407 | return d_ptr->m_presenter->m_backgroundItem->isDropShadowEnabled(); |
|
408 | 408 | } |
|
409 | 409 | |
|
410 | QList<QAbstractSeries*> QChart::series() const | |
|
411 | { | |
|
412 | return d_ptr->m_dataset->series(); | |
|
413 | } | |
|
414 | ||
|
410 | 415 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
|
411 | 416 | |
|
412 | 417 | QChartPrivate::QChartPrivate(): |
@@ -67,6 +67,7 public: | |||
|
67 | 67 | void addSeries(QAbstractSeries *series, QAxis *axisY = 0); |
|
68 | 68 | void removeSeries(QAbstractSeries *series); |
|
69 | 69 | void removeAllSeries(); |
|
70 | QList<QAbstractSeries*> series() const; | |
|
70 | 71 | |
|
71 | 72 | void setTheme(QChart::ChartTheme theme); |
|
72 | 73 | QChart::ChartTheme theme() const; |
@@ -58,7 +58,7 | |||
|
58 | 58 | /*! |
|
59 | 59 | \fn QChartSeriesType QScatterSeries::type() const |
|
60 | 60 | \brief Returns QChartSeries::SeriesTypeScatter. |
|
61 |
\sa QAbstractSeries, |
|
|
61 | \sa QAbstractSeries, SeriesType | |
|
62 | 62 | */ |
|
63 | 63 | |
|
64 | 64 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
@@ -77,7 +77,7 QScatterSeries::~QScatterSeries() | |||
|
77 | 77 | { |
|
78 | 78 | } |
|
79 | 79 | |
|
80 |
QAbstractSeries:: |
|
|
80 | QAbstractSeries::SeriesType QScatterSeries::type() const | |
|
81 | 81 | { |
|
82 | 82 | return QAbstractSeries::SeriesTypeScatter; |
|
83 | 83 | } |
@@ -41,7 +41,7 public: | |||
|
41 | 41 | explicit QScatterSeries(QObject *parent = 0); |
|
42 | 42 | ~QScatterSeries(); |
|
43 | 43 | |
|
44 |
QAbstractSeries:: |
|
|
44 | QAbstractSeries::SeriesType type() const; | |
|
45 | 45 | |
|
46 | 46 | MarkerShape shape() const; |
|
47 | 47 | void setShape(MarkerShape shape); |
General Comments 0
You need to be logged in to leave comments.
Login now