##// END OF EJS Templates
Added size factor property to pie
Added size factor property to pie

File last commit:

r60:0be2c26f8dc1
r60:0be2c26f8dc1
Show More
mainwidget.cpp
271 lines | 8.7 KiB | text/x-c | CppLexer
Tero Ahola
New features like chart type to the test app
r5 #include "mainwidget.h"
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 #include "dataseriedialog.h"
Tero Ahola
Added size factor property to pie
r60 #include "qchartseries.h"
#include "qpieseries.h"
Tero Ahola
Fixed compilation of test/example apps
r27 #include <qxychartseries.h>
Tero Ahola
New features like chart type to the test app
r5 #include <QPushButton>
#include <QComboBox>
#include <QSpinBox>
Tero Ahola
Added auto scaling option to test app
r6 #include <QCheckBox>
Tero Ahola
New features like chart type to the test app
r5 #include <QGridLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QSpacerItem>
#include <QMessageBox>
Tero Ahola
Scatter data point now shown using a picture
r13 #include <cmath>
Tero Ahola
New features like chart type to the test app
r5 #include <QDebug>
Tero Ahola
Renamed to QtCommercialChart
r30 QTCOMMERCIALCHART_USE_NAMESPACE
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19
Tero Ahola
New features like chart type to the test app
r5 MainWidget::MainWidget(QWidget *parent) :
QWidget(parent)
{
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 QPushButton *addSeriesButton = new QPushButton("Add series");
connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
Tero Ahola
New features like chart type to the test app
r5
// Chart background
QComboBox *backgroundCombo = new QComboBox(this);
Tero Ahola
Added test data
r16 backgroundCombo->addItem("None");
backgroundCombo->addItem("TODO Grid");
backgroundCombo->addItem("TODO Image");
Tero Ahola
New features like chart type to the test app
r5 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
this, SLOT(backgroundChanged(int)));
// Axis
Tero Ahola
Added a couple of todo comments
r7 // TODO: multiple axes?
Tero Ahola
Drafting scatter type plotting...
r8 m_autoScaleCheck = new QCheckBox("Automatic scaling");
connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
Tero Ahola
New features like chart type to the test app
r5 // Allow setting also non-sense values (like -2147483648 and 2147483647)
Tero Ahola
Added auto scaling option to test app
r6 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)));
Tero Ahola
New features like chart type to the test app
r5
QGridLayout *grid = new QGridLayout();
Tero Ahola
Added size factor property to pie
r60 QGridLayout *mainLayout = new QGridLayout();
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 //grid->addWidget(new QLabel("Add series:"), 0, 0);
grid->addWidget(addSeriesButton, 0, 1);
Tero Ahola
New features like chart type to the test app
r5 grid->addWidget(new QLabel("Background:"), 2, 0);
Tero Ahola
Added test data
r16 grid->addWidget(backgroundCombo, 2, 1);
Tero Ahola
Drafting scatter type plotting...
r8 grid->addWidget(m_autoScaleCheck, 3, 0);
Tero Ahola
Added auto scaling option to test app
r6 grid->addWidget(new QLabel("x min:"), 4, 0);
Tero Ahola
Added test data
r16 grid->addWidget(m_xMinSpin, 4, 1);
Tero Ahola
Added auto scaling option to test app
r6 grid->addWidget(new QLabel("x max:"), 5, 0);
Tero Ahola
Added test data
r16 grid->addWidget(m_xMaxSpin, 5, 1);
Tero Ahola
Added auto scaling option to test app
r6 grid->addWidget(new QLabel("y min:"), 6, 0);
Tero Ahola
Added test data
r16 grid->addWidget(m_yMinSpin, 6, 1);
Tero Ahola
Added auto scaling option to test app
r6 grid->addWidget(new QLabel("y max:"), 7, 0);
Tero Ahola
Added test data
r16 grid->addWidget(m_yMaxSpin, 7, 1);
Tero Ahola
New features like chart type to the test app
r5 // add row with empty label to make all the other rows static
Tero Ahola
Added auto scaling option to test app
r6 grid->addWidget(new QLabel(""), 8, 0);
grid->setRowStretch(8, 1);
Tero Ahola
New features like chart type to the test app
r5
Tero Ahola
Added size factor property to pie
r60 mainLayout->addLayout(grid, 0, 0);
// Scatter specific settings
m_scatterLayout = new QGridLayout();
m_scatterLayout->addWidget(new QLabel("scatter"), 0, 0);
m_scatterLayout->setEnabled(false);
// Pie specific settings
m_pieLayout = new QGridLayout();
m_pieLayout->addWidget(new QLabel("Pie size factor"), 0, 0);
QDoubleSpinBox *pieSizeSpin = new QDoubleSpinBox();
pieSizeSpin->setMinimum(LONG_MIN);
pieSizeSpin->setMaximum(LONG_MAX);
pieSizeSpin->setValue(1.0);
pieSizeSpin->setSingleStep(0.1);
connect(pieSizeSpin, SIGNAL(valueChanged(double)), this, SLOT(setPieSizeFactor(double)));
m_pieLayout->setEnabled(false);
m_pieLayout->addWidget(pieSizeSpin, 0, 1);
mainLayout->addLayout(m_scatterLayout, 1, 0);
mainLayout->addLayout(m_pieLayout, 2, 0);
Tero Ahola
Renamed to QtCommercialChart
r30
m_chartWidget = new QChartWidget(this);
//m_chartWidget->setColor(Qt::red);
Tero Ahola
Added size factor property to pie
r60 mainLayout->addWidget(m_chartWidget, 0, 1, 3, 1);
Tero Ahola
Renamed to QtCommercialChart
r30 // hbox->setStretch(1, 1);
Tero Ahola
New features like chart type to the test app
r5
Tero Ahola
Added size factor property to pie
r60 setLayout(mainLayout);
Tero Ahola
Added auto scaling option to test app
r6
Tero Ahola
Drafting scatter type plotting...
r8 m_autoScaleCheck->setChecked(true);
Tero Ahola
Added test data
r16 testDataChanged(0);
Tero Ahola
New features like chart type to the test app
r5 }
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 void MainWidget::addSeries()
{
Tero Ahola
Added size factor property to pie
r60 DataSerieDialog dialog(m_defaultSeriesName, this);
Tero Ahola
Test app now adds n data series of different type
r20 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 dialog.exec();
}
Tero Ahola
Test app now adds n data series of different type
r20 void MainWidget::addSeries(QString series, QString data)
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 {
Tero Ahola
Test app now adds n data series of different type
r20 qDebug() << "addSeries: " << series << " data: " << data;
Tero Ahola
Added size factor property to pie
r60 m_defaultSeriesName = series;
QChartSeries *newSeries = QXYChartSeries::create();
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48
Tero Ahola
Integrated scatter type series...
r42 // TODO: a dedicated data class for storing x and y values
QList<qreal> x;
QList<qreal> y;
Tero Ahola
Test app now adds n data series of different type
r20
if (data == "linear") {
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 for (int i = 0; i < 20; i++) {
Tero Ahola
Integrated scatter type series...
r42 x.append(i);
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 y.append(i);
Tero Ahola
Integrated scatter type series...
r42 }
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 for (int i = 0; i < 20; i++)
Tero Ahola
Added size factor property to pie
r60 ((QXYChartSeries *)newSeries)->add(i, i);
Tero Ahola
Fixed compilation of test/example apps
r27 } else if (data == "linear, 1M") {
Tero Ahola
Integrated scatter type series...
r42 for (int i = 0; i < 10000; i++) {
x.append(i);
y.append(20);
}
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 for (int i = 0; i < 1000000; i++)
Tero Ahola
Added size factor property to pie
r60 ((QXYChartSeries *)newSeries)->add(i, 10);
Tero Ahola
Test app now adds n data series of different type
r20 } else if (data == "SIN") {
Tero Ahola
Integrated scatter type series...
r42 for (int i = 0; i < 100; i++) {
x.append(i);
y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
}
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 for (int i = 0; i < 100; i++)
Tero Ahola
Added size factor property to pie
r60 ((QXYChartSeries *)newSeries)->add(i, abs(sin(3.14159265358979 / 50 * i) * 100));
Tero Ahola
Test app now adds n data series of different type
r20 } else if (data == "SIN + random") {
Tero Ahola
Integrated scatter type series...
r42 for (qreal i = 0; i < 100; i += 0.1) {
x.append(i + (rand() % 5));
y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
Tero Ahola
Test app now adds n data series of different type
r20 }
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 for (qreal i = 0; i < 100; i += 0.1)
Tero Ahola
Added size factor property to pie
r60 ((QXYChartSeries *)newSeries)->add(i + (rand() % 5), abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
Tero Ahola
Test app now adds n data series of different type
r20 } else {
// TODO: check if data has a valid file name
}
Tero Ahola
Integrated scatter type series...
r42 // TODO: color of the series
if (series == "Scatter") {
Tero Ahola
Added size factor property to pie
r60 newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
Tero Ahola
Integrated draft version of pie series
r51 } else if (series == "Pie") {
Tero Ahola
Added size factor property to pie
r60 newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypePie);
Tero Ahola
Integrated scatter type series...
r42 } else if (series == "Line") {
Tero Ahola
Added size factor property to pie
r60 m_chartWidget->addSeries(newSeries);
Tero Ahola
Integrated scatter type series...
r42 } else {
// TODO
}
Tero Ahola
Added size factor property to pie
r60
setCurrentSeries(newSeries);
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 }
Tero Ahola
Added size factor property to pie
r60 void MainWidget::setCurrentSeries(QChartSeries *series)
Tero Ahola
New features like chart type to the test app
r5 {
Tero Ahola
Added size factor property to pie
r60 m_currentSeries = series;
switch (m_currentSeries->type()) {
case QChartSeries::SeriesTypeLine:
Tero Ahola
Scatter data point now shown using a picture
r13 break;
Tero Ahola
Added size factor property to pie
r60 case QChartSeries::SeriesTypeScatter:
break;
case QChartSeries::SeriesTypePie:
break;
default:
Q_ASSERT(false);
Tero Ahola
Drafting scatter type plotting...
r8 break;
Tero Ahola
Scatter data point now shown using a picture
r13 }
Tero Ahola
New features like chart type to the test app
r5 }
Tero Ahola
Added test data
r16 void MainWidget::testDataChanged(int itemIndex)
Tero Ahola
New features like chart type to the test app
r5 {
Tero Ahola
Added test data
r16 qDebug() << "testDataChanged: " << itemIndex;
Tero Ahola
Started to refactor the API to allow integrating different plot types
r19 // 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;
// }
Tero Ahola
New features like chart type to the test app
r5 }
void MainWidget::backgroundChanged(int itemIndex)
{
qDebug() << "backgroundChanged: " << itemIndex;
}
Tero Ahola
Added auto scaling option to test app
r6 void MainWidget::autoScaleChanged(int value)
{
Tero Ahola
Drafting scatter type plotting...
r8 if (value) {
// TODO: enable auto scaling
} else {
// TODO: set scaling manually (and disable auto scaling)
Tero Ahola
Added auto scaling option to test app
r6 }
Tero Ahola
Drafting scatter type plotting...
r8 m_xMinSpin->setEnabled(!value);
m_xMaxSpin->setEnabled(!value);
m_yMinSpin->setEnabled(!value);
m_yMaxSpin->setEnabled(!value);
Tero Ahola
Added auto scaling option to test app
r6 }
Tero Ahola
New features like chart type to the test app
r5 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;
}
Tero Ahola
Added size factor property to pie
r60
void MainWidget::setPieSizeFactor(double size)
{
QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
Q_ASSERT(pie);
pie->setSizeFactor(qreal(size));
}