HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r613:36ecec1e9bf9

A few more warnings removed from examples

Tero Ahola -

r613:36ecec1e9bf9

parent child

Context file:

r613:36ecec1e9bf9

Collapse all files

examples/gdpbarchart/widget.cpp +1 -1

             /*!
                 \class Widget
                 \brief Ui for the application.
                 \internal
             */
             #include "widget.h"
             #include <QGridLayout>
             #include <QPushButton>
             #include <QLabel>
             #include <QSqlQuery>
             #include <qscatterseries.h>
             #include <qchartview.h>
             #include <qchartaxis.h>
             #include <qbarset.h>
             #include <QListWidget>
             #include <QPrinter>
             #include <QPrintDialog>
             #include <QRadioButton>
             #include <QStringList>
             #include <qbarseries.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Widget::Widget(QWidget *parent)
                 : QWidget(parent)
             {
                 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);
                 //list of years widget
                 yearslist = new QListWidget;
                 yearslist->setSelectionMode(QAbstractItemView::ExtendedSelection);
                 for (int i = 1990; i < 2011; i++)
                     yearslist->addItem(QString("%1").arg(i));
                 QPushButton* refreshButton = new QPushButton(tr("Refresh"));
                 connect(refreshButton, SIGNAL(clicked()), this, SLOT(refreshChart()));
                 QPushButton* printButton = new QPushButton(tr("Print chart"));
                 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);
                 rightPanelLayout->addWidget(printButton);
                 rightPanelLayout->setStretch(0, 1);
                 rightPanelLayout->setStretch(1, 0);
                 // main layout
                 chartArea = new QChartView(this);
                 chartArea->setChartTitle("GDP by country");
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addWidget(chartArea, 0, 0);
                 mainLayout->addLayout(rightPanelLayout, 0, 1);
                 mainLayout->setColumnStretch(0,1);
                 setLayout(mainLayout);
                 // connect to the database
                 db = QSqlDatabase::addDatabase("QSQLITE");
                 db.setDatabaseName("gdpData");
                 if(!db.open())
                 {
                     qDebug() << "could not open database. SQLite db file missing (?)";
                     return;
                 }
                 // get the list of all countires and regions.
                 QSqlQuery query;
                 query.exec("SELECT DISTINCT country FROM gdp2");
                 // add the countries to the country filter
                 while (query.next()) {
                     countrieslist->addItem(query.value(0).toString());
                 }
                 // hide axis X labels
-                QChartAxis* axis = chartArea->axisX();
+                //QChartAxis* axis = chartArea->axisX();
             //    axis->
                 //    axis->setLabelsVisible(false);
                 //    newAxis.setLabelsOrientation(QChartAxis::LabelsOrientationSlide);
             }
             Widget::~Widget()
             {
                 //
                 db.close();
             }
             /*!
                 refreshes the chart
             */
             void Widget::refreshChart()
             {
                 chartArea->removeAllSeries();
                 // selected countries items list is not sorted. copy the values to QStringlist and sort them.
                 QStringList selectedCountriesStrings;
                 QList<QListWidgetItem*> selectedCountriesItems = countrieslist->selectedItems();
                 for (int i = 0; i < selectedCountriesItems.size(); i++)
                     selectedCountriesStrings.append(selectedCountriesItems[i]->text());
                 selectedCountriesStrings.sort();
                 QSqlQuery query;
                 // selected years items list is not sorted. copy the values to QList<int> 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
                     QStringList category;
                     for (int i = 0; i < selectedCountriesStrings.size(); i++)
                         category << selectedCountriesStrings[i];
                     QBarSeries* series0 = new QBarSeries(category);
                     series0 = new QBarSeries(category);
                     // prepare the selected counries SQL query
                     QString countriesQuery = "country IN (";
                     for (int i = 0; i < selectedCountriesStrings.size(); i++)
                     {
                         countriesQuery.append("'" + selectedCountriesStrings[i] + "'");
                         if ( i < selectedCountriesStrings.size() - 1)
                             countriesQuery.append(",");
                         else
                             countriesQuery.append(")");
                     }
                     // perform a query for each selected year
                     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("Barset" + QString::number(i));
                         //        while (query.next()) {
                         //            qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
                         //        }
                         query.first();
                         // the data for some of the coutries for some years might be missing.
                         // QBarChart needs bars to have same size
                         for (int k = 0; k < selectedCountriesStrings.size(); k++)
                         {
                             if (selectedCountriesStrings[k] == query.value(0).toString())
                             {
                                 *barSet << query.value(1).toReal();
                                 qDebug() << query.value(0).toString() << query.value(1).toReal() << " : " << QString("%1").arg(selectedYearsInts[i]);
                                 query.next();
                             }
                             else
                             {
                                 // data missing, put 0
                                 *barSet << 0.0f;
                                 qDebug() << "Putting 0 for the missing data" << " : " << QString("%1").arg(selectedYearsInts[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 country
                     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 the missing data" << " : " << QString("%1").arg(selectedYearsInts[i]) << " " << query.value(0).toInt();
                             }
                         }
                         //            chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] + 1, selectedYearsInts[0] - 1);
                         chartArea->addSeries(series);
                     }
                     chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] - 1, selectedYearsInts[0] + 1);
                 }
             }
             void Widget::printChart()
             {
                 QPrinter printer;
                 //    QPrinter printer(QPrinter::HighResolution);
                 printer.setOutputFormat(QPrinter::PdfFormat);
                 printer.setOrientation(QPrinter::Landscape);
                 printer.setOutputFileName("print.pdf");
                 QPainter painter;
                 painter.begin(&printer);
                 chartArea->render(&painter);
             }

examples/stackedbarchartdrilldown/main.cpp +1 0

             #include <QtGui/QApplication>
             #include <QMainWindow>
             #include <qchartglobal.h>
             #include <qchartview.h>
             #include <qstackedbarseries.h>
             #include <qbarset.h>
             #include <qchartaxis.h>
             #include <qlegend.h>
             #include <QStringList>
             #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE
             //! [1]
             class DrilldownBarSeries : public QStackedBarSeries
             {
                 Q_OBJECT
             public:
                 DrilldownBarSeries(QStringList categories, QObject *parent = 0) : QStackedBarSeries(categories,parent) {}
                 void mapDrilldownSeries(QString category, DrilldownBarSeries* drilldownSeries)
                 {
                     mDrilldownSeries[category] = drilldownSeries;
                 }
                 DrilldownBarSeries* drilldownSeries(QString category)
                 {
                     return mDrilldownSeries[category];
                 }
             public Q_SLOTS:
             private:
                 QMap<QString, DrilldownBarSeries*> mDrilldownSeries;
             };
             //! [1]
             //! [2]
             class DrilldownChart : public QChartView
             {
                 Q_OBJECT
             public:
                 explicit DrilldownChart(QWidget *parent = 0) : QChartView(parent), m_currentSeries(0) {}
                 void changeSeries(QSeries* series)
                 {
                     if (m_currentSeries)
                         removeSeries(m_currentSeries);
                     m_currentSeries = series;
                     addSeries(series);
                     setChartTitle(series->title());
                 }
             public Q_SLOTS:
                 void handleRightClick(QBarSet *barset, QString category)
                 {
+                    Q_UNUSED(barset)
                     DrilldownBarSeries* series = static_cast<DrilldownBarSeries*> (sender());
                     changeSeries(series->drilldownSeries(category));
                 }
             private:
                 QSeries* m_currentSeries;
             };
             //! [2]
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 DrilldownChart* drilldownChart =  new DrilldownChart(&window);
                 drilldownChart->setChartTheme(QChart::ChartThemeIcy);
                 //! [3]
                 // Define categories
                 QStringList months;
                 months << "May" << "Jun" << "Jul" << "Aug" << "Sep";
                 QStringList weeks;
                 weeks << "week 1" << "week 2" << "week 3" << "week 4";
                 QStringList plants;
                 plants << "Habanero" << "Lemon Drop" << "Starfish" << "Aji Amarillo";
                 //! [3]
                 //! [4]
                 // Create drilldown structure
                 DrilldownBarSeries* seasonSeries = new DrilldownBarSeries(months, drilldownChart);
                 seasonSeries->setTitle("Crop by month - Season");
                 // Each month in season series has drilldown series for weekly data
                 foreach (QString month, months) {
                     // Create drilldown series for every week
                     DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart);
                     seasonSeries->mapDrilldownSeries(month, weeklySeries);
                     // Drilling down from weekly data brings us back to season data.
                     foreach (QString week, weeks) {
                         weeklySeries->mapDrilldownSeries(week, seasonSeries);
                         weeklySeries->setTitle(QString("Crop by week - " + month));
                     }
                     // Use right click signal to implement drilldown
                     QObject::connect(weeklySeries,SIGNAL(rightClicked(QBarSet*,QString)),drilldownChart,SLOT(handleRightClick(QBarSet*,QString)));
                 }
                 // Enable drilldown from season series using right click.
                 QObject::connect(seasonSeries,SIGNAL(rightClicked(QBarSet*,QString)),drilldownChart,SLOT(handleRightClick(QBarSet*,QString)));
                 //! [4]
                 //! [5]
                 // Fill monthly and weekly series with data
                 foreach (QString plant, plants) {
                     QBarSet* monthlyCrop = new QBarSet(plant);
                     foreach (QString month, months) {
                         QBarSet* weeklyCrop = new QBarSet(plant);
                         foreach (QString week, weeks ) {
                             *weeklyCrop << (qrand() % 20);
                         }
                         // Get the drilldown series from season series and add crop to it.
                         seasonSeries->drilldownSeries(month)->addBarSet(weeklyCrop);
                         seasonSeries->drilldownSeries(month)->setToolTipEnabled(true);
                         *monthlyCrop << weeklyCrop->total();
                         QObject::connect(weeklyCrop,SIGNAL(clicked(QString)),weeklyCrop,SIGNAL(toggleFloatingValues()));
                     }
                     seasonSeries->addBarSet(monthlyCrop);
                     QObject::connect(monthlyCrop,SIGNAL(clicked(QString)),monthlyCrop,SIGNAL(toggleFloatingValues()));
                 }
                 //! [5]
                 seasonSeries->setToolTipEnabled(true);
                 //! [6]
                 // Show season series in initial view
                 drilldownChart->changeSeries(seasonSeries);
                 drilldownChart->setChartTitle(seasonSeries->title());
                 //! [6]
                 drilldownChart->axisX()->setGridLineVisible(false);
                 window.setCentralWidget(drilldownChart);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }
             #include "main.moc"

examples/tablemodelchart/customtablemodel.cpp +7 -2

             #include "customtablemodel.h"
             CustomTableModel::CustomTableModel(QObject *parent) :
                 QAbstractTableModel(parent)
             {
                 m_points.append(QPointF(10, 50));
                 m_labels.append("Apples");
                 m_points.append(QPointF(60, 70));
                 m_labels.append("Oranges");
                 m_points.append(QPointF(110, 50));
                 m_labels.append("Bananas");
                 m_points.append(QPointF(140, 40));
                 m_labels.append("Lemons");
                 m_points.append(QPointF(200, 150));
                 m_labels.append("Plums");
                 m_points.append(QPointF(225, 75));
                 m_labels.append("Pearls");
             }
             int CustomTableModel::rowCount(const QModelIndex & parent) const
             {
+                Q_UNUSED(parent)
                 return m_points.count();
             }
             int CustomTableModel::columnCount(const QModelIndex & parent) const
             {
+                Q_UNUSED(parent)
                 return 3;
             }
             QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
             {
                 if (role != Qt::DisplayRole)
                     return QVariant();
                 if (orientation == Qt::Horizontal)
                 {
                     switch(section)
                     {
                     case 0:
                         return "x";
                     case 1:
                         return "y";
                     case 2:
                         return "Fruit";
                     default:
                         return "What?";
                     }
                 }
                 else
                     return QString("%1").arg(section + 1);
             }
             QVariant CustomTableModel::data(const QModelIndex & index, int role) const
             {
                 if (role == Qt::DisplayRole)
                 {
                     switch(index.column())
                     {
                     case 0:
                         return m_points[index.row()].x();
                     case 1:
                         return m_points[index.row()].y();
                     case 2:
                         return m_labels[index.row()];
                     default:
-                        return QVariant();
+                        break;
                     }
                 }
                 else if (role == Qt::EditRole)
                 {
                     switch(index.column())
                     {
                     case 0:
                         return m_points[index.row()].x();
                     case 1:
                         return m_points[index.row()].y();
                     case 2:
                         return m_labels[index.row()];
                     default:
-                        return QVariant();
+                        break;
                     }
                 }
+                return QVariant();
             }
             bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & value, int role)
             {
                 if (index.isValid() && role == Qt::EditRole)
                 {
                     switch(index.column())
                     {
                     case 0:
                         m_points[index.row()].setX(value.toDouble());
                         break;
                     case 1:
                         m_points[index.row()].setY(value.toDouble());
                         break;
                     case 2:
                         m_labels.replace(index.row(), value.toString());
                         break;
                     default:
                         return false;
                     }
                     emit dataChanged(index, index);
                     return true;
                 }
                 return false;
             }
             Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const
             {
             //    if (!index.isValid())
             //                return Qt::ItemIsEnabled;
                     return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
             }
             bool CustomTableModel::insertRows ( int row, int count, const QModelIndex & parent)
             {
+                Q_UNUSED(parent)
                 if (row < 0)
                     row = 0;
                 beginInsertRows(QModelIndex(), row /*dataTable.count()*/, row + count - 1);
                 for (int i = row; i < row + count; i++)
                 {
                     m_points.insert(row, QPointF(10,20));
                     m_labels.insert(row,("a"));
                 }
                 endInsertRows();
                 return true;
             }
             bool CustomTableModel::removeRows ( int row, int count, const QModelIndex & parent)
             {
                 if (row > this->rowCount() - 1)
                     return false;
                 if (row < 0)
                     row = 0;
                 if (row + count > rowCount())
                     return false;
                 beginRemoveRows(parent, row, row + count - 1);
                 for (int i = row; i < row + count; i++)
                 {
                     m_points.removeAt(row);
                     m_labels.removeAt(row);
                 }
                 endRemoveRows();
                 return true;
             }

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