##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixes to API , QSeriesType -> SeriesType , add missing getters
Michal Klocek -
r1107:c1d875b346e0
parent child
Show More
Side by Side Unified
Context file:
r1107:c1d875b346e0 Loading diff...:
Show file before | Show file after | Hide comments
@@ -117,7 +117,7 QAreaSeries::~QAreaSeries()
117 117 }
118 118
119 119
120 QAbstractSeries::QSeriesType QAreaSeries::type() const
120 QAbstractSeries::SeriesType QAreaSeries::type() const
121 121 {
122 122 return QAbstractSeries::SeriesTypeArea;
123 123 }
Show file before | Show file after | Hide comments
@@ -38,7 +38,7 public:
38 38 ~QAreaSeries();
39 39
40 40 public:
41 QAbstractSeries::QSeriesType type() const;
41 QAbstractSeries::SeriesType type() const;
42 42
43 43 QLineSeries* upperSeries() const;
44 44 QLineSeries* lowerSeries() const;
Show file before | Show file after | Hide comments
@@ -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::QSeriesType QBarSeries::type() const
94 QAbstractSeries::SeriesType QBarSeries::type() const
95 95 {
96 96 return QAbstractSeries::SeriesTypeBar;
97 97 }
Show file before | Show file after | Hide comments
@@ -42,7 +42,7 public:
42 42 explicit QBarSeries(QBarCategories categories, QObject *parent = 0);
43 43 virtual ~QBarSeries();
44 44
45 QAbstractSeries::QSeriesType type() const;
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
Show file before | Show file after | Hide comments
@@ -58,7 +58,7 QPercentBarSeries::QPercentBarSeries(QBarCategories categories, QObject *parent)
58 58 {
59 59 }
60 60
61 QAbstractSeries::QSeriesType QPercentBarSeries::type() const
61 QAbstractSeries::SeriesType QPercentBarSeries::type() const
62 62 {
63 63 return QAbstractSeries::SeriesTypePercentBar;
64 64 }
Show file before | Show file after | Hide comments
@@ -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::QSeriesType type() const;
36 QAbstractSeries::SeriesType type() const;
37 37 private:
38 38 Q_DECLARE_PRIVATE(QPercentBarSeries)
39 39 Q_DISABLE_COPY(QPercentBarSeries)
Show file before | Show file after | Hide comments
@@ -57,7 +57,7 QStackedBarSeries::QStackedBarSeries(QBarCategories categories, QObject *parent)
57 57 {
58 58 }
59 59
60 QAbstractSeries::QSeriesType QStackedBarSeries::type() const
60 QAbstractSeries::SeriesType QStackedBarSeries::type() const
61 61 {
62 62 return QAbstractSeries::SeriesTypeStackedBar;
63 63 }
Show file before | Show file after | Hide comments
@@ -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::QSeriesType type() const;
36 QAbstractSeries::SeriesType type() const;
37 37 private:
38 38 Q_DECLARE_PRIVATE(QStackedBarSeries)
39 39 Q_DISABLE_COPY(QStackedBarSeries)
Show file before | Show file after | Hide comments
@@ -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::QSeriesType type)
223 int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
224 224 {
225 225 int count=0;
226 226 QMapIterator<QAbstractSeries*, QAxis*> i(m_seriesAxisMap);
Show file before | Show file after | Hide comments
@@ -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::QSeriesType type);
57 int seriesCount(QAbstractSeries::SeriesType type);
58 58 int seriesIndex(QAbstractSeries *series);
59 59
60 60 Domain* domain(QAbstractSeries* series) const;
Show file before | Show file after | Hide comments
@@ -49,9 +49,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
49 49 */
50 50
51 51 /*!
52 \fn virtual QSeriesType QLineSeries::type() const
52 \fn virtual SeriesType QLineSeries::type() const
53 53 \brief Returns type of series.
54 \sa QAbstractSeries, QSeriesType
54 \sa QAbstractSeries, SeriesType
55 55 */
56 56
57 57 /*!
@@ -82,7 +82,7 QLineSeries::~QLineSeries()
82 82 }
83 83 }
84 84
85 QAbstractSeries::QSeriesType QLineSeries::type() const
85 QAbstractSeries::SeriesType QLineSeries::type() const
86 86 {
87 87 return QAbstractSeries::SeriesTypeLine;
88 88 }
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 public:
35 35 explicit QLineSeries(QObject *parent = 0);
36 36 ~QLineSeries();
37 37
38 QAbstractSeries::QSeriesType type() const;
38 QAbstractSeries::SeriesType type() const;
39 39
40 40 protected:
41 41 QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0);
Show file before | Show file after | Hide comments
@@ -130,7 +130,7 QPieSeries::~QPieSeries()
130 130 /*!
131 131 Returns QChartSeries::SeriesTypePie.
132 132 */
133 QAbstractSeries::QSeriesType QPieSeries::type() const
133 QAbstractSeries::SeriesType QPieSeries::type() const
134 134 {
135 135 return QAbstractSeries::SeriesTypePie;
136 136 }
Show file before | Show file after | Hide comments
@@ -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);
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35 35 */
36 36
37 37 /*!
38 \enum QAbstractSeries::QSeriesType
38 \enum QAbstractSeries::SeriesType
39 39
40 40 The type of the series object.
41 41
Show file before | Show file after | Hide comments
@@ -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(QSeriesType)
39 Q_ENUMS(SeriesType)
40 40
41 41 public:
42 enum QSeriesType {
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 QSeriesType type() const = 0;
58 virtual SeriesType type() const = 0;
59 59 virtual bool setModel(QAbstractItemModel* model) = 0;
60 60 QAbstractItemModel* model() const;
61 61 int mapFirst() const;
Show file before | Show file after | Hide comments
@@ -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():
Show file before | Show file after | Hide comments
@@ -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;
Show file before | Show file after | Hide comments
@@ -58,7 +58,7
58 58 /*!
59 59 \fn QChartSeriesType QScatterSeries::type() const
60 60 \brief Returns QChartSeries::SeriesTypeScatter.
61 \sa QAbstractSeries, QSeriesType
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::QSeriesType QScatterSeries::type() const
80 QAbstractSeries::SeriesType QScatterSeries::type() const
81 81 {
82 82 return QAbstractSeries::SeriesTypeScatter;
83 83 }
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 public:
41 41 explicit QScatterSeries(QObject *parent = 0);
42 42 ~QScatterSeries();
43 43
44 QAbstractSeries::QSeriesType type() const;
44 QAbstractSeries::SeriesType type() const;
45 45
46 46 MarkerShape shape() const;
47 47 void setShape(MarkerShape shape);
Show file before | Show file after | Hide comments
@@ -75,7 +75,7 QSplineSeries::~QSplineSeries()
75 75 }
76 76 }
77 77
78 QAbstractSeries::QSeriesType QSplineSeries::type() const
78 QAbstractSeries::SeriesType QSplineSeries::type() const
79 79 {
80 80 return QAbstractSeries::SeriesTypeSpline;
81 81 }
Show file before | Show file after | Hide comments
@@ -38,7 +38,7 public:
38 38
39 39 explicit QSplineSeries(QObject *parent = 0);
40 40 ~QSplineSeries();
41 QAbstractSeries::QSeriesType type() const;
41 QAbstractSeries::SeriesType type() const;
42 42
43 43 QPointF controlPoint(int index) const;
44 44
General Comments 0
You need to be logged in to leave comments. Login now