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

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

Rename QChartSeries to QSeries
Michal Klocek -
r360:6630f89603b4
parent child
Show More
Show file before | Show file after | Hide comments
@@ -18,7 +18,7 public slots:
18 18
19 19 private:
20 20 QTimer m_timer;
21 QList<QChartSeries*> m_series;
21 QList<QSeries*> m_series;
22 22 int m_index;
23 23 };
24 24
Show file before | Show file after | Hide comments
@@ -21,9 +21,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
21 21 */
22 22
23 23 /*!
24 \fn virtual QChartSeriesType QBarSeries::type() const
24 \fn virtual QSeriesType QBarSeries::type() const
25 25 \brief Returns type of series.
26 \sa QChartSeries, QChartSeriesType
26 \sa QSeries, QSeriesType
27 27 */
28 28 /*!
29 29 \fn void QBarSeries::changed(int index)
@@ -52,7 +52,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
52 52 QBarSeries is QObject which is a child of a \a parent.
53 53 */
54 54 QBarSeries::QBarSeries(QBarCategory *category, QObject *parent)
55 : QChartSeries(parent)
55 : QSeries(parent)
56 56 ,mModel(new BarChartModel(category, this))
57 57 {
58 58 }
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 1 #ifndef BARSERIES_H
2 2 #define BARSERIES_H
3 3
4 #include "qchartseries.h"
4 #include "qseries.h"
5 5
6 6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
7 7
@@ -10,13 +10,13 class QBarSet;
10 10 class BarChartModel;
11 11
12 12 // Container for series
13 class QTCOMMERCIALCHART_EXPORT QBarSeries : public QChartSeries
13 class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
14 14 {
15 15 Q_OBJECT
16 16 public:
17 17 QBarSeries(QBarCategory *category, QObject* parent=0);
18 18
19 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
19 virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }
20 20
21 21 void addBarSet(QBarSet *set); // Takes ownership of set
22 22 void removeBarSet(QBarSet *set); // Releases ownership, doesn't delete set
Show file before | Show file after | Hide comments
@@ -16,9 +16,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
16 16 */
17 17
18 18 /*!
19 \fn virtual QChartSeriesType QPercentBarSeries::type() const
19 \fn virtual QSeriesType QPercentBarSeries::type() const
20 20 \brief Returns type of series.
21 \sa QChartSeries, QChartSeriesType
21 \sa QSeries, QSeriesType
22 22 */
23 23
24 24 /*!
Show file before | Show file after | Hide comments
@@ -11,7 +11,7 class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries
11 11 public:
12 12 QPercentBarSeries(QBarCategory *category, QObject* parent=0);
13 13
14 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
14 virtual QSeriesType type() const { return QSeries::SeriesTypePercentBar; }
15 15 };
16 16
17 17 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -16,9 +16,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
16 16 */
17 17
18 18 /*!
19 \fn virtual QChartSeriesType QStackedBarSeries::type() const
19 \fn virtual QSeriesType QStackedBarSeries::type() const
20 20 \brief Returns type of series.
21 \sa QChartSeries, QChartSeriesType
21 \sa QSeries, QSeriesType
22 22 */
23 23
24 24 /*!
Show file before | Show file after | Hide comments
@@ -13,7 +13,7 class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
13 13 public:
14 14 QStackedBarSeries(QBarCategory *category, QObject* parent=0);
15 15
16 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
16 virtual QSeriesType type() const { return QSeries::SeriesTypeStackedBar; }
17 17 };
18 18
19 19 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -33,7 +33,7 const Domain ChartDataSet::domain(QChartAxis *axisY) const
33 33 return m_domainMap.values(axisY).at(i);
34 34 }
35 35
36 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
36 void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
37 37 {
38 38 // TODO: we should check the series not already added
39 39
@@ -43,7 +43,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
43 43 if(axisY==0) axisY = m_axisY;
44 44 axisY->setParent(this); // take ownership
45 45
46 QList<QChartSeries*> seriesList = m_seriesMap.values(axisY);
46 QList<QSeries*> seriesList = m_seriesMap.values(axisY);
47 47
48 48 QList<Domain> domainList = m_domainMap.values(axisY);
49 49
@@ -55,7 +55,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
55 55
56 56 switch(series->type())
57 57 {
58 case QChartSeries::SeriesTypeLine: {
58 case QSeries::SeriesTypeLine: {
59 59
60 60 QLineSeries* xyseries = static_cast<QLineSeries*>(series);
61 61
@@ -70,7 +70,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
70 70 }
71 71 break;
72 72 }
73 case QChartSeries::SeriesTypeBar: {
73 case QSeries::SeriesTypeBar: {
74 74 qDebug() << "QChartSeries::SeriesTypeBar";
75 75 QBarSeries* barSeries = static_cast<QBarSeries*>(series);
76 76 qreal x = barSeries->countCategories();
@@ -81,7 +81,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
81 81 domain.m_maxY = qMax(domain.m_maxY,y);
82 82 break;
83 83 }
84 case QChartSeries::SeriesTypeStackedBar: {
84 case QSeries::SeriesTypeStackedBar: {
85 85 qDebug() << "QChartSeries::SeriesTypeStackedBar";
86 86
87 87 QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
@@ -93,7 +93,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
93 93 domain.m_maxY = qMax(domain.m_maxY,y);
94 94 break;
95 95 }
96 case QChartSeries::SeriesTypePercentBar: {
96 case QSeries::SeriesTypePercentBar: {
97 97 qDebug() << "QChartSeries::SeriesTypePercentBar";
98 98
99 99 QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
@@ -105,13 +105,13 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
105 105 break;
106 106 }
107 107
108 case QChartSeries::SeriesTypePie: {
108 case QSeries::SeriesTypePie: {
109 109 QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
110 110 // TODO: domain stuff
111 111 break;
112 112 }
113 113
114 case QChartSeries::SeriesTypeScatter: {
114 case QSeries::SeriesTypeScatter: {
115 115 QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
116 116 Q_ASSERT(scatterSeries);
117 117 foreach (QPointF point, scatterSeries->data()) {
@@ -160,7 +160,7 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
160 160
161 161 }
162 162
163 void ChartDataSet::removeSeries(QChartSeries* series)
163 void ChartDataSet::removeSeries(QSeries* series)
164 164 {
165 165 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
166 166 foreach(QChartAxis* axis , keys) {
@@ -184,7 +184,7 void ChartDataSet::removeAllSeries()
184 184 {
185 185 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
186 186 foreach(QChartAxis* axis , keys) {
187 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
187 QList<QSeries*> seriesList = m_seriesMap.values(axis);
188 188 for(int i =0 ; i < seriesList.size();i++ )
189 189 {
190 190 emit seriesRemoved(seriesList.at(i));
@@ -235,8 +235,8 void ChartDataSet::setDomain(int index)
235 235 Q_ASSERT(i>=0);
236 236 domain = m_domainMap.values(axis).at(i);
237 237 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
238 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
239 foreach(QChartSeries* series, seriesList) {
238 QList<QSeries*> seriesList = m_seriesMap.values(axis);
239 foreach(QSeries* series, seriesList) {
240 240 emit seriesDomainChanged(series,domain);
241 241 }
242 242 emit axisLabelsChanged(axis,labels);
@@ -281,8 +281,8 void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
281 281 foreach (QChartAxis* axis , domainList){
282 282 domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
283 283 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
284 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
285 foreach(QChartSeries* series, seriesList){
284 QList<QSeries*> seriesList = m_seriesMap.values(axis);
285 foreach(QSeries* series, seriesList){
286 286 emit seriesDomainChanged(series,domain);
287 287 }
288 288 emit axisLabelsChanged(axis,labels);
@@ -295,7 +295,7 void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
295 295 m_domainIndex++;
296 296 }
297 297
298 QChartAxis* ChartDataSet::axisY(QChartSeries* series) const
298 QChartAxis* ChartDataSet::axisY(QSeries* series) const
299 299 {
300 300 if(series == 0) return m_axisY;
301 301
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 1 #ifndef CHARTDATASET_P_H_
2 2 #define CHARTDATASET_P_H_
3 3
4 #include "qchartseries.h"
4 #include "qseries.h"
5 5 #include "domain_p.h"
6 6 #include <QVector>
7 7
@@ -16,8 +16,8 public:
16 16 ChartDataSet(QObject* parent=0);
17 17 virtual ~ChartDataSet();
18 18
19 void addSeries(QChartSeries* series,QChartAxis *axisY = 0);
20 void removeSeries(QChartSeries* series);
19 void addSeries(QSeries* series,QChartAxis *axisY = 0);
20 void removeSeries(QSeries* series);
21 21 void removeAllSeries();
22 22 void addDomain(const QRectF& rect, const QRectF& viewport);
23 23 bool nextDomain();
@@ -28,15 +28,15 public:
28 28 void setDomain(int index);
29 29
30 30 QChartAxis* axisX() const { return m_axisX;};
31 QChartAxis* axisY(QChartSeries* series = 0) const;
31 QChartAxis* axisY(QSeries* series = 0) const;
32 32
33 33 signals:
34 void seriesAdded(QChartSeries* series);
35 void seriesRemoved(QChartSeries* series);
34 void seriesAdded(QSeries* series);
35 void seriesRemoved(QSeries* series);
36 36 void axisAdded(QChartAxis* axis);
37 37 void axisRemoved(QChartAxis* axis);
38 38 void axisLabelsChanged(QChartAxis* axis, const QStringList& labels);
39 void seriesDomainChanged(QChartSeries* series,const Domain& domain);
39 void seriesDomainChanged(QSeries* series,const Domain& domain);
40 40
41 41 private slots:
42 42 void handleMinChanged(qreal min);
@@ -48,7 +48,7 private:
48 48
49 49 private:
50 50 QMultiMap<QChartAxis*, Domain> m_domainMap;
51 QMultiMap<QChartAxis*, QChartSeries*> m_seriesMap;
51 QMultiMap<QChartAxis*, QSeries*> m_seriesMap;
52 52 QChartAxis* m_axisX;
53 53 QChartAxis* m_axisY;
54 54 int m_domainIndex;
Show file before | Show file after | Hide comments
@@ -43,11 +43,11 ChartPresenter::~ChartPresenter()
43 43 void ChartPresenter::createConnections()
44 44 {
45 45 QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
46 QObject::connect(m_dataset,SIGNAL(seriesAdded(QChartSeries*)),this,SLOT(handleSeriesAdded(QChartSeries*)));
47 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QChartSeries*)),this,SLOT(handleSeriesRemoved(QChartSeries*)));
46 QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*)),this,SLOT(handleSeriesAdded(QSeries*)));
47 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
48 48 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*)),this,SLOT(handleAxisAdded(QChartAxis*)));
49 49 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
50 QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QChartSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QChartSeries*,const Domain&)));
50 QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QSeries*,const Domain&)));
51 51 QObject::connect(m_dataset,SIGNAL(axisLabelsChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisLabelsChanged(QChartAxis*,const QStringList&)));
52 52 }
53 53
@@ -104,11 +104,11 void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
104 104 }
105 105
106 106
107 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
107 void ChartPresenter::handleSeriesAdded(QSeries* series)
108 108 {
109 109 switch(series->type())
110 110 {
111 case QChartSeries::SeriesTypeLine: {
111 case QSeries::SeriesTypeLine: {
112 112 QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
113 113 LineChartItem* item;
114 114 if(m_options.testFlag(QChart::SeriesAnimations)){
@@ -123,7 +123,7 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
123 123 break;
124 124 }
125 125
126 case QChartSeries::SeriesTypeBar: {
126 case QSeries::SeriesTypeBar: {
127 127 QBarSeries* barSeries = static_cast<QBarSeries*>(series);
128 128 BarPresenter* item = new BarPresenter(barSeries,m_chart);
129 129 m_chartTheme->decorate(item,barSeries,m_chartItems.count());
@@ -134,7 +134,7 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
134 134 break;
135 135 }
136 136
137 case QChartSeries::SeriesTypeStackedBar: {
137 case QSeries::SeriesTypeStackedBar: {
138 138
139 139 QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
140 140 StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
@@ -145,7 +145,7 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
145 145 break;
146 146 }
147 147
148 case QChartSeries::SeriesTypePercentBar: {
148 case QSeries::SeriesTypePercentBar: {
149 149
150 150 QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
151 151 PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
@@ -155,7 +155,7 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
155 155 m_chartItems.insert(series,item);
156 156 break;
157 157 }
158 case QChartSeries::SeriesTypeScatter: {
158 case QSeries::SeriesTypeScatter: {
159 159 QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
160 160 ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
161 161 QObject::connect(scatterPresenter, SIGNAL(clicked()), scatterSeries, SIGNAL(clicked()));
@@ -165,7 +165,7 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
165 165 m_chartItems.insert(scatterSeries, scatterPresenter);
166 166 break;
167 167 }
168 case QChartSeries::SeriesTypePie: {
168 case QSeries::SeriesTypePie: {
169 169 QPieSeries *s = qobject_cast<QPieSeries *>(series);
170 170 PiePresenter* pie = new PiePresenter(m_chart, s);
171 171 m_chartTheme->decorate(pie, s, m_chartItems.count());
@@ -197,18 +197,18 void ChartPresenter::handleSeriesAdded(QChartSeries* series)
197 197 if(m_rect.isValid()) emit geometryChanged(m_rect);
198 198 }
199 199
200 void ChartPresenter::handleSeriesRemoved(QChartSeries* series)
200 void ChartPresenter::handleSeriesRemoved(QSeries* series)
201 201 {
202 202 ChartItem* item = m_chartItems.take(series);
203 203 delete item;
204 204 }
205 205
206 void ChartPresenter::handleSeriesChanged(QChartSeries* series)
206 void ChartPresenter::handleSeriesChanged(QSeries* series)
207 207 {
208 208 //TODO:
209 209 }
210 210
211 void ChartPresenter::handleSeriesDomainChanged(QChartSeries* series, const Domain& domain)
211 void ChartPresenter::handleSeriesDomainChanged(QSeries* series, const Domain& domain)
212 212 {
213 213 m_chartItems.value(series)->handleDomainChanged(domain);
214 214 }
@@ -225,7 +225,7 void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
225 225 m_chartTheme = ChartTheme::createTheme(theme);
226 226
227 227 m_chartTheme->decorate(m_chart);
228 QMapIterator<QChartSeries*,ChartItem*> i(m_chartItems);
228 QMapIterator<QSeries*,ChartItem*> i(m_chartItems);
229 229
230 230 int index=0;
231 231 while (i.hasNext()) {
@@ -255,13 +255,13 void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
255 255 //recreate elements
256 256
257 257 QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
258 QList<QChartSeries*> seriesList = m_chartItems.uniqueKeys();
258 QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
259 259
260 260 foreach(QChartAxis* axis, axisList) {
261 261 handleAxisRemoved(axis);
262 262 handleAxisAdded(axis);
263 263 }
264 foreach(QChartSeries* series, seriesList) {
264 foreach(QSeries* series, seriesList) {
265 265 handleSeriesRemoved(series);
266 266 handleSeriesAdded(series);
267 267 }
Show file before | Show file after | Hide comments
@@ -9,7 +9,7
9 9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
10 10
11 11 class ChartItem;
12 class QChartSeries;
12 class QSeries;
13 13 class ChartDataSet;
14 14 //class QChart;
15 15 class Domain;
@@ -40,18 +40,18 private:
40 40 void createConnections();
41 41
42 42 public slots:
43 void handleSeriesAdded(QChartSeries* series);
44 void handleSeriesRemoved(QChartSeries* series);
43 void handleSeriesAdded(QSeries* series);
44 void handleSeriesRemoved(QSeries* series);
45 45 void handleAxisAdded(QChartAxis* axis);
46 46 void handleAxisRemoved(QChartAxis* axis);
47 void handleSeriesDomainChanged(QChartSeries* series, const Domain& domain);
47 void handleSeriesDomainChanged(QSeries* series, const Domain& domain);
48 48 void handleAxisLabelsChanged(QChartAxis* axis, const QStringList& labels);
49 void handleSeriesChanged(QChartSeries* series);
49 void handleSeriesChanged(QSeries* series);
50 50 void handleGeometryChanged();
51 51 signals:
52 52 void geometryChanged(const QRectF& rect);
53 53 private:
54 QMap<QChartSeries*,ChartItem*> m_chartItems;
54 QMap<QSeries*,ChartItem*> m_chartItems;
55 55 QMap<QChartAxis*,AxisItem*> m_axisItems;
56 56 QChart* m_chart;
57 57 ChartDataSet* m_dataset;
Show file before | Show file after | Hide comments
@@ -80,35 +80,35 void ChartTheme::decorate(QChart* chart)
80 80 chart->setChartBackgroundBrush(backgroundGradient);
81 81 }
82 82 //TODO helper to by removed later
83 void ChartTheme::decorate(ChartItem* item, QChartSeries* series,int count)
83 void ChartTheme::decorate(ChartItem* item, QSeries* series,int count)
84 84 {
85 85 switch(series->type())
86 86 {
87 case QChartSeries::SeriesTypeLine: {
87 case QSeries::SeriesTypeLine: {
88 88 QLineSeries* s = static_cast<QLineSeries*>(series);
89 89 LineChartItem* i = static_cast<LineChartItem*>(item);
90 90 decorate(i,s,count);
91 91 break;
92 92 }
93 case QChartSeries::SeriesTypeBar: {
93 case QSeries::SeriesTypeBar: {
94 94 QBarSeries* b = static_cast<QBarSeries*>(series);
95 95 BarPresenter* i = static_cast<BarPresenter*>(item);
96 96 decorate(i,b,count);
97 97 break;
98 98 }
99 case QChartSeries::SeriesTypeStackedBar: {
99 case QSeries::SeriesTypeStackedBar: {
100 100 QStackedBarSeries* s = static_cast<QStackedBarSeries*>(series);
101 101 StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
102 102 decorate(i,s,count);
103 103 break;
104 104 }
105 case QChartSeries::SeriesTypePercentBar: {
105 case QSeries::SeriesTypePercentBar: {
106 106 QPercentBarSeries* s = static_cast<QPercentBarSeries*>(series);
107 107 PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
108 108 decorate(i,s,count);
109 109 break;
110 110 }
111 case QChartSeries::SeriesTypeScatter: {
111 case QSeries::SeriesTypeScatter: {
112 112 QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
113 113 Q_ASSERT(s);
114 114 ScatterPresenter* i = static_cast<ScatterPresenter*>(item);
@@ -116,7 +116,7 void ChartTheme::decorate(ChartItem* item, QChartSeries* series,int count)
116 116 decorate(i, s, count);
117 117 break;
118 118 }
119 case QChartSeries::SeriesTypePie: {
119 case QSeries::SeriesTypePie: {
120 120 QPieSeries* s = static_cast<QPieSeries*>(series);
121 121 PiePresenter* i = static_cast<PiePresenter*>(item);
122 122 decorate(i,s,count);
Show file before | Show file after | Hide comments
@@ -8,7 +8,7
8 8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
9 9
10 10 class ChartItem;
11 class QChartSeries;
11 class QSeries;
12 12 class LineChartItem;
13 13 class QLineSeries;
14 14 class BarPresenter;
@@ -30,7 +30,7 public:
30 30 static ChartTheme* createTheme(QChart::ChartTheme theme);
31 31 QChart::ChartTheme id() const {return m_id;}
32 32 void decorate(QChart* chart);
33 void decorate(ChartItem* item, QChartSeries* series,int count);
33 void decorate(ChartItem* item, QSeries* series,int count);
34 34 void decorate(BarPresenter* item, QBarSeries* series,int count);
35 35 void decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count);
36 36 void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);
Show file before | Show file after | Hide comments
@@ -28,9 +28,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28 */
29 29
30 30 /*!
31 \fn virtual QChartSeriesType QLineSeries::type() const
31 \fn virtual QSeriesType QLineSeries::type() const
32 32 \brief Returns type of series.
33 \sa QChartSeries, QChartSeriesType
33 \sa QSeries, QSeriesType
34 34 */
35 35
36 36 /*!
@@ -55,7 +55,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
55 55 Constructs empty series object which is a child of \a parent.
56 56 When series object is added to QChartView or QChart instance ownerships is transfered.
57 57 */
58 QLineSeries::QLineSeries(QObject* parent):QChartSeries(parent),
58 QLineSeries::QLineSeries(QObject* parent):QSeries(parent),
59 59 m_pointsVisible(false)
60 60 {
61 61 }
Show file before | Show file after | Hide comments
@@ -1,15 +1,15
1 #ifndef QLINECHARTSERIES_H_
2 #define QLINECHARTSERIES_H_
1 #ifndef QLINESERIES_H_
2 #define QLINESERIES_H_
3 3
4 4 #include "qchartglobal.h"
5 #include "qchartseries.h"
5 #include "qseries.h"
6 6 #include <QDebug>
7 7 #include <QPen>
8 8 #include <QBrush>
9 9
10 10 QTCOMMERCIALCHART_BEGIN_NAMESPACE
11 11
12 class QTCOMMERCIALCHART_EXPORT QLineSeries : public QChartSeries
12 class QTCOMMERCIALCHART_EXPORT QLineSeries : public QSeries
13 13 {
14 14 Q_OBJECT
15 15 public:
@@ -17,7 +17,7 public:
17 17 virtual ~QLineSeries();
18 18
19 19 public: // from QChartSeries
20 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeLine;}
20 virtual QSeriesType type() const { return QSeries::SeriesTypeLine;}
21 21 void add(qreal x, qreal y);
22 22 void add(const QPointF& point);
23 23 void replace(qreal x,qreal y);
Show file before | Show file after | Hide comments
@@ -124,7 +124,7 bool QPieSeries::ChangeSet::isEmpty() const
124 124 Constructs a series object which is a child of \a parent.
125 125 */
126 126 QPieSeries::QPieSeries(QObject *parent) :
127 QChartSeries(parent),
127 QSeries(parent),
128 128 m_sizeFactor(1.0),
129 129 m_position(PiePositionMaximized),
130 130 m_pieStartAngle(0),
@@ -144,9 +144,9 QPieSeries::~QPieSeries()
144 144 /*!
145 145 Returns QChartSeries::SeriesTypePie.
146 146 */
147 QChartSeries::QChartSeriesType QPieSeries::type() const
147 QSeries::QSeriesType QPieSeries::type() const
148 148 {
149 return QChartSeries::SeriesTypePie;
149 return QSeries::SeriesTypePie;
150 150 }
151 151
152 152 /*!
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 1 #ifndef PIESERIES_H
2 2 #define PIESERIES_H
3 3
4 #include "qchartseries.h"
4 #include "qseries.h"
5 5 #include <QObject>
6 6 #include <QRectF>
7 7 #include <QColor>
@@ -15,7 +15,7 class PiePresenter;
15 15 class PieSlice;
16 16 class QPieSlice;
17 17
18 class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
18 class QTCOMMERCIALCHART_EXPORT QPieSeries : public QSeries
19 19 {
20 20 Q_OBJECT
21 21
@@ -55,7 +55,7 public:
55 55 virtual ~QPieSeries();
56 56
57 57 public: // from QChartSeries
58 QChartSeriesType type() const;
58 QSeriesType type() const;
59 59 virtual bool setData(QList<qreal> data); // TODO: remove this
60 60
61 61 public:
Show file before | Show file after | Hide comments
@@ -65,7 +65,7 QChart::~QChart()
65 65 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
66 66 the y axis).
67 67 */
68 void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
68 void QChart::addSeries(QSeries* series, QChartAxis* axisY)
69 69 {
70 70 m_dataset->addSeries(series, axisY);
71 71 }
@@ -76,7 +76,7 void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
76 76 It does not delete the pointed QChartSeries data object
77 77 \sa addSeries(), removeAllSeries()
78 78 */
79 void QChart::removeSeries(QChartSeries* series)
79 void QChart::removeSeries(QSeries* series)
80 80 {
81 81 m_dataset->removeSeries(series);
82 82 }
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2 2 #define QCHART_H
3 3
4 4 #include <qchartglobal.h>
5 #include <qchartseries.h>
5 #include <qseries.h>
6 6 #include <QGraphicsWidget>
7 7 #include <QLinearGradient>
8 8 #include <QFont>
@@ -12,7 +12,7 class QGraphicsSceneResizeEvent;
12 12 QTCOMMERCIALCHART_BEGIN_NAMESPACE
13 13
14 14 class AxisItem;
15 class QChartSeries;
15 class QSeries;
16 16 class PlotDomain;
17 17 class BarPresenter;
18 18 class QChartAxis;
@@ -47,8 +47,8 public:
47 47 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
48 48 ~QChart();
49 49
50 void addSeries(QChartSeries* series, QChartAxis* axisY = 0);
51 void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
50 void addSeries(QSeries* series, QChartAxis* axisY = 0);
51 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
52 52 void removeAllSeries(); // deletes series and axis
53 53
54 54 void setMargin(int margin);
Show file before | Show file after | Hide comments
@@ -75,7 +75,7 void QChartView::resizeEvent(QResizeEvent *event)
75 75 the y axis).
76 76 \sa removeSeries(), removeAllSeries()
77 77 */
78 void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
78 void QChartView::addSeries(QSeries* series,QChartAxis *axisY)
79 79 {
80 80 m_chart->addSeries(series,axisY);
81 81 }
@@ -86,7 +86,7 void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
86 86 It does not delete the pointed QChartSeries data object
87 87 \sa addSeries(), removeAllSeries()
88 88 */
89 void QChartView::removeSeries(QChartSeries* series)
89 void QChartView::removeSeries(QSeries* series)
90 90 {
91 91 m_chart->removeSeries(series);
92 92 }
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2 2 #define QCHARTWIDGET_H
3 3
4 4 #include "qchartglobal.h"
5 #include "qchartseries.h"
5 #include "qseries.h"
6 6 #include "qchart.h"
7 7 #include <QGraphicsView>
8 8
@@ -24,8 +24,8 public:
24 24 //implement from QWidget
25 25 void resizeEvent(QResizeEvent *event);
26 26
27 void addSeries(QChartSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
28 void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
27 void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
28 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
29 29 void removeAllSeries(); // deletes series and axis
30 30 int margin() const;
31 31
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 #include "qchartseries.h"
1 #include "qseries.h"
2 2
3 3 /*!
4 \class QChartSeries
4 \class QSeries
5 5 \brief Base class for all QtCommercial Chart series.
6 6 \mainclass
7 7
@@ -10,7 +10,7
10 10 */
11 11
12 12 /*!
13 \enum QChartSeries::QChartSeriesType
13 \enum QSeries::QSeriesType
14 14
15 15 The type of the series object.
16 16
@@ -25,22 +25,22
25 25 */
26 26
27 27 /*!
28 \fn QChartSeries::QChartSeries(QObject *parent)
28 \fn QSeries::QSeries(QObject *parent)
29 29 \brief Constructs ChartSeries object with \a parent.
30 30 */
31 31
32 32 /*!
33 \fn QChartSeries::~QChartSeries()
33 \fn QSeries::~QSeries()
34 34 \brief Virtual destructor for the chart series.
35 35 */
36 36
37 37 /*!
38 \fn QChartSeriesType QChartSeries::type() const
38 \fn QSeriesType QSeries::type() const
39 39 \brief The type of the series.
40 40 */
41 41
42 42 /*!
43 \fn bool QChartSeries::setModel(QAbstractItemModel *model)
43 \fn bool QSeries::setModel(QAbstractItemModel *model)
44 44 \brief Use the \a model to provide data for the series. The model overrides possible user data
45 45 set with QChartSeries type specific data setters. For example if you call both
46 46 QScatterSeries::addData() and QScatterSeries::setModel, only the data provided by the model is
@@ -48,5 +48,5
48 48 */
49 49
50 50 QTCOMMERCIALCHART_BEGIN_NAMESPACE
51 #include "moc_qchartseries.cpp"
51 #include "moc_qseries.cpp"
52 52 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -1,5 +1,5
1 #ifndef QCHARTSERIES_H
2 #define QCHARTSERIES_H
1 #ifndef QSERIES_H
2 #define QSERIES_H
3 3
4 4 #include "qchartglobal.h"
5 5 #include <QObject>
@@ -7,11 +7,11
7 7
8 8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
9 9
10 class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
10 class QTCOMMERCIALCHART_EXPORT QSeries : public QObject
11 11 {
12 12 Q_OBJECT
13 13 public:
14 enum QChartSeriesType {
14 enum QSeriesType {
15 15 SeriesTypeLine,
16 16 SeriesTypeArea,
17 17 SeriesTypeBar,
@@ -23,11 +23,11 public:
23 23 };
24 24
25 25 protected:
26 QChartSeries(QObject *parent = 0) : QObject(parent) {}
26 QSeries(QObject *parent = 0) : QObject(parent) {}
27 27
28 28 public:
29 virtual ~QChartSeries() {}
30 virtual QChartSeriesType type() const = 0;
29 virtual ~QSeries() {}
30 virtual QSeriesType type() const = 0;
31 31 // TODO
32 32 virtual bool setModel(QAbstractItemModel* /*model*/) { return false; }
33 33 };
Show file before | Show file after | Hide comments
@@ -62,7 +62,7 QScatterSeriesPrivate::QScatterSeriesPrivate() :
62 62 Constructs a series object which is a child of \a parent.
63 63 */
64 64 QScatterSeries::QScatterSeries(QObject *parent) :
65 QChartSeries(parent),
65 QSeries(parent),
66 66 d(new QScatterSeriesPrivate())
67 67 {
68 68 }
Show file before | Show file after | Hide comments
@@ -1,14 +1,14
1 1 #ifndef QSCATTERSERIES_H
2 2 #define QSCATTERSERIES_H
3 3
4 #include "qchartseries.h"
4 #include "qseries.h"
5 5 #include <QRectF>
6 6 #include <QColor>
7 7
8 8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
9 9 class QScatterSeriesPrivate;
10 10
11 class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
11 class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QSeries
12 12 {
13 13 Q_OBJECT
14 14
@@ -30,7 +30,7 public:
30 30 ~QScatterSeries();
31 31
32 32 public: // from QChartSeries
33 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
33 QSeriesType type() const { return QSeries::SeriesTypeScatter; }
34 34
35 35 public:
36 36 void add(qreal x, qreal y);
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2 2 #define QSCATTERSERIESPRIVATE_H
3 3
4 4 #include "qchartglobal.h"
5 #include "qchartseries.h"
5 #include "qseries.h"
6 6 #include <QPen>
7 7
8 8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -6,8 +6,7 QT += core \
6 6 gui
7 7 CONFIG += debug_and_release
8 8 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
9 SOURCES += \
10 axisitem.cpp \
9 SOURCES += axisitem.cpp \
11 10 axisanimationitem.cpp \
12 11 chartdataset.cpp \
13 12 chartpresenter.cpp \
@@ -15,28 +14,24 SOURCES += \
15 14 domain.cpp \
16 15 qchart.cpp \
17 16 qchartaxis.cpp \
18 qchartseries.cpp \
19 qchartview.cpp
20 PRIVATE_HEADERS += \
21 axisitem_p.h \
17 qchartview.cpp \
18 qseries.cpp
19 PRIVATE_HEADERS += axisitem_p.h \
22 20 axisanimationitem_p.h \
23 21 chartdataset_p.h \
24 22 chartitem_p.h \
25 23 chartpresenter_p.h \
26 24 charttheme_p.h \
27 25 domain_p.h
28 PUBLIC_HEADERS += \
29 qchart.h \
26 PUBLIC_HEADERS += qchart.h \
30 27 qchartaxis.h \
31 28 qchartglobal.h \
32 qchartseries.h \
33 qchartview.h \
34
29 qseries.h \
30 qchartview.h
35 31 include(linechart/linechart.pri)
36 32 include(barchart/barchart.pri)
37 33 include(piechart/piechart.pri)
38 34 include(scatterseries/scatter.pri)
39
40 35 THEMES += themes/chartthemeicy_p.h \
41 36 themes/chartthemegrayscale_p.h \
42 37 themes/chartthemescientific_p.h \
@@ -74,7 +69,8 install_build_private_headers.commands = $$QMAKE_COPY \
74 69 $$CHART_BUILD_PRIVATE_HEADER_DIR
75 70 install_build_private_headers.CONFIG += target_predeps \
76 71 no_link
77 QMAKE_EXTRA_COMPILERS += install_build_public_headers install_build_private_headers
72 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
73 install_build_private_headers
78 74 chartversion.target = qchartversion_p.h
79 75 chartversion.commands = @echo \
80 76 "build_time" \
@@ -91,4 +87,3 unix:QMAKE_DISTCLEAN += -r \
91 87 win32:QMAKE_DISTCLEAN += /Q \
92 88 $$CHART_BUILD_HEADER_DIR \
93 89 $$CHART_BUILD_LIB_DIR
94
Show file before | Show file after | Hide comments
@@ -1,6 +1,5
1 1 #include <QtTest/QtTest>
2 2 #include <qchartaxis.h>
3 #include <qchartseries.h>
4 3 #include <qlineseries.h>
5 4 #include <private/chartdataset_p.h>
6 5 #include <private/domain_p.h>
@@ -9,7 +8,7 QTCOMMERCIALCHART_USE_NAMESPACE
9 8
10 9 Q_DECLARE_METATYPE(Domain)
11 10 Q_DECLARE_METATYPE(QChartAxis*)
12 Q_DECLARE_METATYPE(QChartSeries*)
11 Q_DECLARE_METATYPE(QSeries*)
13 12 Q_DECLARE_METATYPE(QLineSeries*)
14 13
15 14 class tst_ChartDataSet: public QObject {
@@ -47,7 +46,7 void tst_ChartDataSet::initTestCase()
47 46 {
48 47 qRegisterMetaType<Domain>("Domain");
49 48 qRegisterMetaType<QChartAxis*>();
50 qRegisterMetaType<QChartSeries*>();
49 qRegisterMetaType<QSeries*>();
51 50 }
52 51
53 52 void tst_ChartDataSet::cleanupTestCase()
@@ -111,10 +110,10 void tst_ChartDataSet::addDomain()
111 110 QSignalSpy spy1(&dataSet,
112 111 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
113 112 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
114 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
113 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
115 114 QSignalSpy spy4(&dataSet,
116 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
117 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
115 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
116 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
118 117
119 118 Domain domain2 = dataSet.domain(dataSet.axisY());
120 119 QVERIFY(domain1 == domain2);
@@ -157,10 +156,10 void tst_ChartDataSet::addSeries()
157 156 QSignalSpy spy1(&dataSet,
158 157 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
159 158 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
160 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
159 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
161 160 QSignalSpy spy4(&dataSet,
162 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
163 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
161 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
162 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
164 163
165 164 QList<QChartAxis*> axisList;
166 165
@@ -271,10 +270,10 void tst_ChartDataSet::clearDomains()
271 270 QSignalSpy spy1(&dataSet,
272 271 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
273 272 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
274 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
273 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
275 274 QSignalSpy spy4(&dataSet,
276 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
277 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
275 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
276 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
278 277
279 278 dataSet.clearDomains(indexCount);
280 279
@@ -329,10 +328,10 void tst_ChartDataSet::domain()
329 328 QSignalSpy spy1(&dataSet,
330 329 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
331 330 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
332 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
331 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
333 332 QSignalSpy spy4(&dataSet,
334 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
335 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
333 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
334 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
336 335
337 336 dataSet.addSeries(series1);
338 337 dataSet.addSeries(series2);
@@ -406,10 +405,10 void tst_ChartDataSet::nextpreviousDomain()
406 405 QSignalSpy spy1(&dataSet,
407 406 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
408 407 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
409 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
408 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
410 409 QSignalSpy spy4(&dataSet,
411 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
412 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
410 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
411 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
413 412
414 413 Domain domain;
415 414
@@ -476,7 +475,7 void tst_ChartDataSet::removeSeries()
476 475 ChartDataSet dataSet;
477 476
478 477 QList<QChartAxis*> axisList;
479 QList<QChartSeries*> seriesList;
478 QList<QSeries*> seriesList;
480 479
481 480 for (int i = 0; i < axisYCount; i++) {
482 481 QChartAxis* axis = new QChartAxis();
@@ -504,10 +503,10 void tst_ChartDataSet::removeSeries()
504 503 QSignalSpy spy1(&dataSet,
505 504 SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
506 505 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
507 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
506 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
508 507 QSignalSpy spy4(&dataSet,
509 SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
510 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
508 SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
509 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
511 510
512 511 for (int i = 0; i < seriesCount; i++) {
513 512 dataSet.removeSeries(seriesList.at(i));
@@ -574,9 +573,9 void tst_ChartDataSet::removeAllSeries()
574 573 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*)));
575 574 QSignalSpy spy1(&dataSet, SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
576 575 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
577 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
578 QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
579 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
576 QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
577 QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
578 QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
580 579
581 580 dataSet.removeAllSeries();
582 581 //default axis
Show file before | Show file after | Hide comments
@@ -1,6 +1,5
1 1 #include "mainwidget.h"
2 2 #include "dataseriedialog.h"
3 #include "qchartseries.h"
4 3 #include "qpieseries.h"
5 4 #include "qscatterseries.h"
6 5 #include <qlineseries.h>
@@ -281,24 +280,24 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
281 280 // TODO: spline and area
282 281 }
283 282
284 void MainWidget::setCurrentSeries(QChartSeries *series)
283 void MainWidget::setCurrentSeries(QSeries *series)
285 284 {
286 285 if (series) {
287 286 m_currentSeries = series;
288 287 switch (m_currentSeries->type()) {
289 case QChartSeries::SeriesTypeLine:
288 case QSeries::SeriesTypeLine:
290 289 break;
291 case QChartSeries::SeriesTypeScatter:
290 case QSeries::SeriesTypeScatter:
292 291 break;
293 case QChartSeries::SeriesTypePie:
292 case QSeries::SeriesTypePie:
294 293 break;
295 case QChartSeries::SeriesTypeBar:
294 case QSeries::SeriesTypeBar:
296 295 qDebug() << "setCurrentSeries (bar)";
297 296 break;
298 case QChartSeries::SeriesTypeStackedBar:
297 case QSeries::SeriesTypeStackedBar:
299 298 qDebug() << "setCurrentSeries (Stackedbar)";
300 299 break;
301 case QChartSeries::SeriesTypePercentBar:
300 case QSeries::SeriesTypePercentBar:
302 301 qDebug() << "setCurrentSeries (Percentbar)";
303 302 break;
304 303 default:
Show file before | Show file after | Hide comments
@@ -36,7 +36,7 private slots:
36 36 void xMaxChanged(int value);
37 37 void yMinChanged(int value);
38 38 void yMaxChanged(int value);
39 void setCurrentSeries(QChartSeries *series);
39 void setCurrentSeries(QSeries *series);
40 40 void changeChartTheme(int themeIndex);
41 41 void setPieSizeFactor(double margin);
42 42 void setPiePosition(int position);
@@ -51,7 +51,7 private:
51 51 QSpinBox *m_yMinSpin;
52 52 QSpinBox *m_yMaxSpin;
53 53 QString m_defaultSeriesName;
54 QChartSeries *m_currentSeries;
54 QSeries *m_currentSeries;
55 55 QGridLayout *m_scatterLayout;
56 56 QGridLayout *m_pieLayout;
57 57 };
General Comments 0
You need to be logged in to leave comments. Login now