HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r26:aa0e09b6abc0

The test app now preserves series type selection

Tero Ahola -

r26:aa0e09b6abc0

parent child

Context file:

r26:aa0e09b6abc0

Collapse all files

test/chartwidgettest/dataseriedialog.cpp +8 -1

             #include "dataseriedialog.h"
             #include <QDialogButtonBox>
             #include <QGridLayout>
             #include <QComboBox>
             #include <QPushButton>
             #include <QLabel>
             #include <QDebug>
-            DataSerieDialog::DataSerieDialog(QWidget *parent) :
+            DataSerieDialog::DataSerieDialog(QString defaultType, QWidget *parent) :
                 QDialog(parent)
             {
                 // Combo box for selecting the series type
                 m_seriesTypeCombo = new QComboBox(this);
                 m_seriesTypeCombo->addItem("Line");
                 m_seriesTypeCombo->addItem("Area");
                 m_seriesTypeCombo->addItem("Bar");
                 m_seriesTypeCombo->addItem("Pie");
                 m_seriesTypeCombo->addItem("Scatter");
                 m_seriesTypeCombo->addItem("Spline");
+                // Allow pre-selection of a series type
+                if (defaultType != "") {
+                    int index = m_seriesTypeCombo->findText(defaultType);
+                    if (index > 0)
+                        m_seriesTypeCombo->setCurrentIndex(index);
+                }
                 // Combo box for selecting data for the new series
                 m_testDataCombo = new QComboBox(this);
                 m_testDataCombo->addItem("linear");
                 m_testDataCombo->addItem("SIN");
                 m_testDataCombo->addItem("SIN + random");
                 m_testDataCombo->addItem("TODO From file...");
                 m_testDataCombo->addItem("TODO From URL...");
                 QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
                 QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
                 connect(b, SIGNAL(clicked()), this, SLOT(accept()));
                 b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
                 connect(b, SIGNAL(clicked()), this, SLOT(reject()));
                 QGridLayout *grid = new QGridLayout();
                 grid->addWidget(new QLabel("Series type:"), 0, 0);
                 grid->addWidget(m_seriesTypeCombo, 0, 1);
                 grid->addWidget(new QLabel("Data:"), 1, 0);
                 grid->addWidget(m_testDataCombo, 1, 1);
                 grid->addWidget(addSeriesBox, 2, 1);
                 setLayout(grid);
             }
             void DataSerieDialog::accept()
             {
                 accepted(m_seriesTypeCombo->currentText(), m_testDataCombo->currentText());
                 QDialog::accept();
             }
             //void DataSerieDialog::addSeries(QAbstractButton *button)
             //{
             //    addSeries(button->text().toAscii());
             //    accept();
             //}

test/chartwidgettest/dataseriedialog.h +1 -1

             #ifndef DATASERIEDIALOG_H
             #define DATASERIEDIALOG_H
             #include <QDialog>
             class QComboBox;
             class DataSerieDialog : public QDialog
             {
                 Q_OBJECT
             public:
-                explicit DataSerieDialog(QWidget *parent = 0);
+                explicit DataSerieDialog(QString defaultType, QWidget *parent = 0);
             signals:
                 void accepted(QString series, QString data);
             public slots:
                 void accept();
             private:
                 QComboBox *m_seriesTypeCombo;
                 QComboBox *m_testDataCombo;
             };
             #endif // DATASERIEDIALOG_H

test/chartwidgettest/mainwidget.cpp +2 -1

             #include "mainwidget.h"
             #include "dataseriedialog.h"
             #include <qxyseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             QCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 m_chartWidget = new QChartWidget(this);
             //    m_chartWidget->resize(QSize(200,200));
             //    m_chartWidget->setColor(Qt::red);
                 QPushButton *addSeriesButton = new QPushButton("Add series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 // Chart background
                 QComboBox *backgroundCombo = new QComboBox(this);
                 backgroundCombo->addItem("None");
                 backgroundCombo->addItem("TODO Grid");
                 backgroundCombo->addItem("TODO Image");
                 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(backgroundChanged(int)));
                 // Axis
                 // TODO: multiple axes?
                 m_autoScaleCheck = new QCheckBox("Automatic scaling");
                 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
                 // Allow setting also non-sense values (like -2147483648 and 2147483647)
                 m_xMinSpin = new QSpinBox();
                 m_xMinSpin->setMinimum(INT_MIN);
                 m_xMinSpin->setMaximum(INT_MAX);
                 m_xMinSpin->setValue(0);
                 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
                 m_xMaxSpin = new QSpinBox();
                 m_xMaxSpin->setMinimum(INT_MIN);
                 m_xMaxSpin->setMaximum(INT_MAX);
                 m_xMaxSpin->setValue(10);
                 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
                 m_yMinSpin = new QSpinBox();
                 m_yMinSpin->setMinimum(INT_MIN);
                 m_yMinSpin->setMaximum(INT_MAX);
                 m_yMinSpin->setValue(0);
                 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
                 m_yMaxSpin = new QSpinBox();
                 m_yMaxSpin->setMinimum(INT_MIN);
                 m_yMaxSpin->setMaximum(INT_MAX);
                 m_yMaxSpin->setValue(10);
                 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
                 QGridLayout *grid = new QGridLayout();
                 QHBoxLayout *hbox = new QHBoxLayout();
                 //grid->addWidget(new QLabel("Add series:"), 0, 0);
                 grid->addWidget(addSeriesButton, 0, 1);
                 grid->addWidget(new QLabel("Background:"), 2, 0);
                 grid->addWidget(backgroundCombo, 2, 1);
                 grid->addWidget(m_autoScaleCheck, 3, 0);
                 grid->addWidget(new QLabel("x min:"), 4, 0);
                 grid->addWidget(m_xMinSpin, 4, 1);
                 grid->addWidget(new QLabel("x max:"), 5, 0);
                 grid->addWidget(m_xMaxSpin, 5, 1);
                 grid->addWidget(new QLabel("y min:"), 6, 0);
                 grid->addWidget(m_yMinSpin, 6, 1);
                 grid->addWidget(new QLabel("y max:"), 7, 0);
                 grid->addWidget(m_yMaxSpin, 7, 1);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), 8, 0);
                 grid->setRowStretch(8, 1);
                 hbox->addLayout(grid);
                 hbox->addWidget(m_chartWidget);
                 hbox->setStretch(1, 1);
                 setLayout(hbox);
                 m_autoScaleCheck->setChecked(true);
                 chartTypeChanged(4);
                 testDataChanged(0);
             }
             void MainWidget::addSeries()
             {
-                DataSerieDialog dialog(this);
+                DataSerieDialog dialog(m_defaultSeries, this);
                 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
                 dialog.exec();
             }
             void MainWidget::addSeries(QString series, QString data)
             {
                 qDebug() << "addSeries: " << series << " data: " << data;
+                m_defaultSeries = series;
                 QXYChartSeries* series0 = new QXYChartSeries();
                 if (data == "linear") {
                     // TODO
                 } else if (data == "SIN") {
                     series0->setColor(Qt::blue);
                     for (int x = 0; x < 100; x++)
                           series0->add(x, abs(sin(3.14159265358979 / 50 * x) * 100));
                     QList<QXYChartSeries*> dataset;
                     dataset << series0;
                 } else if (data == "SIN + random") {
                     series0->setColor(Qt::blue);
                     for (qreal x = 0; x < 100; x += 0.1) {
                         series0->add(x + (rand() % 5),
                                      abs(sin(3.14159265358979 / 50 * x) * 100) + (rand() % 5));
                     }
                 } else {
                     // TODO: check if data has a valid file name
                 }
                 QList<QXYChartSeries*> dataset;
                 dataset << series0;
                 if (series == "Scatter") {
                     m_chartWidget->addDataSeries(QChart::DataSeriesTypeScatter, dataset);
                 } else if (series == "Line") {
                     m_chartWidget->addDataSeries(QChart::DataSeriesTypeLine, dataset);
                 } else {
                     // TODO
                 }
             }
             void MainWidget::chartTypeChanged(int itemIndex)
             {
                 // TODO: change chart type
                 switch (itemIndex) {
                 case 4:
                     //m_chartWidget->setType(4);
                     break;
                 default: {
                     //m_chartWidget->setType(0);
                     break;
                 }
                 }
             }
             void MainWidget::testDataChanged(int itemIndex)
             {
                 qDebug() << "testDataChanged: " << itemIndex;
             //    switch (itemIndex) {
             //    case 0: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 20; x++) {
             //            data.append(QChartDataPoint() << x << x / 2);
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 1: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 100; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 2: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 1000; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    default:
             //        break;
             //    }
             }
             void MainWidget::backgroundChanged(int itemIndex)
             {
                 qDebug() << "backgroundChanged: " << itemIndex;
             }
             void MainWidget::autoScaleChanged(int value)
             {
                 if (value) {
                     // TODO: enable auto scaling
                 } else {
                     // TODO: set scaling manually (and disable auto scaling)
                 }
                 m_xMinSpin->setEnabled(!value);
                 m_xMaxSpin->setEnabled(!value);
                 m_yMinSpin->setEnabled(!value);
                 m_yMaxSpin->setEnabled(!value);
             }
             void MainWidget::xMinChanged(int value)
             {
                 qDebug() << "xMinChanged: " << value;
             }
             void MainWidget::xMaxChanged(int value)
             {
                 qDebug() << "xMaxChanged: " << value;
             }
             void MainWidget::yMinChanged(int value)
             {
                 qDebug() << "yMinChanged: " << value;
             }
             void MainWidget::yMaxChanged(int value)
             {
                 qDebug() << "yMaxChanged: " << value;
             }

test/chartwidgettest/mainwidget.h +1 0

             #ifndef MAINWIDGET_H
             #define MAINWIDGET_H
             #include <qchartconfig.h>
             #include <qchartwidget.h>
             #include <QWidget>
             class QSpinBox;
             class QCheckBox;
             QCHART_USE_NAMESPACE
             class MainWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit MainWidget(QWidget *parent = 0);
             signals:
             private slots:
                 void chartTypeChanged(int itemIndex);
                 void addSeries();
                 void addSeries(QString series, QString data);
                 void testDataChanged(int itemIndex);
                 void backgroundChanged(int itemIndex);
                 void autoScaleChanged(int value);
                 void xMinChanged(int value);
                 void xMaxChanged(int value);
                 void yMinChanged(int value);
                 void yMaxChanged(int value);
             private:
                 QChartWidget *m_chartWidget;
                 QCheckBox *m_autoScaleCheck;
                 QSpinBox *m_xMinSpin;
                 QSpinBox *m_xMaxSpin;
                 QSpinBox *m_yMinSpin;
                 QSpinBox *m_yMaxSpin;
+                QString m_defaultSeries;
             };
             #endif // MAINWIDGET_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