HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r935:f71e86066044

modeldata example documented with explanations....

Marek Rosa -

r935:f71e86066044

parent child

Context file:

r935:f71e86066044

Collapse all files

doc/images/modeldata.png created 644 binary 0 0

	1	NO CONTENT: new file 100644, binary diff hidden			NO CONTENT: new file 100644, binary diff hidden

NO CONTENT: new file 100644, binary diff hidden

demos/gdpbarchart/widget.cpp +6 -10

             #include <QChartAxis>
             #include <QBarSet>
             #include <QBarSeries>
+            #include <QLegend>
             #include <QGridLayout>
             #include <QPushButton>
                 QPushButton* refreshButton = new QPushButton(tr("Refresh"));
                 connect(refreshButton, SIGNAL(clicked()), this, SLOT(refreshChart()));
-                QPushButton* printButton = new QPushButton(tr("Print chart"));
+                QPushButton* printButton = new QPushButton(tr("Print to pdf"));
                 connect(printButton, SIGNAL(clicked()), this, SLOT(printChart()));
                 QVBoxLayout* rightPanelLayout = new QVBoxLayout;
                 QChart *chart = new QChart();
                 chart->setTitle("GDP by country");
+                chart->legend()->setVisible(true);
                 // main layout
                 chartView = new QChartView(chart);
                 while (query.next()) {
                     countrieslist->addItem(query.value(0).toString());
                 }
-                // hide axis X labels
-                //QChartAxis* axis = chartArea->axisX();
-            //    axis->
-                //    axis->setLabelsVisible(false);
-                //    newAxis.setLabelsOrientation(QChartAxis::LabelsOrientationSlide);
             }
             Widget::~Widget()
                 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>());
+                qSort(selectedYearsInts.begin(), selectedYearsInts.end());
                 if (barChartRadioButton->isChecked())
                 {
                     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));
+                        QBarSet* barSet = new QBarSet(QString::number(selectedYearsInts[i]));
                         //        while (query.next()) {
                         //            qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
                         query.first();
                         QScatterSeries* series = new QScatterSeries;
+                        series->setName(selectedCountriesStrings[i]);
                         // the data for some of the coutries for some years might be missing.
                         for (int k = 0; k < selectedYearsInts.size(); k++)
                         {

doc/src/examples-modeldata.qdoc +49 0

@@ -4,4 +4,53
4	\subtitle	4	\subtitle
5		5
6	This example shows how to use QAbstractItemModel derived model as the data for the series.	6	This example shows how to use QAbstractItemModel derived model as the data for the series.
		7
		8	\image modeldata.png
		9
		10	Let's start by creating an instance of CustomTableModel class.
		11	CustomTableModel class is derived from QAbstractTableModel and it was created for the purpose of this example.
		12	The constructor of this class populates the internal data store of the model with the data that is good for our chart example.
		13
		14	\snippet ../examples/modeldata/tablewidget.cpp 1
		15
		16	We now have a model with data that we would like to display both on the chart and in a QTableView.
		17	First, we create QTableView and tell it use the model as a data source.
		18
		19	\snippet ../examples/modeldata/tablewidget.cpp 2
		20
		21	Now we need QChart instance to display the same data on the chart.
		22	We also enable animations. It makes it easier to see how modifying the model's data affect the chart.
		23
		24	\snippet ../examples/modeldata/tablewidget.cpp 3
		25
		26	Then let's create two QLineSeries and tell them to use the data from the model.
		27	First line of the code below creates new line series. Line number two sets the model as the data source for the series.
		28	Third line specifies that x coordinates are taken from the model's column(Qt::Vertical) with index 0 and the y coordinates are taken from the model's column with index 1.
		29	Finally the series is added to the chart.
		30
		31	\snippet ../examples/modeldata/tablewidget.cpp 4
		32
		33	To show in QTableView which data coresponds with which series this example uses table coloring.
		34	When series is added to the chart it is assigned a color beased on the currently selected theme.
		35	Code below extracts that color from the series and uses it to create colored QTableView.
		36	Coloring of the view is not a part of the QChart functionality.
		37
		38	\snippet ../examples/modeldata/tablewidget.cpp 5
		39
		40	The same operations are done with second series. Notice that for this series different columns of the same model are mapped.
		41
		42	\snippet ../examples/modeldata/tablewidget.cpp 6
		43
		44	\snippet ../examples/modeldata/tablewidget.cpp 7
		45
		46	To avoid setting up the QGraphicsScene we use QChartView class that does it for us. QChart object pointer is used as a parameter of the QChartView constructor.
		47	To make the render look nicer Antialiasing is turned on and the minimum size of the chart is set.
		48
		49	\snippet ../examples/modeldata/tablewidget.cpp 8
		50
		51	Finally we place both widgets in a layout and use the layout as the application layout.
		52
		53	\snippet ../examples/modeldata/tablewidget.cpp 9
		54
		55	Application is ready. Try modifying the data in the table view and see how it affects the chart.
7	*/	56	*/

examples/modeldata/tablewidget.cpp +37 -18

             {
                 // create simple model for storing data
                 // user's table data model
+                //! [1]
                 CustomTableModel *model = new CustomTableModel;
+                //! [1]
+                //! [2]
                 // create table view and add model to it
                 QTableView *tableView = new QTableView;
                 tableView->setModel(model);
+                //! [2]
                 tableView->setColumnWidth(0, 56);
                 tableView->setColumnWidth(1, 56);
                 tableView->setColumnWidth(2, 56);
                 tableView->setColumnWidth(3, 56);
-                QChart *m_chart = new QChart;
+                //! [3]
-                m_chart->setAnimationOptions(QChart::AllAnimations);
+                QChart *chart = new QChart;
-                QChartView *m_chartView = new QChartView(m_chart);
+                chart->setAnimationOptions(QChart::AllAnimations);
-                m_chartView->setRenderHint(QPainter::Antialiasing);
+                //! [3]
-                m_chartView->setMinimumSize(640, 480);
+                // series 1
+                //! [4]
+                QLineSeries *series = new QLineSeries;
+                series->setModel(model);
+                series->setModelMapping(0, 1, Qt::Vertical);
+                chart->addSeries(series);
+                //! [4]
+                //! [5]
                 // for storing color hex from the series
                 QString seriesColorHex = "#000000";
-                // series 1
-                QLineSeries *m_series = new QLineSeries;
-                m_series->setModel(model);
-                m_series->setModelMapping(0, 1, Qt::Vertical);
-                m_chart->addSeries(m_series);
                 // get the color of the series and use it for showing the mapped area
-                seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
+                seriesColorHex = "#" + QString::number(series->pen().color().rgb(), 16).right(6).toUpper();
                 model->addMapping(seriesColorHex, QRect(0, 0, 2, model->rowCount()));
+                //! [5]
                 // series 2
-                m_series = new QLineSeries;
+                //! [6]
-                m_series->setModel(model);
+                series = new QLineSeries;
-                m_series->setModelMapping(2,3, Qt::Vertical);
+                series->setModel(model);
-                m_chart->addSeries(m_series);
+                series->setModelMapping(2,3, Qt::Vertical);
+                chart->addSeries(series);
+                //! [6]
+                //! [7]
                 // get the color of the series and use it for showing the mapped area
-                seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
+                seriesColorHex = "#" + QString::number(series->pen().color().rgb(), 16).right(6).toUpper();
                 model->addMapping(seriesColorHex, QRect(2, 0, 2, model->rowCount()));
+                //! [7]
+                //! [8]
+                QChartView *chartView = new QChartView(chart);
+                chartView->setRenderHint(QPainter::Antialiasing);
+                chartView->setMinimumSize(640, 480);
+                //! [8]
+                //! [9]
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addWidget(tableView, 1, 0);
-                mainLayout->addWidget(m_chartView, 1, 1);
+                mainLayout->addWidget(chartView, 1, 1);
                 mainLayout->setColumnStretch(1, 1);
                 mainLayout->setColumnStretch(0, 0);
                 setLayout(mainLayout);
+                //! [9]
             }

src/axis/qchartaxis.cpp +3 -5

             */
             /*!
-                \fn void QChartAxis::handleAxisRangeChanged(qreal min, qreal max)
-                \brief \internal \a min \a max
-            */
-            /*!
                 Constructs new axis object which is a child of \a parent. Ownership is taken by
                 QChatView or QChart when axis added.
             */
                 emit updated();
             }
+            /*!
+                \internal
+             */
             void QChartAxis::handleAxisRangeChanged(qreal min, qreal max,int count)
             {
                setRange(min,max);

src/qchartview.cpp +1 -1

             /*!
-                \enum QChartView::RubberBandPolicy
+                \enum QChartView::RubberBand
                 This enum describes the different types of rubber bands that can be used for zoom rect selection

src/qseries.cpp +1 -1

             */
             /*!
-                \property QString QSeries::name
+                \property QSeries::name
                 \brief name of the series property
             */

src/qseries.h 0 -1

             #include <qchartglobal.h>
             #include <QObject>
-            //#include <QAbstractItemModel>
             #include <QPen>
             class QAbstractItemModel;

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