HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r48:3cbbcb012d8d

Resizing of QGraphicItems now possible by resize signal from QChart

Tero Ahola -

r48:3cbbcb012d8d

parent child

Context file:

r48:3cbbcb012d8d

Collapse all files

src/qchart.cpp +26 -21

             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QChart::QChart(QGraphicsItem* parent):QGraphicsItem(parent),
+            QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
-            d_ptr(new QChartPrivate(this))
+            d(new QChartPrivate(this))
             {
                 //  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 // set axis
-                Q_D(QChart);
                 d->m_axisY->rotate(90);
             }
             QRectF QChart::boundingRect() const
             {
-                Q_D(const QChart);
                 return d->m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
-                Q_D(QChart);
+                // TODO: we should check the series not already added
                 d->m_series<<series;
                     break;
                 }
                 case QChartSeries::SeriesTypeScatter: {
+                    QScatterSeries *scatter = qobject_cast<QScatterSeries *>(series);
+                    if (scatter) {
+                        scatter->d->setParentItem(this);
+                        scene()->addItem(scatter->d);
+                    }
                     break;
                 }
                 }
             QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
             {
-                Q_D(QChart);
+                // TODO: support also other types in addition to scatter
-                // 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);
-                    d->m_items.append(scatterSeries->d);
+                    scatterSeries->d->setParentItem(this);
-                    scene()->addItem(scatterSeries->d);
-                    //series = qobject_cast<QChartSeries *>(scatterSeries);
                     break;
                 }
                 default:
                 return series;
             }
             void QChart::setSize(const QSizeF& size)
             {
-                Q_D(QChart);
                 d->m_rect = QRect(QPoint(0,0),size.toSize());
-                d->m_rect.adjust(margin(),margin(),-margin(),-margin());
+                d->m_rect.adjust(margin(),margin(), -margin(), -margin());
                 d->m_grid->setPos(d->m_rect.topLeft());
                 d->m_grid->setSize(d->m_rect.size());
-                // TODO: line chart items would need to be updated separately as they don't support update
-                // via paint method
-                for (int i =0; i< d->m_plotDomainList.size();i++)
-                    d->m_plotDomainList[i].m_viewportRect = d->m_rect;
+                // TODO: calculate the scale
+                // TODO: calculate the origo
+                // TODO: not sure if emitting a signal here is the best from performance point of view
+                const qreal xscale = size.width() / 100;
+                const qreal yscale = size.height() / 100;
+                emit sizeChanged(QRectF(0, 0, size.width(), size.height()), xscale, yscale);
+                for (int i(0); i < d->m_plotDomainList.size(); i++)
+                    d->m_plotDomainList[i].m_viewportRect = d->m_rect;
+                // TODO: line chart items are updated separately as they don't support update
+                // via sizeChanged signal
                 foreach(XYLineChartItem* item , d->m_xyLineChartItems)
                     item->updateXYPlotDomain(d->m_plotDomainList.at(d->m_plotDataIndex));
             int QChart::margin() const
             {
-                Q_D(const QChart);
                 return d->m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
-                Q_D(QChart);
                 d->m_marginSize = margin;
             }
+            #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +11 -11

             #include <qchartglobal.h>
             #include <qchartseries.h>
-            #include <QGraphicsItem>
+            #include <QGraphicsObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * TODO: define the responsibilities
              */
-            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem, public QObject
+            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsObject
             {
+                Q_OBJECT
             public:
-                QChart(QGraphicsItem* parent = 0);
+                QChart(QGraphicsObject* parent = 0);
-                virtual ~QChart();
+                ~QChart();
                 //from QGraphicsItem
-                virtual QRectF boundingRect() const;
+                QRectF boundingRect() const;
-                virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
+                void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                 void addSeries(QChartSeries* series);
                 //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
                 void setMargin(int margin);
                 int margin() const;
-            protected:
+            signals:
-                QChartPrivate * const d_ptr;
+                void sizeChanged(QRectF rect, qreal xscale, qreal yscale);
             private:
+            //    Q_DECLARE_PRIVATE(QChart)
                 Q_DISABLE_COPY(QChart)
-                Q_DECLARE_PRIVATE(QChart)
+                QChartPrivate *d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries.cpp +26 -16

             #include "qchart.h"
             #include <QPainter>
             #include <QGraphicsScene>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
             }
-            void QScatterSeriesPrivate::setSize()
+            void QScatterSeriesPrivate::resize(QRectF rect, qreal xscale, qreal yscale)
             {
+                m_scenex.clear();
+                m_sceney.clear();
+                foreach(qreal x, m_x)
+                    m_scenex.append(rect.left() + x * xscale);
+                foreach(qreal y, m_y)
+                    m_sceney.append(rect.bottom() - y * yscale);
             }
             QRectF QScatterSeriesPrivate::boundingRect() const
             {
-                return QRectF(0, 0, 100, 100);
+                return QRectF(0, 0, 55, 100);
             }
             void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                 pen.setBrush(brush);
                 pen.setWidth(4);
                 painter->setPen(pen);
-                QTransform transform = painter->transform();
-                // TODO: get min and max values of the axes from the QChart (or some dedicated class)
-                const qreal xmin = 0.0;
-                const qreal xmax = 100.0;
-                const qreal xscale = scene()->width() / (xmax - xmin);
-                const qreal ymin = 0.0;
-                const qreal ymax = 100.0;
-                const qreal yscale = scene()->height() / (ymax - ymin);
-                for (int i(0); i < m_x.count() && i < m_y.count(); i++) {
+                // TODO: m_scenex and m_sceny are left empty during construction -> we would need a resize
-                    transform.reset();
+                // event right after construction or maybe given a size during initialization
-                    transform.translate(m_x.at(i) * xscale, m_y.at(i) * yscale);
+                for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
-                    painter->setTransform(transform);
+                    if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
-                    painter->drawArc(0, 0, 4, 4, 0, 5760);
+                        //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);
+                        painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
                 }
             }
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
             {
+                connect(parent, SIGNAL(sizeChanged(QRectF, qreal, qreal)), this, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
+            }
+            void QScatterSeries::chartSizeChanged(QRectF rect, qreal xscale, qreal yscale)
+            {
+                // Recalculate scatter data point locations on the scene
+            //    d->transform().reset();
+            //    d->transform().translate();
+                d->resize(rect, xscale, yscale);
             }
             QScatterSeries::~QScatterSeries()

src/qscatterseries.h +4 0

             #define QSCATTERSERIES_H
             #include "qchartseries.h"
+            #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
             public: // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
+            public Q_SLOTS:
+                void chartSizeChanged(QRectF rect, qreal xscale, qreal yscale);
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)

src/qscatterseries_p.h +3 -1

                 QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent);
             public: // from QGraphicsItem
-                void setSize();
+                void resize(QRectF rect, qreal xscale, qreal yscale);
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 // TODO: use the chart data class instead of list of x and y values?
                 QList<qreal> m_x;
                 QList<qreal> m_y;
+                QList<qreal> m_scenex;
+                QList<qreal> m_sceney;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro 0 -1

             error( Couldn't find the common.pri file! )
             }
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib

src/xylinechart/xylinechartitem_p.h +1 -1

             #define XYLINECHARTITEM_H
             #include "qchartglobal.h"
-            #include "qchart.h"
+            #include <QGraphicsItem>
             #include "xyplotdomain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

test/chartwidgettest/chartwidgettest.pro +23 -23

@@ -7,27 +7,27 error( Couldn't find the integrated.pri file! )
7	}	7	}
8		8
9		9
10	TARGET = chartwidgettest	10	TARGET = chartwidgettest
11	TEMPLATE = app	11	TEMPLATE = app
12		12
13	QT += core gui	13	QT += core gui
14	contains(QT_MAJOR_VERSION, 5) {	14	contains(QT_MAJOR_VERSION, 5) {
15	QT += widgets	15	QT += widgets
16	}	16	}
17		17
18		18
19	OBJECTS_DIR = tmp	19	OBJECTS_DIR = tmp
20	MOC_DIR = tmp	20	MOC_DIR = tmp
21		21
22	SOURCES += main.cpp \	22	SOURCES += main.cpp \
23	mainwidget.cpp \	23	mainwidget.cpp \
24	# qscatterseries.cpp \	24	# qscatterseries.cpp \
25	# qseriespointgraphicsitem.cpp \	25	# qseriespointgraphicsitem.cpp \
26	dataseriedialog.cpp	26	dataseriedialog.cpp
27		27
28	HEADERS += \	28	HEADERS += \
29	mainwidget.h \	29	mainwidget.h \
30	# qscatterseries.h \	30	# qscatterseries.h \
31	# qseriespointgraphicsitem.h \	31	# qseriespointgraphicsitem.h \
32	dataseriedialog.h	32	dataseriedialog.h
33		33

test/chartwidgettest/mainwidget.cpp +14 -6

                 qDebug() << "addSeries: " << series << " data: " << data;
                 m_defaultSeries = series;
+                QXYChartSeries* series0 = QXYChartSeries::create();
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                 QList<qreal> y;
                 if (data == "linear") {
-                    for (int i = 0; i < 10; i++) {
+                    for (int i = 0; i < 20; i++) {
                         x.append(i);
-                        y.append(10);
+                        y.append(i);
                     }
+                    for (int i = 0; i < 20; i++)
+                        series0->add(i, i);
                 } else if (data == "linear, 1M") {
                     for (int i = 0; i < 10000; i++) {
                         x.append(i);
                         y.append(20);
                     }
+                    for (int i = 0; i < 1000000; i++)
+                        series0->add(i, 10);
                 } else if (data == "SIN") {
                     for (int i = 0; i < 100; i++) {
                         x.append(i);
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
                     }
+                    for (int i = 0; i < 100; i++)
+                        series0->add(i, abs(sin(3.14159265358979 / 50 * i) * 100));
                 } else if (data == "SIN + random") {
                     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));
                     }
+                    for (qreal i = 0; i < 100; i += 0.1)
+                        series0->add(i + (rand() % 5), 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") {
-                    /*QChartSeries* scatterSeries = */m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
+                    /*QChartSeries* scatterSeries = */
+                    m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
                 } else if (series == "Line") {
-                    QXYChartSeries* series0 = QXYChartSeries::create();
-                    for (int i = 0; i < 1000000; i++)
-                        series0->add(i, 20);
                     m_chartWidget->addSeries(series0);
                 } else {
                     // TODO

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