HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r815:95ff7d5d8d6a

Enabled chartwidgettest again

Tero Ahola -

r815:95ff7d5d8d6a

parent child

Context file:

r815:95ff7d5d8d6a

Collapse all files

test/chartwidgettest/mainwidget.cpp +30 -34

             #include "mainwidget.h"
             #include "dataseriedialog.h"
-            #include <qpieseries.h>
+            #include "qchartview.h"
-            #include <qscatterseries.h>
+            #include "qpieseries.h"
-            #include <qlineseries.h>
+            #include "qscatterseries.h"
+            #include "qlineseries.h"
             #include <qareaseries.h>
             #include <qsplineseries.h>
             #include <qbarset.h>
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent),
                 m_addSerieDialog(0),
-                m_chartView(0)
+                m_chart(0)
             {
-                m_chartView = new QChartView(this);
+                m_chart = new QChart();
-                m_chartView->setRubberBandPolicy(QChartView::HorizonalRubberBand);
                 // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
+                // Create chart view with the chart
+                m_chartView = new QChartView(m_chart, this);
+                m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();
                 mainLayout->addLayout(grid, 0, 0);
-                // Add layouts and the chart widget to the main layout
                 mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(mainLayout);
             }
             {
                 // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
                 QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
-                connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
+            //    connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
                 zoomCheckBox->setChecked(true);
                 grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QLineSeries *series = new QLineSeries();
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
-                            series->add(i, column.at(i));
+                            series->append(i, column.at(i));
+                        m_chart->addSeries(series);
-                        m_chartView->addSeries(series);
                     }
                 } else if (seriesName == "Area") {
                     // TODO: lower series for the area?
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QLineSeries *lineSeries = new QLineSeries();
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
-                            lineSeries->add(i, column.at(i));
+                            lineSeries->append(i, column.at(i));
                         QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
-                        m_chartView->addSeries(areaSeries);
+                        m_chart->addSeries(areaSeries);
                     }
                 } else if (seriesName == "Scatter") {
                     for (int j(0); j < data.count(); j++) {
                         QList<qreal> column = data.at(j);
                         QScatterSeries *series = new QScatterSeries();
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
-                            (*series) << QPointF(i, column.at(i));
+                            series->append(i, column.at(i));
+                        m_chart->addSeries(series);
-                        m_chartView->addSeries(series);
                     }
                 } else if (seriesName == "Pie") {
                     QStringList labels = generateLabels(rowCount);
                     for (int j(0); j < data.count(); j++) {
                         QPieSeries *series = new QPieSeries();
                         QList<qreal> column = data.at(j);
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
-                            series->add(column.at(i), labels.at(i));
+                            series->append(column.at(i), labels.at(i));
+                        m_chart->addSeries(series);
-                        m_chartView->addSeries(series);
                     }
                 } else if (seriesName == "Bar"
                            || seriesName == "Stacked bar"
                     for (int j(0); j < data.count(); j++) {
                         QList<qreal> column = data.at(j);
                         QBarSet *set = new QBarSet("set" + QString::number(j));
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
                             *set << column.at(i);
+                        series->appendBarSet(set);
-                        series->addBarSet(set);
                     }
                     // TODO: new implementation of setFloatingValuesEnabled with signals
                     //series->setFloatingValuesEnabled(true);
                     series->setToolTipEnabled(true);
-                    m_chartView->addSeries(series);
+                    m_chart->addSeries(series);
                 } else if (seriesName == "Spline") {
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QSplineSeries *series = new QSplineSeries();
-                        for (int i(0); i < column.count(); i++) {
+                        for (int i(0); i < column.count(); i++)
-                            series->add(i, column.at(i));
+                            series->append(i, column.at(i));
+                        m_chart->addSeries(series);
-                        m_chartView->addSeries(series);
                     }
                 }
             }
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
-                m_chartView->setChartTheme((QChart::ChartTheme) themeIndex);
+                m_chart->setTheme((QChart::ChartTheme) themeIndex);
                 //TODO: remove this hack. This is just to make it so that theme change is seen immediately.
                 QSize s = size();
                 s.setWidth(s.width()+1);

test/chartwidgettest/mainwidget.h +4 -2

             #ifndef MAINWIDGET_H
             #define MAINWIDGET_H
-            #include <qchartglobal.h>
+            #include "qchartglobal.h"
-            #include <qchartview.h>
+            #include "qchart.h"
+            #include "qchartview.h"
             #include <QWidget>
             class QSpinBox;
             private:
                 DataSerieDialog *m_addSerieDialog;
+                QChart *m_chart;
                 QChartView *m_chartView;
                 QCheckBox *m_autoScaleCheck;
                 QSpinBox *m_xMinSpin;

test/test.pro +1 -1

             TEMPLATE = subdirs
             SUBDIRS += \
-                #chartwidgettest \
+                chartwidgettest \
                 qmlchart
             !win32:{

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