HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r13:335e8906dfcb

Scatter data point now shown using a picture

Tero Ahola -

r13:335e8906dfcb

parent child

Context file:

r13:335e8906dfcb

Collapse all files

test/chartwidgettest/qseriespointgraphicsitem.cpp created 644 +37 0

@@ -0,0 +1,37
	1	#include "qseriespointgraphicsitem.h"
	2	#include <QPainter>
	3	#include <QPicture>
	4	#include <QPixmap>
	5	#include <QDebug>
	6
	7	QSeriesPointGraphicsItem::QSeriesPointGraphicsItem(qreal dx, qreal dy, QGraphicsItem *parent)
	8	: QGraphicsItem(parent),
	9	m_dx(dx),
	10	m_dy(dy)
	11	{
	12	}
	13
	14	QRectF QSeriesPointGraphicsItem::boundingRect() const
	15	{
	16	// return parentItem()->boundingRect();
	17	return QRectF(0, 0, 10, 10);
	18	}
	19
	20	void QSeriesPointGraphicsItem::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	21	{
	22	QTransform transform = painter->transform();
	23	transform.translate(m_dx, m_dy);
	24	painter->setTransform(transform);
	25
	26	QPen pen = painter->pen();
	27	QBrush brush = pen.brush();
	28	brush.setColor(Qt::darkRed);
	29	pen.setBrush(brush);
	30	painter->setPen(pen);
	31
	32	QPixmap pixmap;
	33	pixmap.load("scatter.png");
	34	painter->drawPixmap(boundingRect().toRect(), pixmap);
	35
	36	// painter->drawRect(boundingRect());
	37	}

test/chartwidgettest/qseriespointgraphicsitem.h created 644 +18 0

@@ -0,0 +1,18
	1	#ifndef QSERIESPOINTGRAPHICSITEM_H
	2	#define QSERIESPOINTGRAPHICSITEM_H
	3
	4	#include <QGraphicsItem>
	5
	6	class QSeriesPointGraphicsItem : public QGraphicsItem
	7	{
	8	public:
	9	QSeriesPointGraphicsItem(qreal dx, qreal dy, QGraphicsItem *parent = 0);
	10
	11	private:
	12	QRectF boundingRect() const;
	13	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget = 0);
	14	qreal m_dx;
	15	qreal m_dy;
	16	};
	17
	18	#endif // QSERIESPOINTGRAPHICSITEM_H

test/chartwidgettest/chartwidgettest.pro +6 -2

             TARGET = chartwidgettest
             TEMPLATE = app
             QT += core gui
             contains(QT_MAJOR_VERSION, 5) {
                 QT += widgets
             }
             CONFIG += charts
             CHARTS += widget
             OBJECTS_DIR = tmp
             MOC_DIR = tmp
             SOURCES += main.cpp \
                 mainwidget.cpp \
                 qscatterseries.cpp \
-                qchartwidget.cpp
+                qchartwidget.cpp \
+                qseriespointgraphicsitem.cpp
             HEADERS += \
                 mainwidget.h \
                 qscatterseries.h \
-                qchartwidget.h
+                qchartwidget.h \
+                qseriespointgraphicsitem.h

test/chartwidgettest/mainwidget.cpp +18 -4

             #include "mainwidget.h"
             #include "qchartwidget.h"
             //#include <chartwidget.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
+            #include <cmath>
             #include <QDebug>
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 m_chartWidget = new QChartWidget(this);
             //    m_chartWidget->resize(QSize(200,200));
             //    m_chartWidget->setColor(Qt::red);
                 // Chart type
                 // TODO: How about multiple types?
                 // Should the type be a property of a graph instead of the chart?
                 QComboBox *chartTypeCombo = new QComboBox(this);
                 chartTypeCombo->addItem("Line");
                 chartTypeCombo->addItem("Area");
                 chartTypeCombo->addItem("Bar");
                 chartTypeCombo->addItem("Pie");
                 chartTypeCombo->addItem("Scatter");
                 chartTypeCombo->addItem("Spline");
                 connect(chartTypeCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(chartTypeChanged(int)));
                 // Test data selector
                 QPushButton *fileButton = new QPushButton("From file");
                 QPushButton *urlButton = new QPushButton("From URL");
                 // Chart background
                 QComboBox *backgroundCombo = new QComboBox(this);
                 backgroundCombo->addItem("todo: add background types");
                 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("Chart type:"), 0, 0);
                 grid->addWidget(chartTypeCombo, 0, 1, 1, 2);
                 grid->addWidget(new QLabel("Data:"), 1, 0);
                 grid->addWidget(fileButton, 1, 1);
                 grid->addWidget(urlButton, 1, 2);
                 grid->addWidget(new QLabel("Background:"), 2, 0);
                 grid->addWidget(backgroundCombo, 2, 1, 1, 2);
                 grid->addWidget(m_autoScaleCheck, 3, 0);
                 grid->addWidget(new QLabel("x min:"), 4, 0);
                 grid->addWidget(m_xMinSpin, 4, 1, 1, 2);
                 grid->addWidget(new QLabel("x max:"), 5, 0);
                 grid->addWidget(m_xMaxSpin, 5, 1, 1, 2);
                 grid->addWidget(new QLabel("y min:"), 6, 0);
                 grid->addWidget(m_yMinSpin, 6, 1, 1, 2);
                 grid->addWidget(new QLabel("y max:"), 7, 0);
                 grid->addWidget(m_yMaxSpin, 7, 1, 1, 2);
                 // 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);
             }
             void MainWidget::chartTypeChanged(int itemIndex)
             {
                 // TODO: change chart type
                 switch (itemIndex) {
                 case 4: {
-                        m_chartWidget->setType(4);
+                    QList<QChartDataPoint> data;
-                        break;
+                    for (int x = 0; x < 1000; ++x) {
+                        data.append(QChartDataPoint() << x -200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
-                default:
+            //        data.append(QChartDataPoint() << 0 << 0);
+            //        data.append(QChartDataPoint() << 2 << 2);
+            //        data.append(QChartDataPoint() << 4 << 5);
+            //        data.append(QChartDataPoint() << 5 << 9);
+            //        data.append(QChartDataPoint() << 20 << 20);
+            //        QList<int> data;
+                    m_chartWidget->setType(4);
+                    m_chartWidget->setData(data);
+                    break;
+                }
+                default: {
                     m_chartWidget->setType(0);
                     break;
                 }
+                }
             }
             void MainWidget::dataChanged(QString itemText)
             {
                 qDebug() << "dataChanged: " << itemText;
             }
             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/qchartwidget.cpp +11 -8

             #include "qchartwidget.h"
             #include "qscatterseries.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             QChartWidget::QChartWidget(QWidget *parent) :
-                QWidget(parent)
+                QWidget(parent),
+                m_scatter(0)
             {
-                // scatter
                 m_scene = new QGraphicsScene();
                 m_view = new QGraphicsView(m_scene, this);
-                m_view->resize(300, 300);
+                m_view->resize(490, 300);
-                // TODO: implement graphics item for axis
-                m_scene->addLine(0, 0, 0, 100);
-                m_scene->addLine(0, 100, 100, 100);
                 m_view->show();
             }
             QChartWidget::~QChartWidget()
             {
                 delete m_view;
                 delete m_scene;
             }
             void QChartWidget::setType(/*TODO QChart::Type*/ int type)
             {
                 if (type == 4) {
                     if (!m_scatter) {
                         m_scatter = new QScatterSeries();
                         m_scene->addItem(m_scatter);
                     }
                 } else {
                     if (m_scatter) {
                         m_scene->removeItem(m_scatter);
                         delete m_scatter;
                         m_scatter = 0;
                     }
                 }
             }
+            void QChartWidget::setData(QList<QChartDataPoint> data)
+            //void QChartWidget::setData(QList<int> data)
+            {
+                // TODO: other chart types... this looks ugly
+                if (m_scatter)
+                    m_scatter->setData(data);
+            }

test/chartwidgettest/qchartwidget.h +5 0

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include <QWidget>
             class QGraphicsView;
             class QGraphicsScene;
             class QScatterSeries;
+            // TODO:
+            #define QChartDataPoint QList<QVariant>
             class QChartWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit QChartWidget(QWidget *parent = 0);
                 ~QChartWidget();
                 void setType(/*TODO QChart::Type*/ int type);
+                void setData(QList<QChartDataPoint> data);
+            //    void setData(QList<int> data);
             signals:
             public slots:
             private:
                 QGraphicsView *m_view;
                 QGraphicsScene *m_scene;
                 QScatterSeries *m_scatter;
             };
             #endif // QCHARTWIDGET_H

test/chartwidgettest/qscatterseries.cpp +15 -14

             #include "qscatterseries.h"
+            #include "qseriespointgraphicsitem.h"
             #include <QPainter>
+            #include <QGraphicsScene>
             QScatterSeries::QScatterSeries(QGraphicsItem *parent) :
                 QGraphicsItem(parent)
             {
             }
             QRectF QScatterSeries::boundingRect() const
             {
-            //    qreal penWidth = 1;
+                return QRectF(0, 50, 100, 100);
-            //    return QRectF(-10 - penWidth / 2, -10 - penWidth / 2,
-            //                  20 + penWidth, 20 + penWidth);
-                return QRectF(0, 0, 100, 100);
             }
             void QScatterSeries::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                QPen pen = painter->pen();
+            //    painter->drawRect(boundingRect());
-                QBrush brush = pen.brush();
-                brush.setColor(Qt::darkRed);
-                pen.setBrush(brush);
+            void QScatterSeries::setData(QList<QChartDataPoint> data)
-                painter->setPen(pen);
+            //void QScatterSeries::setData(QList<int> data)
-                painter->drawRoundedRect(0, 0, 10, 10, 5, 5);
-                painter->drawRoundedRect(5, 5, 10, 10, 5, 5);
+                foreach(QChartDataPoint point, data) {
-                painter->drawRoundedRect(54, 25, 10, 10, 5, 5);
+                    // TODO: ownership?
-                painter->drawRoundedRect(34, 35, 10, 10, 5, 5);
+                    // TODO: position
-                //painter->drawEllipse(QPoint(10, 10), 100, 100);
+                    QSeriesPointGraphicsItem *item = new QSeriesPointGraphicsItem(
+                                point[0].toReal(), 100-point[1].toReal(), this);
+                }
             }

test/chartwidgettest/qscatterseries.h +9 -2

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
             #include <QGraphicsItem>
+            // TODO:
+            #define QChartDataPoint QList<QVariant>
+            class QSeriesPointGraphicsItem;
             class QScatterSeries : public QGraphicsItem
             {
             public:
-                explicit QScatterSeries(QGraphicsItem *parent = 0);
+                QScatterSeries(QGraphicsItem *parent = 0);
+                void setData(QList<QChartDataPoint> data);
+            //    void setData(QList<int> data);
             signals:
             public slots:
-            private:
+            public:
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
             };
             #endif // QSCATTERSERIES_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