qiurui
/
qtcharts
mirror of https://github.com/qt/qtcharts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts 

Conflicts:
	example/gdpbarchart/widget.cpp
This commit is contained in:
Marek Rosa 2012-02-23 13:06:00 +02:00
parent 46d1e061b6 f36371057e
commit 85d5e94564
2 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/gdpbarchart/widget.cpp
View File

@ -141,7 +141,8 @@ void Widget::refreshChart()
for (int i = 0; i < selectedYearsInts.size(); i++)
{
query.exec("SELECT country,gdpvalue FROM gdp2 where year=" + QString("%1").arg(selectedYearsInts[i]) + " AND " + countriesQuery);
QBarSet* barSet = new QBarSet(QString("GDP_%1").arg(selectedYearsInts[i]));
QBarSet* barSet = new QBarSet("Barset" + QString::number(i));
// while (query.next()) {
// qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
// }

48
test/chartwidgettest/mainwidget.cpp
View File

@ -247,51 +247,25 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
m_chartWidget->addSeries(series);
setCurrentSeries(series);
}
} else if (seriesName == "Bar") {
} else if (seriesName == "Bar"
|| seriesName == "Stacked bar"
|| seriesName == "Percent bar") {
// TODO: replace QBarCategory with QStringList?
QBarCategory *category = new QBarCategory;
QStringList labels = generateLabels(rowCount);
foreach(QString label, labels)
*category << label;
QBarChartSeries* series = new QBarChartSeries(category, this);
QBarChartSeries* series = 0;
if (seriesName == "Bar")
series = new QBarChartSeries(category, this);
else if (seriesName == "Stacked bar")
series = new QStackedBarChartSeries(category, this);
else
series = new QPercentBarChartSeries(category, this);
for (int j(0); j < data.count(); j++) {
QList<qreal> column = data.at(j);
QBarSet *set = new QBarSet;
for (int i(0); i < column.count(); i++) {
*set << column.at(i);
}
series->addBarSet(set);
}
m_chartWidget->addSeries(series);
setCurrentSeries(series);
} else if (seriesName == "Stacked bar") {
QBarCategory *category = new QBarCategory;
QStringList labels = generateLabels(rowCount);
foreach(QString label, labels)
*category << label;
QStackedBarChartSeries* series = new QStackedBarChartSeries(category, this);
for (int j(0); j < data.count(); j++) {
QList<qreal> column = data.at(j);
QBarSet *set = new QBarSet;
for (int i(0); i < column.count(); i++) {
*set << column.at(i);
}
series->addBarSet(set);
}
m_chartWidget->addSeries(series);
setCurrentSeries(series);
} else if (seriesName == "Percent bar") {
QBarCategory *category = new QBarCategory;
QStringList labels = generateLabels(rowCount);
foreach(QString label, labels)
*category << label;
QPercentBarChartSeries* series = new QPercentBarChartSeries(category, this);
for (int j(0); j < data.count(); j++) {
QList<qreal> column = data.at(j);
QBarSet *set = new QBarSet;
QBarSet *set = new QBarSet("set" + QString::number(j));
for (int i(0); i < column.count(); i++) {
*set << column.at(i);
}