##// END OF EJS Templates
barseries constructor fix
sauimone -
r1114:f9dcd91686d2
parent child
Show More
@@ -164,9 +164,16 void tst_QChart::addSeries_data()
164 164 QAbstractSeries* series2 = new QScatterSeries(this);
165 165 QAbstractSeries* series3 = new QSplineSeries(this);
166 166 QAbstractSeries* series4 = new QPieSeries(this);
167 QAbstractSeries* series5 = new QBarSeries(QBarCategories(),this);
168 QAbstractSeries* series6 = new QPercentBarSeries(QBarCategories(),this);
169 QAbstractSeries* series7 = new QStackedBarSeries(QBarCategories(),this);
167 QAbstractSeries* series5 = new QBarSeries(this);
168 QAbstractSeries* series6 = new QPercentBarSeries(this);
169 QAbstractSeries* series7 = new QStackedBarSeries(this);
170
171 QBarSeries* s5 = static_cast<QBarSeries*> (series5);
172 s5->setCategories(QBarCategories());
173 QPercentBarSeries* s6 = static_cast<QPercentBarSeries*> (series6);
174 s6->setCategories(QBarCategories());
175 QStackedBarSeries* s7 = static_cast<QStackedBarSeries*> (series7);
176 s7->setCategories(QBarCategories());
170 177
171 178 QAxis* axis = new QAxis(this);
172 179
@@ -272,12 +272,16 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
272 272 foreach(QString label, labels)
273 273 category << label;
274 274 QBarSeries* series = 0;
275 if (seriesName == "Bar")
276 series = new QBarSeries(category, this);
277 else if (seriesName == "Stacked bar")
278 series = new QStackedBarSeries(category, this);
279 else
280 series = new QPercentBarSeries(category, this);
275 if (seriesName == "Bar") {
276 series = new QBarSeries(this);
277 series->setCategories(category);
278 } else if (seriesName == "Stacked bar") {
279 series = new QStackedBarSeries(this);
280 series->setCategories(category);
281 } else {
282 series = new QPercentBarSeries(this);
283 series->setCategories(category);
284 }
281 285
282 286 for (int j(0); j < data.count(); j++) {
283 287 QList<qreal> column = data.at(j);
@@ -140,8 +140,9 void Widget::refreshChart()
140 140 QStringList category;
141 141 for (int i = 0; i < selectedCountriesStrings.size(); i++)
142 142 category << selectedCountriesStrings[i];
143 QBarSeries* series0 = new QBarSeries(category);
144 series0 = new QBarSeries(category);
143 QBarSeries* series0 = new QBarSeries();
144 series0->setCategories(category);
145 // series0 = new QBarSeries(category);
145 146
146 147 // prepare the selected counries SQL query
147 148 QString countriesQuery = "country IN (";
@@ -370,7 +370,8 void TableWidget::updateChartType(bool toggle)
370 370 {
371 371 m_chart->setAnimationOptions(QChart::SeriesAnimations);
372 372
373 QBarSeries* barSeries = new QBarSeries(QStringList());
373 QBarSeries* barSeries = new QBarSeries();
374 barSeries->setCategories(QStringList());
374 375 barSeries->setModel(m_model);
375 376 // barSeries->setModelMappingRange(2, 5);
376 377 barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
General Comments 0
You need to be logged in to leave comments. Login now