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

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

Integrated scatter series...
Tero Ahola -
r38:67e4c740a645
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,5
1 #include "qchartdata.h"
2
3 QChartData::QChartData()
4 {
5 }
Show file before | Show file after | Hide comments
@@ -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
Show file before | Show file after | Hide comments
@@ -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
Show file before | Show file after | Hide comments
@@ -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
Show file before | Show file after | Hide comments
@@ -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
Show file before | Show file after | Hide comments
@@ -1,9 +1,12
1 #include "qchart.h"
1 #include "qchart.h"
2 #include "qchartseries.h"
2 #include "qchartseries.h"
3 #include "qscatterseries.h"
4 #include "qscatterseries_p.h"
3 #include "xylinechartitem_p.h"
5 #include "xylinechartitem_p.h"
4 #include "xyplotdomain_p.h"
6 #include "xyplotdomain_p.h"
5 #include "axis_p.h"
7 #include "axis_p.h"
6 #include "xygrid_p.h"
8 #include "xygrid_p.h"
9 #include <QGraphicsScene>
7 #include <QDebug>
10 #include <QDebug>
8
11
9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
12 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -84,6 +87,30 void QChart::addSeries(QChartSeries* series)
84 }
87 }
85 }
88 }
86
89
90 QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
91 {
92 Q_D(QChart);
93
94 // TODO: support also other types
95 Q_ASSERT(type == QChartSeries::SeriesTypeScatter);
96 QChartSeries *series = 0;
97
98 switch (type) {
99 case QChartSeries::SeriesTypeScatter: {
100 QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
101 //scatterSeries->d->set
102 d->m_items.append(scatterSeries->d);
103 scene()->addItem(scatterSeries->d);
104 //series = qobject_cast<QChartSeries *>(scatterSeries);
105 break;
106 }
107 default:
108 break;
109 }
110
111 return series;
112 }
113
87 void QChart::setSize(const QSizeF& size)
114 void QChart::setSize(const QSizeF& size)
88 {
115 {
89 Q_D(QChart);
116 Q_D(QChart);
@@ -93,10 +120,11 void QChart::setSize(const QSizeF& size)
93 d->m_grid->setPos(d->m_rect.topLeft());
120 d->m_grid->setPos(d->m_rect.topLeft());
94 d->m_grid->setSize(d->m_rect.size());
121 d->m_grid->setSize(d->m_rect.size());
95 d->m_plotDataList[0].m_viewportRect = d->m_rect;
122 d->m_plotDataList[0].m_viewportRect = d->m_rect;
96 foreach(QGraphicsItem* item , d->m_items)
123 // TODO: line chart items would need to be updated separately as they don't support update
97 reinterpret_cast<XYLineChartItem*>(item)->updateXYPlotData(d->m_plotDataList.at(0));
124 // via paint method
125 // foreach(QGraphicsItem* item , d->m_items) {
126 // reinterpret_cast<XYLineChartItem*>(item);//->updateXYPlotData(d->m_plotDataList.at(0));
98 update();
127 update();
99
100 }
128 }
101
129
102 int QChart::margin() const
130 int QChart::margin() const
Show file before | Show file after | Hide comments
@@ -2,6 +2,7
2 #define CHART_H
2 #define CHART_H
3
3
4 #include <qchartglobal.h>
4 #include <qchartglobal.h>
5 #include <qchartseries.h>
5 #include <QGraphicsItem>
6 #include <QGraphicsItem>
6
7
7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -12,9 +13,16 class QChartSeries;
12 class XYPlotDomain;
13 class XYPlotDomain;
13 class QChartPrivate;
14 class QChartPrivate;
14
15
15 class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem
16 // TODO: We don't need to have QChart tied to QGraphicsItem:
16 {
17 //class QTCOMMERCIALCHART_EXPORT QChart
18 //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
19 // public: QChartGraphicsItem(QChart &chart);
17
20
21 /*!
22 * TODO: define the responsibilities
23 */
24 class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem, public QObject
25 {
18 public:
26 public:
19 QChart(QGraphicsItem* parent = 0);
27 QChart(QGraphicsItem* parent = 0);
20 virtual ~QChart();
28 virtual ~QChart();
@@ -24,6 +32,9 public:
24 virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
32 virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
25
33
26 void addSeries(QChartSeries* series);
34 void addSeries(QChartSeries* series);
35 //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
36 // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
37 QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
27
38
28 virtual void setSize(const QSizeF& rect);
39 virtual void setSize(const QSizeF& rect);
29 void setMargin(int margin);
40 void setMargin(int margin);
Show file before | Show file after | Hide comments
@@ -20,16 +20,15 public:
20 };
20 };
21
21
22 protected:
22 protected:
23 QChartSeries(QObject *parent = 0):QObject(parent){};
23 QChartSeries(QObject *parent = 0) : QObject(parent) {};
24
24
25 public:
25 public:
26 virtual ~QChartSeries(){};
26 virtual ~QChartSeries() {};
27
27
28 //factory method
28 //factory method
29 static QChartSeries* create(QObject* parent = 0 ){ return 0;}
29 static QChartSeries* create(QObject* parent = 0) { return 0;}
30 //pure virtual
30 //pure virtual
31 virtual QChartSeriesType type() const = 0;
31 virtual QChartSeriesType type() const = 0;
32
33 };
32 };
34
33
35 QTCOMMERCIALCHART_END_NAMESPACE
34 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -19,6 +19,7 public:
19 m_view->setScene(m_scene);
19 m_view->setScene(m_scene);
20 m_chart = new QChart();
20 m_chart = new QChart();
21 m_scene->addItem(m_chart);
21 m_scene->addItem(m_chart);
22 m_view->show();
22 }
23 }
23
24
24 ~QChartWidgetPrivate() {
25 ~QChartWidgetPrivate() {
@@ -64,6 +65,12 void QChartWidget::addSeries(QChartSeries* series)
64 d->m_chart->addSeries(series);
65 d->m_chart->addSeries(series);
65 }
66 }
66
67
68 QChartSeries* QChartWidget::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
69 {
70 Q_D(QChartWidget);
71 return d->m_chart->createSeries(x, y, type);
72 }
73
67 #include "moc_qchartwidget.cpp"
74 #include "moc_qchartwidget.cpp"
68
75
69 QTCOMMERCIALCHART_END_NAMESPACE
76 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -21,7 +21,10 public:
21 void resizeEvent(QResizeEvent *event);
21 void resizeEvent(QResizeEvent *event);
22 QSize sizeHint() const;
22 QSize sizeHint() const;
23
23
24 // TODO: addSeries and createSeries are optional solutions
24 void addSeries(QChartSeries* series);
25 void addSeries(QChartSeries* series);
26 QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
27
25 protected:
28 protected:
26 QChartWidgetPrivate * const d_ptr;
29 QChartWidgetPrivate * const d_ptr;
27
30
Show file before | Show file after | Hide comments
@@ -1,14 +1,7
1 !include( ../common.pri ) {
2 error( Couldn't find the common.pri file! )
3 }
4
5
6 TARGET = QtCommercialChart
1 TARGET = QtCommercialChart
7 DESTDIR = $$CHART_BUILD_LIB_DIR
8 TEMPLATE = lib
2 TEMPLATE = lib
9 QT += core \
3 QT += core \
10 gui
4 gui
11
12 CONFIG += debug_and_release
5 CONFIG += debug_and_release
13 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
6 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
14
7
@@ -17,35 +10,38 SOURCES += \
17 xylinechart/xylinechartitem.cpp \
10 xylinechart/xylinechartitem.cpp \
18 xylinechart/xygrid.cpp \
11 xylinechart/xygrid.cpp \
19 xylinechart/xyplotdomain.cpp \
12 xylinechart/xyplotdomain.cpp \
13 qscatterseries.cpp \
20 qchart.cpp \
14 qchart.cpp \
21 axis.cpp \
15 axis.cpp \
22 qchartwidget.cpp
16 qchartwidget.cpp \
17 qchartdata.cpp
23
18
24 PRIVATE_HEADERS += \
19 PRIVATE_HEADERS += \
25 xylinechart/xylinechartitem_p.h \
20 xylinechart/xylinechartitem_p.h \
26 xylinechart/xyplotdomain_p.h \
21 xylinechart/xyplotdomain_p.h \
27 xylinechart/xygrid_p.h \
22 xylinechart/xygrid_p.h \
23 qscatterseries_p.h \
28 axis_p.h
24 axis_p.h
29
25
30 PUBLIC_HEADERS += \
26 PUBLIC_HEADERS += \
31 qchartseries.h \
27 qchartseries.h \
28 qscatterseries.h \
32 qchart.h \
29 qchart.h \
30 qchartdata.h \
33 qchartwidget.h \
31 qchartwidget.h \
34 qchartglobal.h \
32 qchartglobal.h \
35 xylinechart/qxychartseries.h
33 xylinechart/qxychartseries.h
36
34
37 HEADERS += $$PUBLIC_HEADERS
35 HEADERS += $$PUBLIC_HEADERS
38 HEADERS += $$PRIVATE_HEADERS
36 HEADERS += $$PRIVATE_HEADERS
39
37
40 INCLUDEPATH += xylinechart \
38 INCLUDEPATH += xylinechart \
41 .
39 .
42
40
43 OBJECTS_DIR = $$CHART_BUILD_DIR/lib
41 OBJECTS_DIR = ../build/lib
44 MOC_DIR = $$CHART_BUILD_DIR/lib
42 MOC_DIR = ../build/lib
45 UI_DIR = $$CHART_BUILD_DIR/lib
43 UI_DIR = ../build/lib
46 RCC_DIR = $$CHART_BUILD_DIR/lib
44 RCC_DIR = ../build/lib
47
48
49 DEFINES += QTCOMMERCIALCHART_LIBRARY
45 DEFINES += QTCOMMERCIALCHART_LIBRARY
50
46
51 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
47 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
@@ -53,21 +49,3 public_headers.files = $$PUBLIC_HEADERS
53 target.path = $$[QT_INSTALL_LIBS]
49 target.path = $$[QT_INSTALL_LIBS]
54 INSTALLS += target \
50 INSTALLS += target \
55 public_headers
51 public_headers
56
57
58 install_build_headers.name = bild_headers
59 install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
60 install_build_headers.input = PUBLIC_HEADERS
61 install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
62 install_build_headers.CONFIG += target_predeps no_link
63 QMAKE_EXTRA_COMPILERS += install_build_headers
64
65 chartversion.target = qchartversion_p.h
66 chartversion.commands = @echo "build_time" > $$chartversion.target;
67 chartversion.depends = $$HEADERS $$SOURCES
68 PRE_TARGETDEPS += qchartversion_p.h
69 QMAKE_CLEAN+= qchartversion_p.h
70 QMAKE_EXTRA_TARGETS += chartversion
71
72 unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
73 win32:QMAKE_DISTCLEAN += $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR No newline at end of file
Show file before | Show file after | Hide comments
@@ -101,38 +101,46 void MainWidget::addSeries(QString series, QString data)
101 m_defaultSeries = series;
101 m_defaultSeries = series;
102
102
103 QXYChartSeries* series0 = 0;
103 QXYChartSeries* series0 = 0;
104
104 QChartSeries* scatterSeries = 0;
105 // TODO: color of the series
105 // TODO: a dedicated data class for storing x and y values
106 if (series == "Scatter") {
106 QList<qreal> x;
107 series0 = QXYChartSeries::create();
107 QList<qreal> y;
108 } else if (series == "Line") {
109 series0 = QXYChartSeries::create();
110 } else {
111 // TODO
112 series0 = QXYChartSeries::create();
113 }
114
108
115 if (data == "linear") {
109 if (data == "linear") {
116 for (int i = 0; i < 10; i++)
110 for (int i = 0; i < 10; i++) {
117 series0->add(i, 10);
111 x.append(i);
112 y.append(10);
113 }
118 } else if (data == "linear, 1M") {
114 } else if (data == "linear, 1M") {
119 for (int i = 0; i < 1000000; i++)
115 for (int i = 0; i < 10000; i++) {
120 series0->add(i, 20);
116 x.append(i);
117 y.append(20);
118 }
121 } else if (data == "SIN") {
119 } else if (data == "SIN") {
122 for (int x = 0; x < 100; x++)
120 for (int i = 0; i < 100; i++) {
123 series0->add(x, abs(sin(3.14159265358979 / 50 * x) * 100));
121 x.append(i);
124 QList<QXYChartSeries*> dataset;
122 y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
125 dataset << series0;
123 }
126 } else if (data == "SIN + random") {
124 } else if (data == "SIN + random") {
127 for (qreal x = 0; x < 100; x += 0.1) {
125 for (qreal i = 0; i < 100; i += 0.1) {
128 series0->add(x + (rand() % 5),
126 x.append(i + (rand() % 5));
129 abs(sin(3.14159265358979 / 50 * x) * 100) + (rand() % 5));
127 y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
130 }
128 }
131 } else {
129 } else {
132 // TODO: check if data has a valid file name
130 // TODO: check if data has a valid file name
133 }
131 }
134
132
135 m_chartWidget->addSeries(series0);
133 // TODO: color of the series
134 if (series == "Scatter") {
135 scatterSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
136 } else if (series == "Line") {
137 series0 = QXYChartSeries::create();
138 for (int i = 0; i < 1000000; i++)
139 series0->add(i, 20);
140 m_chartWidget->addSeries(series0);
141 } else {
142 // TODO
143 }
136 }
144 }
137
145
138 void MainWidget::chartTypeChanged(int itemIndex)
146 void MainWidget::chartTypeChanged(int itemIndex)
General Comments 0
You need to be logged in to leave comments. Login now