##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Test app now adds n data series of different type
Tero Ahola -
r20:1184ba596217
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,24 +1,54
1 1 #include "dataseriedialog.h"
2 2 #include <QDialogButtonBox>
3 #include <QAbstractButton>
3 #include <QGridLayout>
4 #include <QComboBox>
5 #include <QPushButton>
6 #include <QLabel>
4 7 #include <QDebug>
5 8
6 9 DataSerieDialog::DataSerieDialog(QWidget *parent) :
7 10 QDialog(parent)
8 11 {
9 QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Vertical, this);
10 addSeriesBox->addButton("Line", QDialogButtonBox::AcceptRole);
11 addSeriesBox->addButton("Area", QDialogButtonBox::AcceptRole);
12 addSeriesBox->addButton("Bar", QDialogButtonBox::AcceptRole);
13 addSeriesBox->addButton("Pie", QDialogButtonBox::AcceptRole);
14 addSeriesBox->addButton("Scatter", QDialogButtonBox::AcceptRole);
15 addSeriesBox->addButton("Spline", QDialogButtonBox::AcceptRole);
16 connect(addSeriesBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(addSeries(QAbstractButton *)));
17 this->setFixedSize(addSeriesBox->sizeHint());
12 // Combo box for selecting the series type
13 m_seriesTypeCombo = new QComboBox(this);
14 m_seriesTypeCombo->addItem("Line");
15 m_seriesTypeCombo->addItem("Area");
16 m_seriesTypeCombo->addItem("Bar");
17 m_seriesTypeCombo->addItem("Pie");
18 m_seriesTypeCombo->addItem("Scatter");
19 m_seriesTypeCombo->addItem("Spline");
20
21 // Combo box for selecting data for the new series
22 m_testDataCombo = new QComboBox(this);
23 m_testDataCombo->addItem("linear");
24 m_testDataCombo->addItem("SIN");
25 m_testDataCombo->addItem("SIN + random");
26 m_testDataCombo->addItem("TODO From file...");
27 m_testDataCombo->addItem("TODO From URL...");
28
29 QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
30 QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
31 connect(b, SIGNAL(clicked()), this, SLOT(accept()));
32 b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
33 connect(b, SIGNAL(clicked()), this, SLOT(reject()));
34
35 QGridLayout *grid = new QGridLayout();
36 grid->addWidget(new QLabel("Series type:"), 0, 0);
37 grid->addWidget(m_seriesTypeCombo, 0, 1);
38 grid->addWidget(new QLabel("Data:"), 1, 0);
39 grid->addWidget(m_testDataCombo, 1, 1);
40 grid->addWidget(addSeriesBox, 2, 1);
41
42 setLayout(grid);
18 43 }
19 44
20 void DataSerieDialog::addSeries(QAbstractButton *button)
45 void DataSerieDialog::accept()
21 46 {
22 addSeries(button->text().toAscii());
23 accept();
47 accepted(m_seriesTypeCombo->currentText(), m_testDataCombo->currentText());
48 QDialog::accept();
24 49 }
50 //void DataSerieDialog::addSeries(QAbstractButton *button)
51 //{
52 // addSeries(button->text().toAscii());
53 // accept();
54 //}
Show file before | Show file after | Hide comments
@@ -1,21 +1,25
1 1 #ifndef DATASERIEDIALOG_H
2 2 #define DATASERIEDIALOG_H
3 3
4 4 #include <QDialog>
5 5
6 class QAbstractButton;
6 class QComboBox;
7 7
8 8 class DataSerieDialog : public QDialog
9 9 {
10 10 Q_OBJECT
11 11 public:
12 12 explicit DataSerieDialog(QWidget *parent = 0);
13 13
14 14 signals:
15 void addSeries(QString series);
15 void accepted(QString series, QString data);
16 16
17 17 public slots:
18 void addSeries(QAbstractButton *button);
18 void accept();
19
20 private:
21 QComboBox *m_seriesTypeCombo;
22 QComboBox *m_testDataCombo;
19 23 };
20 24
21 25 #endif // DATASERIEDIALOG_H
Show file before | Show file after | Hide comments
@@ -1,229 +1,222
1 1 #include "mainwidget.h"
2 2 #include "dataseriedialog.h"
3 3 #include <qxyseries.h>
4 4 #include <QPushButton>
5 5 #include <QComboBox>
6 6 #include <QSpinBox>
7 7 #include <QCheckBox>
8 8 #include <QGridLayout>
9 9 #include <QHBoxLayout>
10 10 #include <QLabel>
11 11 #include <QSpacerItem>
12 12 #include <QMessageBox>
13 13 #include <cmath>
14 14 #include <QDebug>
15 15
16 16 QCHART_USE_NAMESPACE
17 17
18 18 MainWidget::MainWidget(QWidget *parent) :
19 19 QWidget(parent)
20 20 {
21 21 m_chartWidget = new QChartWidget(this);
22 22 // m_chartWidget->resize(QSize(200,200));
23 23 // m_chartWidget->setColor(Qt::red);
24 // Chart type
25 // TODO: How about multiple types?
26 // Should the type be a property of a graph instead of the chart?
27 // QComboBox *chartTypeCombo = new QComboBox(this);
28 // chartTypeCombo->addItem("Line");
29 // chartTypeCombo->addItem("Area");
30 // chartTypeCombo->addItem("Bar");
31 // chartTypeCombo->addItem("Pie");
32 // chartTypeCombo->addItem("Scatter");
33 // chartTypeCombo->addItem("Spline");
34 // connect(chartTypeCombo, SIGNAL(currentIndexChanged(int)),
35 // this, SLOT(chartTypeChanged(int)));
36 24
37 25 QPushButton *addSeriesButton = new QPushButton("Add series");
38 26 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
39 27
40 // Test data selector
41 QComboBox *testDataCombo = new QComboBox(this);
42 testDataCombo->addItem("linear");
43 testDataCombo->addItem("SIN");
44 testDataCombo->addItem("SIN + random component");
45 testDataCombo->addItem("TODO From file...");
46 testDataCombo->addItem("TODO From URL...");
47 connect(testDataCombo, SIGNAL(currentIndexChanged(int)),
48 this, SLOT(testDataChanged(int)));
49
50 28 // Chart background
51 29 QComboBox *backgroundCombo = new QComboBox(this);
52 30 backgroundCombo->addItem("None");
53 31 backgroundCombo->addItem("TODO Grid");
54 32 backgroundCombo->addItem("TODO Image");
55 33 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
56 34 this, SLOT(backgroundChanged(int)));
57 35
58 36 // Axis
59 37 // TODO: multiple axes?
60 38 m_autoScaleCheck = new QCheckBox("Automatic scaling");
61 39 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
62 40 // Allow setting also non-sense values (like -2147483648 and 2147483647)
63 41 m_xMinSpin = new QSpinBox();
64 42 m_xMinSpin->setMinimum(INT_MIN);
65 43 m_xMinSpin->setMaximum(INT_MAX);
66 44 m_xMinSpin->setValue(0);
67 45 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
68 46 m_xMaxSpin = new QSpinBox();
69 47 m_xMaxSpin->setMinimum(INT_MIN);
70 48 m_xMaxSpin->setMaximum(INT_MAX);
71 49 m_xMaxSpin->setValue(10);
72 50 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
73 51 m_yMinSpin = new QSpinBox();
74 52 m_yMinSpin->setMinimum(INT_MIN);
75 53 m_yMinSpin->setMaximum(INT_MAX);
76 54 m_yMinSpin->setValue(0);
77 55 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
78 56 m_yMaxSpin = new QSpinBox();
79 57 m_yMaxSpin->setMinimum(INT_MIN);
80 58 m_yMaxSpin->setMaximum(INT_MAX);
81 59 m_yMaxSpin->setValue(10);
82 60 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
83 61
84 62 QGridLayout *grid = new QGridLayout();
85 63 QHBoxLayout *hbox = new QHBoxLayout();
86 64 //grid->addWidget(new QLabel("Add series:"), 0, 0);
87 65 grid->addWidget(addSeriesButton, 0, 1);
88 // grid->addWidget(new QLabel("Chart type:"), 0, 0);
89 // grid->addWidget(chartTypeCombo, 0, 1);
90 grid->addWidget(new QLabel("Data:"), 1, 0);
91 grid->addWidget(testDataCombo, 1, 1);
92 66 grid->addWidget(new QLabel("Background:"), 2, 0);
93 67 grid->addWidget(backgroundCombo, 2, 1);
94 68 grid->addWidget(m_autoScaleCheck, 3, 0);
95 69 grid->addWidget(new QLabel("x min:"), 4, 0);
96 70 grid->addWidget(m_xMinSpin, 4, 1);
97 71 grid->addWidget(new QLabel("x max:"), 5, 0);
98 72 grid->addWidget(m_xMaxSpin, 5, 1);
99 73 grid->addWidget(new QLabel("y min:"), 6, 0);
100 74 grid->addWidget(m_yMinSpin, 6, 1);
101 75 grid->addWidget(new QLabel("y max:"), 7, 0);
102 76 grid->addWidget(m_yMaxSpin, 7, 1);
103 77 // add row with empty label to make all the other rows static
104 78 grid->addWidget(new QLabel(""), 8, 0);
105 79 grid->setRowStretch(8, 1);
106 80
107 81 hbox->addLayout(grid);
108 82 hbox->addWidget(m_chartWidget);
109 83 hbox->setStretch(1, 1);
110 84
111 85 setLayout(hbox);
112 86
113 87 m_autoScaleCheck->setChecked(true);
114 88 chartTypeChanged(4);
115 89 testDataChanged(0);
116 90 }
117 91
118 92 void MainWidget::addSeries()
119 93 {
120 94 DataSerieDialog dialog(this);
121 connect(&dialog, SIGNAL(addSeries(QString)), this, SLOT(addSeries(QString)));
95 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
122 96 dialog.exec();
123 97 }
124 98
125 void MainWidget::addSeries(QString series)
99 void MainWidget::addSeries(QString series, QString data)
126 100 {
127 if (series == "Scatter") {
128 QXYSeries* series0 = new QXYSeries();
101 qDebug() << "addSeries: " << series << " data: " << data;
102
103 QXYSeries* series0 = new QXYSeries();
104
105 if (data == "linear") {
106 // TODO
107 } else if (data == "SIN") {
129 108 series0->setColor(Qt::blue);
130 109 for (int x = 0; x < 100; x++)
131 110 series0->add(x, abs(sin(3.14159265358979 / 50 * x) * 100));
132 111 QList<QXYSeries*> dataset;
133 112 dataset << series0;
113 } else if (data == "SIN + random") {
114 series0->setColor(Qt::blue);
115 for (qreal x = 0; x < 100; x += 0.1) {
116 series0->add(x + (rand() % 5),
117 abs(sin(3.14159265358979 / 50 * x) * 100) + (rand() % 5));
118 }
119 } else {
120 // TODO: check if data has a valid file name
121 }
122
123 QList<QXYSeries*> dataset;
124 dataset << series0;
125
126 if (series == "Scatter") {
134 127 m_chartWidget->addDataSeries(QChart::DataSeriesTypeScatter, dataset);
135 //m_chartWidget->addDataSeries(dataset);
128 } else if (series == "Line") {
129 m_chartWidget->addDataSeries(QChart::DataSeriesTypeLine, dataset);
136 130 } else {
137 131 // TODO
138 qDebug() << "addSeries: " << series;
139 132 }
140 133 }
141 134
142 135 void MainWidget::chartTypeChanged(int itemIndex)
143 136 {
144 137 // TODO: change chart type
145 138 switch (itemIndex) {
146 139 case 4:
147 140 //m_chartWidget->setType(4);
148 141 break;
149 142 default: {
150 143 //m_chartWidget->setType(0);
151 144 break;
152 145 }
153 146 }
154 147 }
155 148
156 149 void MainWidget::testDataChanged(int itemIndex)
157 150 {
158 151 qDebug() << "testDataChanged: " << itemIndex;
159 152
160 153 // switch (itemIndex) {
161 154 // case 0: {
162 155 // QList<QChartDataPoint> data;
163 156 // for (int x = 0; x < 20; x++) {
164 157 // data.append(QChartDataPoint() << x << x / 2);
165 158 // }
166 159 // m_chartWidget->setData(data);
167 160 // break;
168 161 // }
169 162 // case 1: {
170 163 // QList<QChartDataPoint> data;
171 164 // for (int x = 0; x < 100; x++) {
172 165 // data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
173 166 // }
174 167 // m_chartWidget->setData(data);
175 168 // break;
176 169 // }
177 170 // case 2: {
178 171 // QList<QChartDataPoint> data;
179 172 // for (int x = 0; x < 1000; x++) {
180 173 // data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
181 174 // data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
182 175 // data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
183 176 // }
184 177 // m_chartWidget->setData(data);
185 178 // break;
186 179 // }
187 180 // default:
188 181 // break;
189 182 // }
190 183 }
191 184
192 185 void MainWidget::backgroundChanged(int itemIndex)
193 186 {
194 187 qDebug() << "backgroundChanged: " << itemIndex;
195 188 }
196 189
197 190 void MainWidget::autoScaleChanged(int value)
198 191 {
199 192 if (value) {
200 193 // TODO: enable auto scaling
201 194 } else {
202 195 // TODO: set scaling manually (and disable auto scaling)
203 196 }
204 197
205 198 m_xMinSpin->setEnabled(!value);
206 199 m_xMaxSpin->setEnabled(!value);
207 200 m_yMinSpin->setEnabled(!value);
208 201 m_yMaxSpin->setEnabled(!value);
209 202 }
210 203
211 204 void MainWidget::xMinChanged(int value)
212 205 {
213 206 qDebug() << "xMinChanged: " << value;
214 207 }
215 208
216 209 void MainWidget::xMaxChanged(int value)
217 210 {
218 211 qDebug() << "xMaxChanged: " << value;
219 212 }
220 213
221 214 void MainWidget::yMinChanged(int value)
222 215 {
223 216 qDebug() << "yMinChanged: " << value;
224 217 }
225 218
226 219 void MainWidget::yMaxChanged(int value)
227 220 {
228 221 qDebug() << "yMaxChanged: " << value;
229 222 }
Show file before | Show file after | Hide comments
@@ -1,42 +1,42
1 1 #ifndef MAINWIDGET_H
2 2 #define MAINWIDGET_H
3 3
4 4 #include <qchartconfig.h>
5 5 #include <qchartwidget.h>
6 6 #include <QWidget>
7 7
8 8 class QSpinBox;
9 9 class QCheckBox;
10 10
11 11 QCHART_USE_NAMESPACE
12 12
13 13 class MainWidget : public QWidget
14 14 {
15 15 Q_OBJECT
16 16 public:
17 17 explicit MainWidget(QWidget *parent = 0);
18 18
19 19 signals:
20 20
21 21 private slots:
22 22 void chartTypeChanged(int itemIndex);
23 23 void addSeries();
24 void addSeries(QString series);
24 void addSeries(QString series, QString data);
25 25 void testDataChanged(int itemIndex);
26 26 void backgroundChanged(int itemIndex);
27 27 void autoScaleChanged(int value);
28 28 void xMinChanged(int value);
29 29 void xMaxChanged(int value);
30 30 void yMinChanged(int value);
31 31 void yMaxChanged(int value);
32 32
33 33 private:
34 34 QChartWidget *m_chartWidget;
35 35 QCheckBox *m_autoScaleCheck;
36 36 QSpinBox *m_xMinSpin;
37 37 QSpinBox *m_xMaxSpin;
38 38 QSpinBox *m_yMinSpin;
39 39 QSpinBox *m_yMaxSpin;
40 40 };
41 41
42 42 #endif // MAINWIDGET_H
General Comments 0
You need to be logged in to leave comments. Login now