HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r268:bd1ae0fe1b01

Added another chart type choice

Marek Rosa -

r268:bd1ae0fe1b01

parent child

Context file:

r268:bd1ae0fe1b01

Collapse all files

example/gdpbarchart/widget.cpp +62 -13

              #include <qscatterseries.h>
              #include <qchartview.h>
              #include <qchartaxis.h>
-             #include <qbarchartseries.h>
              #include <qbarcategory.h>
              #include <qbarset.h>
              #include <QListWidget>
              #include <QPrinter>
              #include <QPrintDialog>
+             #include <QRadioButton>
              QTCOMMERCIALCHART_USE_NAMESPACE
                  setGeometry(100, 100, 1000, 600);
                  // right panel layout
+                 barChartRadioButton = new QRadioButton(tr("Bar chart"));
+                 barChartRadioButton->setChecked(true);
+                 scatterChartRadioButton = new QRadioButton(tr("Scatter chart"));
+                 scatterChartRadioButton->setChecked(false);
                  countrieslist = new QListWidget;
                  countrieslist->setSelectionMode(QAbstractItemView::MultiSelection);
                  connect(printButton, SIGNAL(clicked()), this, SLOT(printChart()));
                  QVBoxLayout* rightPanelLayout = new QVBoxLayout;
+                 rightPanelLayout->addWidget(barChartRadioButton);
+                 rightPanelLayout->addWidget(scatterChartRadioButton);
                  rightPanelLayout->addWidget(countrieslist);
                  rightPanelLayout->addWidget(yearslist);
                  rightPanelLayout->addWidget(refreshButton);
                  // hide axis X labels
                  QChartAxis* axis = chartArea->axisX();
-                 axis->setLabelsVisible(false);
+             //    axis->setLabelsVisible(false);
                  //    newAxis.setLabelsOrientation(QChartAxis::LabelsOrientationSlide);
              }
              */
              void Widget::refreshChart()
              {
-                 //    chartArea->
+                 chartArea->removeSeries(series0);
                  // selected countries items list is not sorted. copy the values to QStringlist and sort them.
                  QStringList selectedCountriesStrings;
                  QList<QListWidgetItem*> selectedCountriesItems = countrieslist->selectedItems();
                      selectedCountriesStrings.append(selectedCountriesItems[i]->text());
                  selectedCountriesStrings.sort();
+                 QSqlQuery query;
+                 // selected years items list is not sorted. copy the values to QList<Integer> and sort them.
+                 QList<int> selectedYearsInts;
+                 QList<QListWidgetItem*> selectedYearsItems = yearslist->selectedItems();
+                 for (int i = 0; i < selectedYearsItems.size(); i++)
+                     selectedYearsInts.append(selectedYearsItems[i]->text().toInt());
+                 qSort(selectedYearsInts.begin(), selectedYearsInts.end(), qGreater<int>());
+                 if (barChartRadioButton->isChecked())
+                 {
                  // use the sorted selected coutries list to initialize BarCategory
                  QBarCategory* category = new QBarCategory;
                  for (int i = 0; i < selectedCountriesStrings.size(); i++)
                      *category << selectedCountriesStrings[i];
-                 QBarChartSeries* series0 = new QBarChartSeries(category);
+                     series0 = new QBarChartSeries(category);
                  // prepare the selected counries SQL query
                  QString countriesQuery = "country IN (";
                          countriesQuery.append(")");
                  }
-                 QSqlQuery query;
-                 // selected years items list is not sorted. copy the values to QList<Integer> and sort them.
-                 QList<int> selectedYearsInts;
-                 QList<QListWidgetItem*> selectedYearsItems = yearslist->selectedItems();
-                 for (int i = 0; i < selectedYearsItems.size(); i++)
-                     selectedYearsInts.append(selectedYearsItems[i]->text().toInt());
-                 qSort(selectedYearsInts);
                  // perform a query for each selected year
                  for (int i = 0; i < selectedYearsInts.size(); i++)
                  {
                      }
                      series0->addBarSet(barSet);
                  }
                  // add the serie to the chart
                  chartArea->addSeries(series0);
+                 }
+                 else if (scatterChartRadioButton->isChecked())
+                 {
+                     QString yearsQuery = "year IN (";
+                     for (int i = 0; i < selectedYearsInts.size(); i++)
+                     {
+                         yearsQuery.append("'" + QString("%1").arg(selectedYearsInts[i]) + "'");
+                         if ( i < selectedYearsInts.size() - 1)
+                             yearsQuery.append(",");
+                         else
+                             yearsQuery.append(")");
+                     }
+                     // perform a query for each selected year
+                     for (int i = 0; i < selectedCountriesStrings.size(); i++)
+                     {
+                         query.exec("SELECT year,gdpvalue FROM gdp2 where country='" + selectedCountriesStrings[i] + "' AND " + yearsQuery);
+                         query.first();
+                         QScatterSeries* series = new QScatterSeries;
+                         // the data for some of the coutries for some years might be missing.
+                         for (int k = 0; k < selectedYearsInts.size(); k++)
+                         {
+                             if (selectedYearsInts[k] == query.value(0).toInt())
+                             {
+                                 *series << QPointF(query.value(0).toInt() , query.value(1).toReal());
+                                 qDebug() << query.value(0).toString() << query.value(1).toReal() << " : " << QString("%1").arg(selectedYearsInts[k]);
+                                 query.next();
+                             }
+                             else
+                             {
+                                 // data missing, put 0
+                                 *series << QPointF(selectedYearsInts[k] , 0.0f);
+                                 qDebug() << "Putting 0 for Bosnia" << " : " << QString("%1").arg(selectedYearsInts[i]) << " " << query.value(0).toInt();
+                             }
+                         }
+                         chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] + 1, selectedYearsInts[0] - 1);
+                         chartArea->addSeries(series);
+                     }
+                 }
              }
              void Widget::printChart()

example/gdpbarchart/widget.h +5 0

              #include <QtGui/QWidget>
              #include <qchartview.h>
+             #include <qbarchartseries.h>
              #include <QSqlDatabase>
              QTCOMMERCIALCHART_USE_NAMESPACE
              class QListWidget;
+             class QRadioButton;
              class Widget : public QWidget
              {
                  QListWidget* countrieslist;
                  QListWidget* yearslist;
                  QSqlDatabase db;
+                 QBarChartSeries* series0;
+                 QRadioButton* barChartRadioButton;
+                 QRadioButton* scatterChartRadioButton;
              };
              #endif // WIDGET_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages