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

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

Added grouped bar series to chart widget test
Tero Ahola -
r1223:0e5ab3a86184
parent child
Show More
Side by Side Unified
Context file:
r1223:0e5ab3a86184 Loading diff...:
Show file before | Show file after | Hide comments
@@ -66,6 +66,7 QGroupBox *DataSerieDialog::seriesTypeSelector()
66 layout->addWidget(new QRadioButton("Area"));
66 layout->addWidget(new QRadioButton("Area"));
67 layout->addWidget(new QRadioButton("Pie"));
67 layout->addWidget(new QRadioButton("Pie"));
68 layout->addWidget(new QRadioButton("Bar"));
68 layout->addWidget(new QRadioButton("Bar"));
69 layout->addWidget(new QRadioButton("Grouped bar"));
69 layout->addWidget(new QRadioButton("Stacked bar"));
70 layout->addWidget(new QRadioButton("Stacked bar"));
70 layout->addWidget(new QRadioButton("Percent bar"));
71 layout->addWidget(new QRadioButton("Percent bar"));
71 layout->addWidget(new QRadioButton("Scatter"));
72 layout->addWidget(new QRadioButton("Scatter"));
Show file before | Show file after | Hide comments
@@ -28,6 +28,7
28 #include <qsplineseries.h>
28 #include <qsplineseries.h>
29 #include <qbarset.h>
29 #include <qbarset.h>
30 #include <qbarseries.h>
30 #include <qbarseries.h>
31 #include <qgroupedbarseries.h>
31 #include <qstackedbarseries.h>
32 #include <qstackedbarseries.h>
32 #include <qpercentbarseries.h>
33 #include <qpercentbarseries.h>
33 #include <QPushButton>
34 #include <QPushButton>
@@ -265,6 +266,7 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
265 m_chart->addSeries(series);
266 m_chart->addSeries(series);
266 }
267 }
267 } else if (seriesName == "Bar"
268 } else if (seriesName == "Bar"
269 || seriesName == "Grouped bar"
268 || seriesName == "Stacked bar"
270 || seriesName == "Stacked bar"
269 || seriesName == "Percent bar") {
271 || seriesName == "Percent bar") {
270 QStringList category;
272 QStringList category;
@@ -275,6 +277,9 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
275 if (seriesName == "Bar") {
277 if (seriesName == "Bar") {
276 series = new QBarSeries(this);
278 series = new QBarSeries(this);
277 series->setCategories(category);
279 series->setCategories(category);
280 } else if (seriesName == "Grouped bar") {
281 series = new QGroupedBarSeries(this);
282 series->setCategories(category);
278 } else if (seriesName == "Stacked bar") {
283 } else if (seriesName == "Stacked bar") {
279 series = new QStackedBarSeries(this);
284 series = new QStackedBarSeries(this);
280 series->setCategories(category);
285 series->setCategories(category);
General Comments 0
You need to be logged in to leave comments. Login now