HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r38:67e4c740a645

Integrated scatter series...

Tero Ahola -

r38:67e4c740a645

parent child

Context file:

r38:67e4c740a645

Collapse all files

src/qchartdata.cpp created 644 +5 0

@@ -0,0 +1,5
	1	#include "qchartdata.h"
	2
	3	QChartData::QChartData()
	4	{
	5	}

src/qchartdata.h created 644 +10 0

@@ -0,0 +1,10
	1	#ifndef QCHARTDATA_H
	2	#define QCHARTDATA_H
	3
	4	class QChartData
	5	{
	6	public:
	7	QChartData();
	8	};
	9
	10	#endif // QCHARTDATA_H

src/qscatterseries.cpp created 644 +67 0

@@ -0,0 +1,67
	1	#include "qscatterseries.h"
	2	#include "qscatterseries_p.h"
	3	#include "qchart.h"
	4	#include <QPainter>
	5	#include <QGraphicsScene>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	//#define QSeriesData QList<qreal>
	10
	11	QScatterSeriesPrivate::QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent) :
	12	QGraphicsItem(parent),
	13	m_x(x),
	14	m_y(y)
	15	{
	16	}
	17
	18	void QScatterSeriesPrivate::setSize()
	19	{
	20	}
	21
	22	QRectF QScatterSeriesPrivate::boundingRect() const
	23	{
	24	return QRectF(0, 0, 100, 100);
	25	}
	26
	27	void QScatterSeriesPrivate::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	28	{
	29	QPen pen = painter->pen();
	30	QBrush brush = pen.brush();
	31	// TODO: The opacity should be user definable...
	32	brush.setColor(QColor(255, 82, 0, 50));
	33	pen.setBrush(brush);
	34	pen.setWidth(4);
	35	painter->setPen(pen);
	36	QTransform transform = painter->transform();
	37
	38	// TODO: get min and max values of the axes from the QChart (or some dedicated class)
	39	const qreal xmin = 0.0;
	40	const qreal xmax = 100.0;
	41	const qreal xscale = scene()->width() / (xmax - xmin);
	42	const qreal ymin = 0.0;
	43	const qreal ymax = 100.0;
	44	const qreal yscale = scene()->height() / (ymax - ymin);
	45
	46	for (int i(0); i < m_x.count() && i < m_y.count(); i++) {
	47	transform.reset();
	48	transform.translate(m_x.at(i) * xscale, m_y.at(i) * yscale);
	49	painter->setTransform(transform);
	50	painter->drawArc(0, 0, 4, 4, 0, 5760);
	51	}
	52	}
	53
	54	QScatterSeries::QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent) :
	55	QChartSeries(parent),
	56	d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
	57	{
	58	}
	59
	60	QScatterSeries::~QScatterSeries()
	61	{
	62	delete d;
	63	}
	64
	65	#include "moc_qscatterseries.cpp"
	66
	67	QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries.h created 644 +29 0

@@ -0,0 +1,29
	1	#ifndef QSCATTERSERIES_H
	2	#define QSCATTERSERIES_H
	3
	4	#include "qchartseries.h"
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7	class QScatterSeriesPrivate;
	8
	9	class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
	10	{
	11	Q_OBJECT
	12	public:
	13	//QScatterSeries(QSeriesData data, QObject chart);
	14	QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *chart = 0);
	15	~QScatterSeries();
	16
	17	public: // from QChartSeries
	18	virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
	19
	20	private:
	21	Q_DECLARE_PRIVATE(QScatterSeries)
	22	Q_DISABLE_COPY(QScatterSeries)
	23	friend class QChart;
	24	QScatterSeriesPrivate *const d;
	25	};
	26
	27	QTCOMMERCIALCHART_END_NAMESPACE
	28
	29	#endif // QSCATTERSERIES_H

src/qscatterseries_p.h created 644 +29 0

@@ -0,0 +1,29
	1	#ifndef QSCATTERSERIESPRIVATE_H
	2	#define QSCATTERSERIESPRIVATE_H
	3
	4	#include "qchartseries.h"
	5	#include <QGraphicsItem>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	/*!
	10	* The PIMPL class of QScatterSeries.
	11	*/
	12	class QScatterSeriesPrivate : public QGraphicsItem
	13	{
	14	public:
	15	QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent);
	16
	17	public: // from QGraphicsItem
	18	void setSize();
	19	QRectF boundingRect() const;
	20	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget);
	21
	22	// TODO: use the chart data class instead of list of x and y values?
	23	QList<qreal> m_x;
	24	QList<qreal> m_y;
	25	};
	26
	27	QTCOMMERCIALCHART_END_NAMESPACE
	28
	29	#endif // QSCATTERSERIES_H

src/qchart.cpp +31 -3

             #include "qchart.h"
             #include "qchartseries.h"
+            #include "qscatterseries.h"
+            #include "qscatterseries_p.h"
             #include "xylinechartitem_p.h"
             #include "xyplotdomain_p.h"
             #include "axis_p.h"
             #include "xygrid_p.h"
+            #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartPrivate
             {
             public:
                 QChartPrivate(QChart* parent):
                 m_axisX(new Axis(parent)),
                 m_axisY(new Axis(parent)),
                 m_grid(new XYGrid(parent)),
                 m_plotDataIndex(0),
                 m_marginSize(0){}
                 Axis* m_axisX;
                 Axis* m_axisY;
                 XYGrid* m_grid;
                 QRect m_rect;
                 QList<const QChartSeries*> m_series;
                 QList<XYPlotDomain> m_plotDataList;
                 QList<QGraphicsItem*> m_items;
                 int m_plotDataIndex;
                 int m_marginSize;
             };
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChart::QChart(QGraphicsItem* parent):QGraphicsItem(parent),
             d_ptr(new QChartPrivate(this))
             {
                 //  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 // set axis
                 Q_D(QChart);
                 d->m_axisY->rotate(90);
                 //TODO hardcoded values , to removed soon
                 XYPlotDomain data;
                 data.m_minX = 0.0;
                 data.m_maxX = 100.0;
                 data.m_minY = 0.0;
                 data.m_maxY = 100.0;
                 data.m_ticksX=4;
                 data.m_ticksY=4;
                 d->m_plotDataList.clear();
                 d->m_plotDataList << data;
                 d->m_grid->setZValue(10);
                 d->m_grid->setXYPlotData(d->m_plotDataList.at(0));
             }
             QChart::~QChart(){}
             QRectF QChart::boundingRect() const
             {
                 Q_D(const QChart);
                 return d->m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
                 Q_D(QChart);
                 d->m_series<<series;
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     XYLineChartItem* item = new XYLineChartItem(reinterpret_cast<QXYChartSeries*>(series),this);
                     item->updateXYPlotData(d->m_plotDataList.at(0));
                     d->m_items<<item;
                     break;
                 }
                 case QChartSeries::SeriesTypeScatter: {
                     break;
                 }
                 }
             }
+            QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            {
+                Q_D(QChart);
+                // TODO: support also other types
+                Q_ASSERT(type == QChartSeries::SeriesTypeScatter);
+                QChartSeries *series = 0;
+                switch (type) {
+                case QChartSeries::SeriesTypeScatter: {
+                    QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
+                    //scatterSeries->d->set
+                    d->m_items.append(scatterSeries->d);
+                    scene()->addItem(scatterSeries->d);
+                    //series = qobject_cast<QChartSeries *>(scatterSeries);
+                    break;
+                }
+                default:
+                    break;
+                }
+                return series;
+            }
             void QChart::setSize(const QSizeF& size)
             {
                 Q_D(QChart);
                 //TODO refactor to setGeometry
                 d->m_rect = QRect(QPoint(0,0),size.toSize());
                 d->m_rect.adjust(margin(),margin(),-margin(),-margin());
                 d->m_grid->setPos(d->m_rect.topLeft());
                 d->m_grid->setSize(d->m_rect.size());
                 d->m_plotDataList[0].m_viewportRect = d->m_rect;
-                foreach(QGraphicsItem* item , d->m_items)
+                // TODO: line chart items would need to be updated separately as they don't support update
-                reinterpret_cast<XYLineChartItem*>(item)->updateXYPlotData(d->m_plotDataList.at(0));
+                // via paint method
+            //    foreach(QGraphicsItem* item , d->m_items) {
+            //        reinterpret_cast<XYLineChartItem*>(item);//->updateXYPlotData(d->m_plotDataList.at(0));
                 update();
             }
             int QChart::margin() const
             {
                 Q_D(const QChart);
                 return d->m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 Q_D(QChart);
                 d->m_marginSize = margin;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +13 -2

             #ifndef CHART_H
             #define CHART_H
             #include <qchartglobal.h>
+            #include <qchartseries.h>
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Axis;
             class XYGrid;
             class QChartSeries;
             class XYPlotDomain;
             class QChartPrivate;
-            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem
+            // TODO: We don't need to have QChart tied to QGraphicsItem:
+            //class QTCOMMERCIALCHART_EXPORT QChart
+            //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
+            // public: QChartGraphicsItem(QChart &chart);
+            /*!
+             * TODO: define the responsibilities
+             */
+            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem, public QObject
+            {
             public:
                 QChart(QGraphicsItem* parent = 0);
                 virtual ~QChart();
                 //from QGraphicsItem
                 virtual QRectF boundingRect() const;
                 virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                 void addSeries(QChartSeries* series);
+                //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
+                // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
+                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
                 virtual void setSize(const QSizeF& rect);
                 void setMargin(int margin);
                 int margin() const;
             protected:
                 QChartPrivate * const d_ptr;
             private:
                 Q_DISABLE_COPY(QChart)
                 Q_DECLARE_PRIVATE(QChart)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartseries.h 0 -1

             #ifndef QCHARTSERIES_H
             #define QCHARTSERIES_H
             #include "qchartglobal.h"
             #include <QObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
             {
             public:
                 enum QChartSeriesType {
                     SeriesTypeLine = 0,
             //        SeriesTypeArea,
             //        SeriesTypeBar,
             //        SeriesTypePie,
                     SeriesTypeScatter
             //        SeriesTypeSpline
                 };
             protected:
                 QChartSeries(QObject *parent = 0) : QObject(parent) {};
             public:
                 virtual ~QChartSeries() {};
                 //factory method
                 static QChartSeries* create(QObject* parent = 0) { return 0;}
                 //pure virtual
                 virtual QChartSeriesType type() const = 0;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartwidget.cpp +7 0

             #include "qchartwidget.h"
             #include "qchartseries.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartWidgetPrivate
             {
             public:
                 QChartWidgetPrivate(QChartWidget *parent) :
                 m_view(0),
                 m_scene(0),
                 m_chart(0)
                 {
                     m_scene = new QGraphicsScene();
                     m_view = new QGraphicsView(parent);
                     m_view->setScene(m_scene);
                     m_chart = new QChart();
                     m_scene->addItem(m_chart);
+                    m_view->show();
                 }
                 ~QChartWidgetPrivate() {
                 }
                 QGraphicsView *m_view;
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
             };
             ///////////////////////////////////////////////////////////////////////////////////////////////////
             QChartWidget::QChartWidget(QWidget *parent) :
                 QWidget(parent),
                 d_ptr(new QChartWidgetPrivate(this))
             {
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             QChartWidget::~QChartWidget()
             {
                 delete d_ptr;
             }
             void QChartWidget::resizeEvent(QResizeEvent *event)
             {
                 Q_D(QChartWidget);
                 d->m_view->resize(size().width(),size().height());
                 d->m_scene->setSceneRect(0,0,size().width(),size().height());
                 d->m_chart->setSize(size());
                 QWidget::resizeEvent(event);
             }
             QSize QChartWidget::sizeHint() const
             {
                 // TODO: calculate size hint based on contents?
                 return QSize(100, 100);
             }
             void QChartWidget::addSeries(QChartSeries* series)
             {
                 Q_D(QChartWidget);
                 d->m_chart->addSeries(series);
             }
+            QChartSeries* QChartWidget::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            {
+                Q_D(QChartWidget);
+                return d->m_chart->createSeries(x, y, type);
+            }
             #include "moc_qchartwidget.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartwidget.h +3 0

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qchart.h"
             #include <QWidget>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartSeries;
             class QChartWidgetPrivate;
             class QTCOMMERCIALCHART_EXPORT QChartWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit QChartWidget(QWidget *parent = 0);
                 ~QChartWidget();
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
                 QSize sizeHint() const;
+                // TODO: addSeries and createSeries are optional solutions
                 void addSeries(QChartSeries* series);
+                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
             protected:
                 QChartWidgetPrivate * const d_ptr;
             private:
                 Q_DISABLE_COPY(QChartWidget)
                 Q_DECLARE_PRIVATE(QChartWidget)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

src/src.pro +10 -32

-            !include( ../common.pri ) {
-            error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
-            DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 xylinechart/qxychartseries.cpp \
                 xylinechart/xylinechartitem.cpp \
                 xylinechart/xygrid.cpp \
                 xylinechart/xyplotdomain.cpp \
+                qscatterseries.cpp \
                 qchart.cpp \
                 axis.cpp \
-                qchartwidget.cpp
+                qchartwidget.cpp \
+                qchartdata.cpp
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
                 xylinechart/xyplotdomain_p.h \
                 xylinechart/xygrid_p.h \
+                qscatterseries_p.h \
                 axis_p.h
             PUBLIC_HEADERS += \
                 qchartseries.h \
+                qscatterseries.h \
                 qchart.h \
+                qchartdata.h \
                 qchartwidget.h \
                 qchartglobal.h \
                 xylinechart/qxychartseries.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \
                            .
-            OBJECTS_DIR = $$CHART_BUILD_DIR/lib
+            OBJECTS_DIR = ../build/lib
-            MOC_DIR = $$CHART_BUILD_DIR/lib
+            MOC_DIR = ../build/lib
-            UI_DIR = $$CHART_BUILD_DIR/lib
+            UI_DIR = ../build/lib
-            RCC_DIR = $$CHART_BUILD_DIR/lib
+            RCC_DIR = ../build/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
-            install_build_headers.name = bild_headers
-            install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
-            install_build_headers.input = PUBLIC_HEADERS
-            install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
-            install_build_headers.CONFIG += target_predeps no_link
-            QMAKE_EXTRA_COMPILERS += install_build_headers
-            chartversion.target = qchartversion_p.h
-            chartversion.commands = @echo "build_time" > $$chartversion.target;
-            chartversion.depends = $$HEADERS $$SOURCES
-            PRE_TARGETDEPS += qchartversion_p.h
-            QMAKE_CLEAN+= qchartversion_p.h
-            QMAKE_EXTRA_TARGETS += chartversion
-            unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
-            win32:QMAKE_DISTCLEAN += $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
  No newline at end of file

test/chartwidgettest/mainwidget.cpp +29 -21

             #include "mainwidget.h"
             #include "dataseriedialog.h"
             #include <qxychartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 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);
                 m_chartWidget = new QChartWidget(this);
                 //m_chartWidget->setColor(Qt::red);
                 hbox->addWidget(m_chartWidget);
             //    hbox->setStretch(1, 1);
                 setLayout(hbox);
                 m_autoScaleCheck->setChecked(true);
                 chartTypeChanged(4);
                 testDataChanged(0);
             }
             void MainWidget::addSeries()
             {
                 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 = 0;
+                QChartSeries* scatterSeries = 0;
-                // TODO: color of the series
+                // TODO: a dedicated data class for storing x and y values
-                if (series == "Scatter") {
+                QList<qreal> x;
-                    series0 = QXYChartSeries::create();
+                QList<qreal> y;
-                } else if (series == "Line") {
-                    series0 = QXYChartSeries::create();
-                } else {
-                    // TODO
-                    series0 = QXYChartSeries::create();
                 if (data == "linear") {
-                    for (int i = 0; i < 10; i++)
+                    for (int i = 0; i < 10; i++) {
-                        series0->add(i, 10);
+                        x.append(i);
+                        y.append(10);
+                    }
                 } else if (data == "linear, 1M") {
-                    for (int i = 0; i < 1000000; i++)
+                    for (int i = 0; i < 10000; i++) {
-                        series0->add(i, 20);
+                        x.append(i);
+                        y.append(20);
+                    }
                 } else if (data == "SIN") {
-                    for (int x = 0; x < 100; x++)
+                    for (int i = 0; i < 100; i++) {
-                          series0->add(x, abs(sin(3.14159265358979 / 50 * x) * 100));
+                        x.append(i);
-                    QList<QXYChartSeries*> dataset;
+                        y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
-                    dataset << series0;
                 } else if (data == "SIN + random") {
-                    for (qreal x = 0; x < 100; x += 0.1) {
+                    for (qreal i = 0; i < 100; i += 0.1) {
-                        series0->add(x + (rand() % 5),
+                        x.append(i + (rand() % 5));
-                                     abs(sin(3.14159265358979 / 50 * x) * 100) + (rand() % 5));
+                        y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                     }
                 } else {
                     // TODO: check if data has a valid file name
                 }
+                // TODO: color of the series
+                if (series == "Scatter") {
+                    scatterSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
+                } else if (series == "Line") {
+                    series0 = QXYChartSeries::create();
+                    for (int i = 0; i < 1000000; i++)
+                        series0->add(i, 20);
                     m_chartWidget->addSeries(series0);
+                } 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;
             }

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