@@ -66,7 +66,7 int main(int argc, char *argv[]) | |||||
66 | //![4] |
|
66 | //![4] | |
67 | QStringList categories; |
|
67 | QStringList categories; | |
68 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
68 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
69 |
QBarCategor |
|
69 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
70 | axis->append(categories); |
|
70 | axis->append(categories); | |
71 | chart->setAxisX(axis,series); |
|
71 | chart->setAxisX(axis,series); | |
72 | //![4] |
|
72 | //![4] |
@@ -88,7 +88,7 TableWidget::TableWidget(QWidget *parent) | |||||
88 | //! [6] |
|
88 | //! [6] | |
89 | QStringList categories; |
|
89 | QStringList categories; | |
90 | categories << "April" << "May" << "June" << "July" << "August"; |
|
90 | categories << "April" << "May" << "June" << "July" << "August"; | |
91 |
QBarCategor |
|
91 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
92 | axis->append(categories); |
|
92 | axis->append(categories); | |
93 | chart->createDefaultAxes(); |
|
93 | chart->createDefaultAxes(); | |
94 | chart->setAxisX(axis, series); |
|
94 | chart->setAxisX(axis, series); |
@@ -68,7 +68,7 int main(int argc, char *argv[]) | |||||
68 | //![4] |
|
68 | //![4] | |
69 | QStringList categories; |
|
69 | QStringList categories; | |
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
71 |
QBarCategor |
|
71 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
72 | axis->append(categories); |
|
72 | axis->append(categories); | |
73 | chart->setAxisY(axis,series); |
|
73 | chart->setAxisY(axis,series); | |
74 | //![4] |
|
74 | //![4] |
@@ -68,7 +68,7 int main(int argc, char *argv[]) | |||||
68 | //![4] |
|
68 | //![4] | |
69 | QStringList categories; |
|
69 | QStringList categories; | |
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
71 |
QBarCategor |
|
71 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
72 | axis->append(categories); |
|
72 | axis->append(categories); | |
73 | chart->createDefaultAxes(); |
|
73 | chart->createDefaultAxes(); | |
74 | chart->setAxisY(axis,series); |
|
74 | chart->setAxisY(axis,series); |
@@ -68,7 +68,7 int main(int argc, char *argv[]) | |||||
68 | //![4] |
|
68 | //![4] | |
69 | QStringList categories; |
|
69 | QStringList categories; | |
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
70 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
71 |
QBarCategor |
|
71 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
72 | axis->append(categories); |
|
72 | axis->append(categories); | |
73 | chart->createDefaultAxes(); |
|
73 | chart->createDefaultAxes(); | |
74 | chart->setAxisY(axis,series); |
|
74 | chart->setAxisY(axis,series); |
@@ -78,7 +78,7 int main(int argc, char *argv[]) | |||||
78 | //![4] |
|
78 | //![4] | |
79 | QStringList categories; |
|
79 | QStringList categories; | |
80 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
80 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
81 |
QBarCategor |
|
81 | QBarCategoryAxis* axisX = new QBarCategoryAxis(); | |
82 | axisX->append(categories); |
|
82 | axisX->append(categories); | |
83 | chart->setAxisX(axisX,lineseries); |
|
83 | chart->setAxisX(axisX,lineseries); | |
84 | chart->setAxisX(axisX,barseries); |
|
84 | chart->setAxisX(axisX,barseries); |
@@ -64,7 +64,7 int main(int argc, char *argv[]) | |||||
64 | //![4] |
|
64 | //![4] | |
65 | QStringList categories; |
|
65 | QStringList categories; | |
66 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
66 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
67 |
QBarCategor |
|
67 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
68 | axis->append(categories); |
|
68 | axis->append(categories); | |
69 | chart->createDefaultAxes(); |
|
69 | chart->createDefaultAxes(); | |
70 | chart->setAxisX(axis,series); |
|
70 | chart->setAxisX(axis,series); |
@@ -67,7 +67,7 int main(int argc, char *argv[]) | |||||
67 | categories << "0-4" << "5-9" << "10-14" << "15-19" << "20-24" << "25-29" << "30-34" << "35-39" << "40-44" << "45-49" |
|
67 | categories << "0-4" << "5-9" << "10-14" << "15-19" << "20-24" << "25-29" << "30-34" << "35-39" << "40-44" << "45-49" | |
68 | << "50-54" << "55-59" << "60-64" << "65-69" << "70-74" << "75-79" << "80-84" << "85-89" << "90-"; |
|
68 | << "50-54" << "55-59" << "60-64" << "65-69" << "70-74" << "75-79" << "80-84" << "85-89" << "90-"; | |
69 |
|
69 | |||
70 |
QBarCategor |
|
70 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
71 | axis->append(categories); |
|
71 | axis->append(categories); | |
72 | chart->setAxisY(axis,series); |
|
72 | chart->setAxisY(axis,series); | |
73 | //![4] |
|
73 | //![4] |
@@ -71,7 +71,7 int main(int argc, char *argv[]) | |||||
71 |
|
71 | |||
72 | QStringList categories; |
|
72 | QStringList categories; | |
73 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
73 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
74 |
QBarCategor |
|
74 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
75 | axis->append(categories); |
|
75 | axis->append(categories); | |
76 | chart->setAxisX(axis, series2); |
|
76 | chart->setAxisX(axis, series2); | |
77 |
|
77 |
@@ -65,7 +65,7 int main(int argc, char *argv[]) | |||||
65 | //![4] |
|
65 | //![4] | |
66 | QStringList categories; |
|
66 | QStringList categories; | |
67 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
67 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |
68 |
QBarCategor |
|
68 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
69 | axis->append(categories); |
|
69 | axis->append(categories); | |
70 | chart->setAxisX(axis,series); |
|
70 | chart->setAxisX(axis,series); | |
71 | //![4] |
|
71 | //![4] |
@@ -38,7 +38,7 void DrilldownChart::changeSeries(DrilldownBarSeries *series) | |||||
38 | m_currentSeries = series; |
|
38 | m_currentSeries = series; | |
39 |
|
39 | |||
40 | // Reset axis |
|
40 | // Reset axis | |
41 |
QBarCategor |
|
41 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
42 | axis->append(m_currentSeries->categories()); |
|
42 | axis->append(m_currentSeries->categories()); | |
43 |
|
43 | |||
44 | addSeries(series); |
|
44 | addSeries(series); |
@@ -69,7 +69,7 public: | |||||
69 | qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper"); |
|
69 | qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper"); | |
70 | qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper"); |
|
70 | qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper"); | |
71 | qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis"); |
|
71 | qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis"); | |
72 |
qmlRegisterType<QBarCategor |
|
72 | qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis"); | |
73 |
|
73 | |||
74 | qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend", |
|
74 | qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend", | |
75 | QLatin1String("Trying to create uncreatable: Legend.")); |
|
75 | QLatin1String("Trying to create uncreatable: Legend.")); |
@@ -28,7 +28,7 static int label_padding = 5; | |||||
28 |
|
28 | |||
29 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
29 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
30 |
|
30 | |||
31 |
ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategor |
|
31 | ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), | |
32 | m_categoriesAxis(axis) |
|
32 | m_categoriesAxis(axis) | |
33 | { |
|
33 | { | |
34 |
|
34 |
@@ -36,12 +36,12 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
36 |
|
36 | |||
37 | class QAbstractAxis; |
|
37 | class QAbstractAxis; | |
38 | class ChartPresenter; |
|
38 | class ChartPresenter; | |
39 |
class QBarCategor |
|
39 | class QBarCategoryAxis; | |
40 |
|
40 | |||
41 | class ChartCategoriesAxisX : public ChartAxis |
|
41 | class ChartCategoriesAxisX : public ChartAxis | |
42 | { |
|
42 | { | |
43 | public: |
|
43 | public: | |
44 |
ChartCategoriesAxisX(QBarCategor |
|
44 | ChartCategoriesAxisX(QBarCategoryAxis *axis, ChartPresenter *presenter); | |
45 | ~ChartCategoriesAxisX(); |
|
45 | ~ChartCategoriesAxisX(); | |
46 |
|
46 | |||
47 | AxisType axisType() const { return X_AXIS;} |
|
47 | AxisType axisType() const { return X_AXIS;} | |
@@ -56,7 +56,7 Q_SLOTS | |||||
56 |
|
56 | |||
57 | private: |
|
57 | private: | |
58 | QStringList m_categories; |
|
58 | QStringList m_categories; | |
59 |
QBarCategor |
|
59 | QBarCategoryAxis *m_categoriesAxis; | |
60 | }; |
|
60 | }; | |
61 |
|
61 | |||
62 | QTCOMMERCIALCHART_END_NAMESPACE |
|
62 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -27,7 +27,7 static int label_padding = 5; | |||||
27 |
|
27 | |||
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
29 |
|
29 | |||
30 |
ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategor |
|
30 | ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), | |
31 | m_categoriesAxis(axis) |
|
31 | m_categoriesAxis(axis) | |
32 | { |
|
32 | { | |
33 | } |
|
33 | } |
@@ -35,13 +35,13 | |||||
35 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
35 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
36 |
|
36 | |||
37 | class QAbstractAxis; |
|
37 | class QAbstractAxis; | |
38 |
class QBarCategor |
|
38 | class QBarCategoryAxis; | |
39 | class ChartPresenter; |
|
39 | class ChartPresenter; | |
40 |
|
40 | |||
41 | class ChartCategoriesAxisY : public ChartAxis |
|
41 | class ChartCategoriesAxisY : public ChartAxis | |
42 | { |
|
42 | { | |
43 | public: |
|
43 | public: | |
44 |
ChartCategoriesAxisY(QBarCategor |
|
44 | ChartCategoriesAxisY(QBarCategoryAxis *axis, ChartPresenter *presenter); | |
45 | ~ChartCategoriesAxisY(); |
|
45 | ~ChartCategoriesAxisY(); | |
46 |
|
46 | |||
47 | AxisType axisType() const { return Y_AXIS;} |
|
47 | AxisType axisType() const { return Y_AXIS;} | |
@@ -55,7 +55,7 Q_SLOTS | |||||
55 | void handleAxisUpdated(); |
|
55 | void handleAxisUpdated(); | |
56 | private: |
|
56 | private: | |
57 | QStringList m_categories; |
|
57 | QStringList m_categories; | |
58 |
QBarCategor |
|
58 | QBarCategoryAxis *m_categoriesAxis; | |
59 | }; |
|
59 | }; | |
60 |
|
60 | |||
61 | QTCOMMERCIALCHART_END_NAMESPACE |
|
61 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -114,17 +114,17 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
114 | /*! |
|
114 | /*! | |
115 | Constructs an axis object which is a child of \a parent. |
|
115 | Constructs an axis object which is a child of \a parent. | |
116 | */ |
|
116 | */ | |
117 |
QBarCategor |
|
117 | QBarCategoryAxis::QBarCategoryAxis(QObject *parent): | |
118 |
QAbstractAxis(*new QBarCategor |
|
118 | QAbstractAxis(*new QBarCategoryAxisPrivate(this),parent) | |
119 | { |
|
119 | { | |
120 | } |
|
120 | } | |
121 |
|
121 | |||
122 | /*! |
|
122 | /*! | |
123 | Destroys the object |
|
123 | Destroys the object | |
124 | */ |
|
124 | */ | |
125 |
QBarCategor |
|
125 | QBarCategoryAxis::~QBarCategoryAxis() | |
126 | { |
|
126 | { | |
127 |
Q_D(QBarCategor |
|
127 | Q_D(QBarCategoryAxis); | |
128 | if(d->m_dataset){ |
|
128 | if(d->m_dataset){ | |
129 | d->m_dataset->removeAxis(this); |
|
129 | d->m_dataset->removeAxis(this); | |
130 | } |
|
130 | } | |
@@ -133,7 +133,7 QBarCategoriesAxis::~QBarCategoriesAxis() | |||||
133 | /*! |
|
133 | /*! | |
134 | \internal |
|
134 | \internal | |
135 | */ |
|
135 | */ | |
136 |
QBarCategor |
|
136 | QBarCategoryAxis::QBarCategoryAxis(QBarCategoryAxisPrivate &d,QObject *parent):QAbstractAxis(d,parent) | |
137 | { |
|
137 | { | |
138 |
|
138 | |||
139 | } |
|
139 | } | |
@@ -141,11 +141,11 QBarCategoriesAxis::QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *par | |||||
141 | /*! |
|
141 | /*! | |
142 | Appends \a categories to axis |
|
142 | Appends \a categories to axis | |
143 | */ |
|
143 | */ | |
144 |
void QBarCategor |
|
144 | void QBarCategoryAxis::append(const QStringList &categories) | |
145 | { |
|
145 | { | |
146 | if(categories.isEmpty()) return; |
|
146 | if(categories.isEmpty()) return; | |
147 |
|
147 | |||
148 |
Q_D(QBarCategor |
|
148 | Q_D(QBarCategoryAxis); | |
149 | if (d->m_categories.isEmpty()) { |
|
149 | if (d->m_categories.isEmpty()) { | |
150 | d->m_categories.append(categories); |
|
150 | d->m_categories.append(categories); | |
151 | setRange(categories.first(),categories.last()); |
|
151 | setRange(categories.first(),categories.last()); | |
@@ -159,9 +159,9 void QBarCategoriesAxis::append(const QStringList &categories) | |||||
159 | /*! |
|
159 | /*! | |
160 | Appends \a category to axis |
|
160 | Appends \a category to axis | |
161 | */ |
|
161 | */ | |
162 |
void QBarCategor |
|
162 | void QBarCategoryAxis::append(const QString &category) | |
163 | { |
|
163 | { | |
164 |
Q_D(QBarCategor |
|
164 | Q_D(QBarCategoryAxis); | |
165 | if (d->m_categories.isEmpty()) { |
|
165 | if (d->m_categories.isEmpty()) { | |
166 | d->m_categories.append(category); |
|
166 | d->m_categories.append(category); | |
167 | setRange(category,category); |
|
167 | setRange(category,category); | |
@@ -175,9 +175,9 void QBarCategoriesAxis::append(const QString &category) | |||||
175 | /*! |
|
175 | /*! | |
176 | Removes \a category from axis |
|
176 | Removes \a category from axis | |
177 | */ |
|
177 | */ | |
178 |
void QBarCategor |
|
178 | void QBarCategoryAxis::remove(const QString &category) | |
179 | { |
|
179 | { | |
180 |
Q_D(QBarCategor |
|
180 | Q_D(QBarCategoryAxis); | |
181 | if (d->m_categories.contains(category)) { |
|
181 | if (d->m_categories.contains(category)) { | |
182 | d->m_categories.removeAt(d->m_categories.indexOf(category)); |
|
182 | d->m_categories.removeAt(d->m_categories.indexOf(category)); | |
183 | if(!d->m_categories.isEmpty()) |
|
183 | if(!d->m_categories.isEmpty()) | |
@@ -191,9 +191,9 void QBarCategoriesAxis::remove(const QString &category) | |||||
191 | /*! |
|
191 | /*! | |
192 | Inserts \a category to axis at \a index |
|
192 | Inserts \a category to axis at \a index | |
193 | */ |
|
193 | */ | |
194 |
void QBarCategor |
|
194 | void QBarCategoryAxis::insert(int index, const QString &category) | |
195 | { |
|
195 | { | |
196 |
Q_D(QBarCategor |
|
196 | Q_D(QBarCategoryAxis); | |
197 | if (d->m_categories.isEmpty()) { |
|
197 | if (d->m_categories.isEmpty()) { | |
198 | d->m_categories.insert(index,category); |
|
198 | d->m_categories.insert(index,category); | |
199 | setRange(category,category); |
|
199 | setRange(category,category); | |
@@ -208,9 +208,9 void QBarCategoriesAxis::insert(int index, const QString &category) | |||||
208 | Replaces \a oldCategory with \a newCategory. |
|
208 | Replaces \a oldCategory with \a newCategory. | |
209 | If \a oldCategory does not exits on the axis nothing is done. |
|
209 | If \a oldCategory does not exits on the axis nothing is done. | |
210 | */ |
|
210 | */ | |
211 |
void QBarCategor |
|
211 | void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCategory) | |
212 | { |
|
212 | { | |
213 |
Q_D(QBarCategor |
|
213 | Q_D(QBarCategoryAxis); | |
214 | int pos = d->m_categories.indexOf(oldCategory); |
|
214 | int pos = d->m_categories.indexOf(oldCategory); | |
215 | if (pos != -1) { |
|
215 | if (pos != -1) { | |
216 | d->m_categories.replace(pos, newCategory); |
|
216 | d->m_categories.replace(pos, newCategory); | |
@@ -222,17 +222,17 void QBarCategoriesAxis::replace(const QString &oldCategory, const QString &newC | |||||
222 | /*! |
|
222 | /*! | |
223 | Removes all categories. |
|
223 | Removes all categories. | |
224 | */ |
|
224 | */ | |
225 |
void QBarCategor |
|
225 | void QBarCategoryAxis::clear() | |
226 | { |
|
226 | { | |
227 |
Q_D(QBarCategor |
|
227 | Q_D(QBarCategoryAxis); | |
228 | d->m_categories.clear(); |
|
228 | d->m_categories.clear(); | |
229 | setRange(QString::null,QString::null); |
|
229 | setRange(QString::null,QString::null); | |
230 | emit categoriesChanged(); |
|
230 | emit categoriesChanged(); | |
231 | } |
|
231 | } | |
232 |
|
232 | |||
233 |
void QBarCategor |
|
233 | void QBarCategoryAxis::setCategories(const QStringList &categories) | |
234 | { |
|
234 | { | |
235 |
Q_D(QBarCategor |
|
235 | Q_D(QBarCategoryAxis); | |
236 | if(d->m_categories!=categories) { |
|
236 | if(d->m_categories!=categories) { | |
237 | d->m_categories = categories; |
|
237 | d->m_categories = categories; | |
238 | setRange(categories.first(),categories.last()); |
|
238 | setRange(categories.first(),categories.last()); | |
@@ -240,72 +240,72 void QBarCategoriesAxis::setCategories(const QStringList &categories) | |||||
240 | } |
|
240 | } | |
241 | } |
|
241 | } | |
242 |
|
242 | |||
243 |
QStringList QBarCategor |
|
243 | QStringList QBarCategoryAxis::categories() | |
244 | { |
|
244 | { | |
245 |
Q_D(QBarCategor |
|
245 | Q_D(QBarCategoryAxis); | |
246 | return d->m_categories; |
|
246 | return d->m_categories; | |
247 | } |
|
247 | } | |
248 |
|
248 | |||
249 | /*! |
|
249 | /*! | |
250 | Returns number of categories. |
|
250 | Returns number of categories. | |
251 | */ |
|
251 | */ | |
252 |
int QBarCategor |
|
252 | int QBarCategoryAxis::count() const | |
253 | { |
|
253 | { | |
254 |
Q_D(const QBarCategor |
|
254 | Q_D(const QBarCategoryAxis); | |
255 | return d->m_categories.count(); |
|
255 | return d->m_categories.count(); | |
256 | } |
|
256 | } | |
257 |
|
257 | |||
258 | /*! |
|
258 | /*! | |
259 | Returns category at \a index. Index must be valid. |
|
259 | Returns category at \a index. Index must be valid. | |
260 | */ |
|
260 | */ | |
261 |
QString QBarCategor |
|
261 | QString QBarCategoryAxis::at(int index) const | |
262 | { |
|
262 | { | |
263 |
Q_D(const QBarCategor |
|
263 | Q_D(const QBarCategoryAxis); | |
264 | return d->m_categories.at(index); |
|
264 | return d->m_categories.at(index); | |
265 | } |
|
265 | } | |
266 |
|
266 | |||
267 | /*! |
|
267 | /*! | |
268 | Sets minimum category to \a min. |
|
268 | Sets minimum category to \a min. | |
269 | */ |
|
269 | */ | |
270 |
void QBarCategor |
|
270 | void QBarCategoryAxis::setMin(const QString& min) | |
271 | { |
|
271 | { | |
272 |
Q_D(QBarCategor |
|
272 | Q_D(QBarCategoryAxis); | |
273 | setRange(min,d->m_maxCategory); |
|
273 | setRange(min,d->m_maxCategory); | |
274 | } |
|
274 | } | |
275 |
|
275 | |||
276 | /*! |
|
276 | /*! | |
277 | Returns minimum category. |
|
277 | Returns minimum category. | |
278 | */ |
|
278 | */ | |
279 |
QString QBarCategor |
|
279 | QString QBarCategoryAxis::min() const | |
280 | { |
|
280 | { | |
281 |
Q_D(const QBarCategor |
|
281 | Q_D(const QBarCategoryAxis); | |
282 | return d->m_minCategory; |
|
282 | return d->m_minCategory; | |
283 | } |
|
283 | } | |
284 |
|
284 | |||
285 | /*! |
|
285 | /*! | |
286 | Sets maximum category to \a max. |
|
286 | Sets maximum category to \a max. | |
287 | */ |
|
287 | */ | |
288 |
void QBarCategor |
|
288 | void QBarCategoryAxis::setMax(const QString& max) | |
289 | { |
|
289 | { | |
290 |
Q_D(QBarCategor |
|
290 | Q_D(QBarCategoryAxis); | |
291 | setRange(d->m_minCategory,max); |
|
291 | setRange(d->m_minCategory,max); | |
292 | } |
|
292 | } | |
293 |
|
293 | |||
294 | /*! |
|
294 | /*! | |
295 | Returns maximum category |
|
295 | Returns maximum category | |
296 | */ |
|
296 | */ | |
297 |
QString QBarCategor |
|
297 | QString QBarCategoryAxis::max() const | |
298 | { |
|
298 | { | |
299 |
Q_D(const QBarCategor |
|
299 | Q_D(const QBarCategoryAxis); | |
300 | return d->m_maxCategory; |
|
300 | return d->m_maxCategory; | |
301 | } |
|
301 | } | |
302 |
|
302 | |||
303 | /*! |
|
303 | /*! | |
304 | Sets range from \a minCategory to \a maxCategory |
|
304 | Sets range from \a minCategory to \a maxCategory | |
305 | */ |
|
305 | */ | |
306 |
void QBarCategor |
|
306 | void QBarCategoryAxis::setRange(const QString& minCategory, const QString& maxCategory) | |
307 | { |
|
307 | { | |
308 |
Q_D(QBarCategor |
|
308 | Q_D(QBarCategoryAxis); | |
309 |
|
309 | |||
310 | bool changed = false; |
|
310 | bool changed = false; | |
311 |
|
311 | |||
@@ -348,14 +348,14 void QBarCategoriesAxis::setRange(const QString& minCategory, const QString& max | |||||
348 | /*! |
|
348 | /*! | |
349 | Returns the type of the axis |
|
349 | Returns the type of the axis | |
350 | */ |
|
350 | */ | |
351 |
QAbstractAxis::AxisType QBarCategor |
|
351 | QAbstractAxis::AxisType QBarCategoryAxis::type() const | |
352 | { |
|
352 | { | |
353 | return AxisTypeCategories; |
|
353 | return AxisTypeCategories; | |
354 | } |
|
354 | } | |
355 |
|
355 | |||
356 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
|
356 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | |
357 |
|
357 | |||
358 |
QBarCategor |
|
358 | QBarCategoryAxisPrivate::QBarCategoryAxisPrivate(QBarCategoryAxis* q): | |
359 | QAbstractAxisPrivate(q), |
|
359 | QAbstractAxisPrivate(q), | |
360 | m_min(0.0), |
|
360 | m_min(0.0), | |
361 | m_max(0.0), |
|
361 | m_max(0.0), | |
@@ -364,32 +364,32 QBarCategoriesAxisPrivate::QBarCategoriesAxisPrivate(QBarCategoriesAxis* q): | |||||
364 |
|
364 | |||
365 | } |
|
365 | } | |
366 |
|
366 | |||
367 |
QBarCategor |
|
367 | QBarCategoryAxisPrivate::~QBarCategoryAxisPrivate() | |
368 | { |
|
368 | { | |
369 |
|
369 | |||
370 | } |
|
370 | } | |
371 |
|
371 | |||
372 |
void QBarCategor |
|
372 | void QBarCategoryAxisPrivate::setMin(const QVariant &min) | |
373 | { |
|
373 | { | |
374 | setRange(min,m_maxCategory); |
|
374 | setRange(min,m_maxCategory); | |
375 | } |
|
375 | } | |
376 |
|
376 | |||
377 |
void QBarCategor |
|
377 | void QBarCategoryAxisPrivate::setMax(const QVariant &max) | |
378 | { |
|
378 | { | |
379 | setRange(m_minCategory,max); |
|
379 | setRange(m_minCategory,max); | |
380 | } |
|
380 | } | |
381 |
|
381 | |||
382 |
void QBarCategor |
|
382 | void QBarCategoryAxisPrivate::setRange(const QVariant &min, const QVariant &max) | |
383 | { |
|
383 | { | |
384 |
Q_Q(QBarCategor |
|
384 | Q_Q(QBarCategoryAxis); | |
385 | QString value1 = min.toString(); |
|
385 | QString value1 = min.toString(); | |
386 | QString value2 = max.toString(); |
|
386 | QString value2 = max.toString(); | |
387 | q->setRange(value1,value2); |
|
387 | q->setRange(value1,value2); | |
388 | } |
|
388 | } | |
389 |
|
389 | |||
390 |
void QBarCategor |
|
390 | void QBarCategoryAxisPrivate::handleDomainUpdated() | |
391 | { |
|
391 | { | |
392 |
Q_Q(QBarCategor |
|
392 | Q_Q(QBarCategoryAxis); | |
393 | Domain* domain = qobject_cast<Domain*>(sender()); |
|
393 | Domain* domain = qobject_cast<Domain*>(sender()); | |
394 |
|
394 | |||
395 | if(m_orientation==Qt::Horizontal) { |
|
395 | if(m_orientation==Qt::Horizontal) { | |
@@ -426,9 +426,9 void QBarCategoriesAxisPrivate::handleDomainUpdated() | |||||
426 | } |
|
426 | } | |
427 | } |
|
427 | } | |
428 |
|
428 | |||
429 |
ChartAxis* QBarCategor |
|
429 | ChartAxis* QBarCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) | |
430 | { |
|
430 | { | |
431 |
Q_Q(QBarCategor |
|
431 | Q_Q(QBarCategoryAxis); | |
432 | if(m_orientation == Qt::Vertical){ |
|
432 | if(m_orientation == Qt::Vertical){ | |
433 | return new ChartCategoriesAxisY(q,presenter); |
|
433 | return new ChartCategoriesAxisY(q,presenter); | |
434 | }else{ |
|
434 | }else{ | |
@@ -436,10 +436,10 ChartAxis* QBarCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter) | |||||
436 | } |
|
436 | } | |
437 | } |
|
437 | } | |
438 |
|
438 | |||
439 |
void QBarCategor |
|
439 | void QBarCategoryAxisPrivate::intializeDomain(Domain* domain) | |
440 | { |
|
440 | { | |
441 |
|
441 | |||
442 |
Q_Q(QBarCategor |
|
442 | Q_Q(QBarCategoryAxis); | |
443 | if(m_max==m_min) { |
|
443 | if(m_max==m_min) { | |
444 | int min; |
|
444 | int min; | |
445 | int max; |
|
445 | int max; |
@@ -25,9 +25,9 | |||||
25 |
|
25 | |||
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
27 |
|
27 | |||
28 |
class QBarCategor |
|
28 | class QBarCategoryAxisPrivate; | |
29 |
|
29 | |||
30 |
class QTCOMMERCIALCHART_EXPORT QBarCategor |
|
30 | class QTCOMMERCIALCHART_EXPORT QBarCategoryAxis : public QAbstractAxis | |
31 | { |
|
31 | { | |
32 | Q_OBJECT |
|
32 | Q_OBJECT | |
33 | Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) |
|
33 | Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) | |
@@ -35,11 +35,11 class QTCOMMERCIALCHART_EXPORT QBarCategoriesAxis : public QAbstractAxis | |||||
35 | Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged) |
|
35 | Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged) | |
36 |
|
36 | |||
37 | public: |
|
37 | public: | |
38 |
explicit QBarCategor |
|
38 | explicit QBarCategoryAxis(QObject *parent = 0); | |
39 |
~QBarCategor |
|
39 | ~QBarCategoryAxis(); | |
40 |
|
40 | |||
41 | protected: |
|
41 | protected: | |
42 |
QBarCategor |
|
42 | QBarCategoryAxis(QBarCategoryAxisPrivate &d,QObject *parent = 0); | |
43 |
|
43 | |||
44 | public: |
|
44 | public: | |
45 | AxisType type() const; |
|
45 | AxisType type() const; | |
@@ -68,8 +68,8 Q_SIGNALS: | |||||
68 | void rangeChanged(const QString &min, const QString &max); |
|
68 | void rangeChanged(const QString &min, const QString &max); | |
69 |
|
69 | |||
70 | private: |
|
70 | private: | |
71 |
Q_DECLARE_PRIVATE(QBarCategor |
|
71 | Q_DECLARE_PRIVATE(QBarCategoryAxis) | |
72 |
Q_DISABLE_COPY(QBarCategor |
|
72 | Q_DISABLE_COPY(QBarCategoryAxis) | |
73 | friend class ChartCategoriesAxisX; |
|
73 | friend class ChartCategoriesAxisX; | |
74 | friend class ChartCategoriesAxisY; |
|
74 | friend class ChartCategoriesAxisY; | |
75 | }; |
|
75 | }; |
@@ -37,21 +37,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
37 |
|
37 | |||
38 | class Domain; |
|
38 | class Domain; | |
39 |
|
39 | |||
40 |
class QBarCategor |
|
40 | class QBarCategoryAxisPrivate : public QAbstractAxisPrivate | |
41 | { |
|
41 | { | |
42 | Q_OBJECT |
|
42 | Q_OBJECT | |
43 |
|
43 | |||
44 | public: |
|
44 | public: | |
45 |
QBarCategor |
|
45 | QBarCategoryAxisPrivate(QBarCategoryAxis *q); | |
46 |
~QBarCategor |
|
46 | ~QBarCategoryAxisPrivate(); | |
47 |
|
47 | |||
48 | public: |
|
48 | public: | |
49 | ChartAxis* createGraphics(ChartPresenter* presenter); |
|
49 | ChartAxis* createGraphics(ChartPresenter* presenter); | |
50 | void intializeDomain(Domain* domain); |
|
50 | void intializeDomain(Domain* domain); | |
51 | void handleDomainUpdated(); |
|
51 | void handleDomainUpdated(); | |
52 |
qreal min() { return m_min;} |
|
52 | qreal min() { return m_min;} | |
53 |
qreal max() { return m_max;} |
|
53 | qreal max() { return m_max;} | |
54 |
int count() const { return m_count; } |
|
54 | int count() const { return m_count; } | |
55 |
|
55 | |||
56 | private: |
|
56 | private: | |
57 | //range handling |
|
57 | //range handling | |
@@ -68,7 +68,7 private: | |||||
68 | int m_count; |
|
68 | int m_count; | |
69 |
|
69 | |||
70 | private: |
|
70 | private: | |
71 |
Q_DECLARE_PUBLIC(QBarCategor |
|
71 | Q_DECLARE_PUBLIC(QBarCategoryAxis); | |
72 | }; |
|
72 | }; | |
73 |
|
73 | |||
74 | QTCOMMERCIALCHART_END_NAMESPACE |
|
74 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -754,7 +754,7 void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) | |||||
754 |
|
754 | |||
755 | if(axis->orientation()==Qt::Vertical) |
|
755 | if(axis->orientation()==Qt::Vertical) | |
756 | { |
|
756 | { | |
757 |
populateCategories(qobject_cast<QBarCategor |
|
757 | populateCategories(qobject_cast<QBarCategoryAxis*>(axis)); | |
758 | } |
|
758 | } | |
759 | break; |
|
759 | break; | |
760 | } |
|
760 | } | |
@@ -764,7 +764,7 void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) | |||||
764 |
|
764 | |||
765 | if(axis->orientation()==Qt::Horizontal) |
|
765 | if(axis->orientation()==Qt::Horizontal) | |
766 | { |
|
766 | { | |
767 |
populateCategories(qobject_cast<QBarCategor |
|
767 | populateCategories(qobject_cast<QBarCategoryAxis*>(axis)); | |
768 | } |
|
768 | } | |
769 | break; |
|
769 | break; | |
770 | } |
|
770 | } | |
@@ -811,7 +811,7 QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisType(Qt::Orientati | |||||
811 |
|
811 | |||
812 | } |
|
812 | } | |
813 |
|
813 | |||
814 |
void QAbstractBarSeriesPrivate::populateCategories(QBarCategor |
|
814 | void QAbstractBarSeriesPrivate::populateCategories(QBarCategoryAxis* axis) | |
815 | { |
|
815 | { | |
816 | QStringList categories; |
|
816 | QStringList categories; | |
817 | if(axis->categories().isEmpty()) { |
|
817 | if(axis->categories().isEmpty()) { |
@@ -38,7 +38,7 | |||||
38 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
38 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
39 |
|
39 | |||
40 | class QBarModelMapper; |
|
40 | class QBarModelMapper; | |
41 |
class QBarCategor |
|
41 | class QBarCategoryAxis; | |
42 |
|
42 | |||
43 | class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate |
|
43 | class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate | |
44 | { |
|
44 | { | |
@@ -85,7 +85,7 Q_SIGNALS: | |||||
85 | void labelsVisibleChanged(bool visible); |
|
85 | void labelsVisibleChanged(bool visible); | |
86 |
|
86 | |||
87 | private: |
|
87 | private: | |
88 |
void populateCategories(QBarCategor |
|
88 | void populateCategories(QBarCategoryAxis* axis); | |
89 |
|
89 | |||
90 | protected: |
|
90 | protected: | |
91 | QList<QBarSet *> m_barSets; |
|
91 | QList<QBarSet *> m_barSets; |
@@ -180,7 +180,7 QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type,Qt::Orienta | |||||
180 | axis = new QValueAxis(this); |
|
180 | axis = new QValueAxis(this); | |
181 | break; |
|
181 | break; | |
182 | case QAbstractAxis::AxisTypeCategories: |
|
182 | case QAbstractAxis::AxisTypeCategories: | |
183 |
axis = new QBarCategor |
|
183 | axis = new QBarCategoryAxis(this); | |
184 | break; |
|
184 | break; | |
185 | case QAbstractAxis::AxisTypeIntervals: |
|
185 | case QAbstractAxis::AxisTypeIntervals: | |
186 | axis = new QIntervalsAxis(this); |
|
186 | axis = new QIntervalsAxis(this); |
@@ -75,7 +75,7 private slots: | |||||
75 | void autoscale(); |
|
75 | void autoscale(); | |
76 |
|
76 | |||
77 | private: |
|
77 | private: | |
78 |
QBarCategor |
|
78 | QBarCategoryAxis* m_baraxis; | |
79 | QBarSeries* m_series; |
|
79 | QBarSeries* m_series; | |
80 | }; |
|
80 | }; | |
81 |
|
81 | |||
@@ -89,7 +89,7 void tst_QBarCategoriesAxis::cleanupTestCase() | |||||
89 |
|
89 | |||
90 | void tst_QBarCategoriesAxis::init() |
|
90 | void tst_QBarCategoriesAxis::init() | |
91 | { |
|
91 | { | |
92 |
m_baraxis = new QBarCategor |
|
92 | m_baraxis = new QBarCategoryAxis(); | |
93 | m_series = new QBarSeries(); |
|
93 | m_series = new QBarSeries(); | |
94 |
|
94 | |||
95 | QBarSet *set0 = new QBarSet("Jane"); |
|
95 | QBarSet *set0 = new QBarSet("Jane"); | |
@@ -136,7 +136,7 void tst_QBarCategoriesAxis::qbarcategoriesaxis_data() | |||||
136 | void tst_QBarCategoriesAxis::qbarcategoriesaxis() |
|
136 | void tst_QBarCategoriesAxis::qbarcategoriesaxis() | |
137 | { |
|
137 | { | |
138 | qabstractaxis(); |
|
138 | qabstractaxis(); | |
139 |
QBarCategor |
|
139 | QBarCategoryAxis axis; | |
140 | axis.append(QStringList()); |
|
140 | axis.append(QStringList()); | |
141 | axis.append(QString()); |
|
141 | axis.append(QString()); | |
142 | QCOMPARE(axis.at(0), QString()); |
|
142 | QCOMPARE(axis.at(0), QString()); | |
@@ -167,7 +167,7 void tst_QBarCategoriesAxis::append() | |||||
167 | { |
|
167 | { | |
168 | QFETCH(QStringList, categories); |
|
168 | QFETCH(QStringList, categories); | |
169 |
|
169 | |||
170 |
QBarCategor |
|
170 | QBarCategoryAxis axis; | |
171 |
|
171 | |||
172 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); |
|
172 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); | |
173 | QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); |
|
173 | QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); | |
@@ -208,7 +208,7 void tst_QBarCategoriesAxis::at() | |||||
208 | QFETCH(QString, string); |
|
208 | QFETCH(QString, string); | |
209 | QFETCH(QStringList, categories); |
|
209 | QFETCH(QStringList, categories); | |
210 |
|
210 | |||
211 |
QBarCategor |
|
211 | QBarCategoryAxis axis; | |
212 | axis.append(categories); |
|
212 | axis.append(categories); | |
213 |
|
213 | |||
214 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); |
|
214 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); | |
@@ -244,7 +244,7 void tst_QBarCategoriesAxis::categories() | |||||
244 | { |
|
244 | { | |
245 | QFETCH(QStringList, categories); |
|
245 | QFETCH(QStringList, categories); | |
246 |
|
246 | |||
247 |
QBarCategor |
|
247 | QBarCategoryAxis axis; | |
248 |
|
248 | |||
249 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); |
|
249 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); | |
250 | QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); |
|
250 | QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); | |
@@ -281,7 +281,7 void tst_QBarCategoriesAxis::clear() | |||||
281 | { |
|
281 | { | |
282 | QFETCH(QStringList, categories); |
|
282 | QFETCH(QStringList, categories); | |
283 |
|
283 | |||
284 |
QBarCategor |
|
284 | QBarCategoryAxis axis; | |
285 |
|
285 | |||
286 | axis.setCategories(categories); |
|
286 | axis.setCategories(categories); | |
287 | QCOMPARE(axis.categories(), categories); |
|
287 | QCOMPARE(axis.categories(), categories); | |
@@ -329,7 +329,7 void tst_QBarCategoriesAxis::count() | |||||
329 | QFETCH(QStringList, categories); |
|
329 | QFETCH(QStringList, categories); | |
330 | QFETCH(int, count); |
|
330 | QFETCH(int, count); | |
331 |
|
331 | |||
332 |
QBarCategor |
|
332 | QBarCategoryAxis axis; | |
333 | axis.setCategories(categories); |
|
333 | axis.setCategories(categories); | |
334 |
|
334 | |||
335 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); |
|
335 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); | |
@@ -366,7 +366,7 void tst_QBarCategoriesAxis::insert() | |||||
366 | QFETCH(int, index); |
|
366 | QFETCH(int, index); | |
367 | QFETCH(QString, category); |
|
367 | QFETCH(QString, category); | |
368 |
|
368 | |||
369 |
QBarCategor |
|
369 | QBarCategoryAxis axis; | |
370 | axis.append(categories); |
|
370 | axis.append(categories); | |
371 |
|
371 | |||
372 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); |
|
372 | QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); | |
@@ -402,7 +402,7 void tst_QBarCategoriesAxis::remove() | |||||
402 | QFETCH(QString, category); |
|
402 | QFETCH(QString, category); | |
403 | QFETCH(QStringList, result); |
|
403 | QFETCH(QStringList, result); | |
404 |
|
404 | |||
405 |
QBarCategor |
|
405 | QBarCategoryAxis axis; | |
406 | axis.append(categories); |
|
406 | axis.append(categories); | |
407 |
|
407 | |||
408 | int maxCount = axis.max() == category; |
|
408 | int maxCount = axis.max() == category; | |
@@ -623,7 +623,7 void tst_QBarCategoriesAxis::autoscale_data() | |||||
623 | void tst_QBarCategoriesAxis::autoscale() |
|
623 | void tst_QBarCategoriesAxis::autoscale() | |
624 | { |
|
624 | { | |
625 | delete m_baraxis; |
|
625 | delete m_baraxis; | |
626 |
m_baraxis = new QBarCategor |
|
626 | m_baraxis = new QBarCategoryAxis(); | |
627 |
|
627 | |||
628 | QSignalSpy spy0(m_baraxis, SIGNAL(maxChanged(QString))); |
|
628 | QSignalSpy spy0(m_baraxis, SIGNAL(maxChanged(QString))); | |
629 | QSignalSpy spy1(m_baraxis, SIGNAL(minChanged(QString))); |
|
629 | QSignalSpy spy1(m_baraxis, SIGNAL(minChanged(QString))); |
@@ -36,7 +36,7 QTCOMMERCIALCHART_USE_NAMESPACE | |||||
36 |
|
36 | |||
37 | Q_DECLARE_METATYPE(QAbstractAxis *) |
|
37 | Q_DECLARE_METATYPE(QAbstractAxis *) | |
38 | Q_DECLARE_METATYPE(QValueAxis *) |
|
38 | Q_DECLARE_METATYPE(QValueAxis *) | |
39 |
Q_DECLARE_METATYPE(QBarCategor |
|
39 | Q_DECLARE_METATYPE(QBarCategoryAxis *) | |
40 | Q_DECLARE_METATYPE(QAbstractSeries *) |
|
40 | Q_DECLARE_METATYPE(QAbstractSeries *) | |
41 | Q_DECLARE_METATYPE(QChart::AnimationOption) |
|
41 | Q_DECLARE_METATYPE(QChart::AnimationOption) | |
42 | Q_DECLARE_METATYPE(QBrush) |
|
42 | Q_DECLARE_METATYPE(QBrush) | |
@@ -247,14 +247,14 void tst_QChart::axisX_data() | |||||
247 | QTest::addColumn<QAbstractAxis*>("axis"); |
|
247 | QTest::addColumn<QAbstractAxis*>("axis"); | |
248 | QTest::addColumn<QAbstractSeries *>("series"); |
|
248 | QTest::addColumn<QAbstractSeries *>("series"); | |
249 |
|
249 | |||
250 |
QTest::newRow("categories,lineSeries") << (QAbstractAxis*) new QBarCategor |
|
250 | QTest::newRow("categories,lineSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QLineSeries(this); | |
251 |
QTest::newRow("categories,areaSeries") << (QAbstractAxis*) new QBarCategor |
|
251 | QTest::newRow("categories,areaSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); | |
252 |
QTest::newRow("categories,scatterSeries") << (QAbstractAxis*) new QBarCategor |
|
252 | QTest::newRow("categories,scatterSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QScatterSeries(this); | |
253 |
QTest::newRow("categories,splineSeries") << (QAbstractAxis*) new QBarCategor |
|
253 | QTest::newRow("categories,splineSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QSplineSeries(this); | |
254 |
QTest::newRow("categories,pieSeries") << (QAbstractAxis*) new QBarCategor |
|
254 | QTest::newRow("categories,pieSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QPieSeries(this); | |
255 |
QTest::newRow("categories,barSeries") << (QAbstractAxis*) new QBarCategor |
|
255 | QTest::newRow("categories,barSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QBarSeries(this); | |
256 |
QTest::newRow("categories,percentBarSeries") << (QAbstractAxis*) new QBarCategor |
|
256 | QTest::newRow("categories,percentBarSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QPercentBarSeries(this); | |
257 |
QTest::newRow("categories,stackedBarSeries") << (QAbstractAxis*) new QBarCategor |
|
257 | QTest::newRow("categories,stackedBarSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QStackedBarSeries(this); | |
258 |
|
258 | |||
259 | QTest::newRow("value,lineSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QLineSeries(this); |
|
259 | QTest::newRow("value,lineSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QLineSeries(this); | |
260 | QTest::newRow("value,areaSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); |
|
260 | QTest::newRow("value,areaSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); | |
@@ -494,7 +494,7 void tst_QChart::scroll_right() | |||||
494 | break; |
|
494 | break; | |
495 | } |
|
495 | } | |
496 | case QAbstractAxis::AxisTypeCategories:{ |
|
496 | case QAbstractAxis::AxisTypeCategories:{ | |
497 |
|
|
497 | QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis); | |
498 | QVERIFY(caxis!=0); |
|
498 | QVERIFY(caxis!=0); | |
499 | qreal min = caxis->min().toDouble(); |
|
499 | qreal min = caxis->min().toDouble(); | |
500 | qreal max = caxis->max().toDouble(); |
|
500 | qreal max = caxis->max().toDouble(); | |
@@ -537,7 +537,7 void tst_QChart::scroll_left() | |||||
537 | break; |
|
537 | break; | |
538 | } |
|
538 | } | |
539 | case QAbstractAxis::AxisTypeCategories:{ |
|
539 | case QAbstractAxis::AxisTypeCategories:{ | |
540 |
|
|
540 | QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis); | |
541 | QVERIFY(caxis!=0); |
|
541 | QVERIFY(caxis!=0); | |
542 | qreal min = caxis->min().toDouble(); |
|
542 | qreal min = caxis->min().toDouble(); | |
543 | qreal max = caxis->max().toDouble(); |
|
543 | qreal max = caxis->max().toDouble(); | |
@@ -580,7 +580,7 void tst_QChart::scroll_up() | |||||
580 | break; |
|
580 | break; | |
581 | } |
|
581 | } | |
582 | case QAbstractAxis::AxisTypeCategories:{ |
|
582 | case QAbstractAxis::AxisTypeCategories:{ | |
583 |
|
|
583 | QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis); | |
584 | QVERIFY(caxis!=0); |
|
584 | QVERIFY(caxis!=0); | |
585 | qreal min = caxis->min().toDouble(); |
|
585 | qreal min = caxis->min().toDouble(); | |
586 | qreal max = caxis->max().toDouble(); |
|
586 | qreal max = caxis->max().toDouble(); | |
@@ -623,7 +623,7 void tst_QChart::scroll_down() | |||||
623 | break; |
|
623 | break; | |
624 | } |
|
624 | } | |
625 | case QAbstractAxis::AxisTypeCategories:{ |
|
625 | case QAbstractAxis::AxisTypeCategories:{ | |
626 |
|
|
626 | QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis); | |
627 | QVERIFY(caxis!=0); |
|
627 | QVERIFY(caxis!=0); | |
628 | qreal min = caxis->min().toDouble(); |
|
628 | qreal min = caxis->min().toDouble(); | |
629 | qreal max = caxis->max().toDouble(); |
|
629 | qreal max = caxis->max().toDouble(); |
@@ -294,17 +294,17 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS | |||||
294 | QAbstractBarSeries* series = 0; |
|
294 | QAbstractBarSeries* series = 0; | |
295 | if (seriesName == "Bar") { |
|
295 | if (seriesName == "Bar") { | |
296 | series = new QBarSeries(this); |
|
296 | series = new QBarSeries(this); | |
297 |
QBarCategor |
|
297 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
298 | axis->append(category); |
|
298 | axis->append(category); | |
299 | m_chart->setAxisX(axis,series); |
|
299 | m_chart->setAxisX(axis,series); | |
300 | } else if (seriesName == "Stacked bar") { |
|
300 | } else if (seriesName == "Stacked bar") { | |
301 | series = new QStackedBarSeries(this); |
|
301 | series = new QStackedBarSeries(this); | |
302 |
QBarCategor |
|
302 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
303 | axis->append(category); |
|
303 | axis->append(category); | |
304 | m_chart->setAxisX(axis,series); |
|
304 | m_chart->setAxisX(axis,series); | |
305 | } else { |
|
305 | } else { | |
306 | series = new QPercentBarSeries(this); |
|
306 | series = new QPercentBarSeries(this); | |
307 |
QBarCategor |
|
307 | QBarCategoryAxis* axis = new QBarCategoryAxis(); | |
308 | axis->append(category); |
|
308 | axis->append(category); | |
309 | m_chart->setAxisX(axis,series); |
|
309 | m_chart->setAxisX(axis,series); | |
310 | } |
|
310 | } |
General Comments 0
You need to be logged in to leave comments.
Login now