HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r61:45d3de5e814a

Refactored series creation with QChart

Tero Ahola -

r61:45d3de5e814a

parent child

Context file:

r61:45d3de5e814a

Collapse all files

src/qchart.cpp +4 -5

                 }
             }
-            QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
             {
                 // TODO: support also other types; not only scatter and pie
-                Q_ASSERT(type == QChartSeries::SeriesTypeScatter
-                         || type == QChartSeries::SeriesTypePie);
                 switch (type) {
                 case QChartSeries::SeriesTypeScatter: {
-                    QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
+                    QScatterSeries *scatterSeries = new QScatterSeries(this);
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             scatterSeries, SLOT(chartSizeChanged(QRectF)));
                     scatterSeries->d->setParentItem(this);
                 case QChartSeries::SeriesTypePie: {
                     // TODO: we now have also a list of y values as a parameter, it is ignored
                     // we should use a generic data class instead of list of x and y values
-                    QPieSeries *pieSeries = new QPieSeries(x, this);
+                    QPieSeries *pieSeries = new QPieSeries(this);
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             pieSeries, SLOT(chartSizeChanged(QRectF)));
                     return pieSeries;
                 }
                 default:
+                    Q_ASSERT(false);
                     break;
                 }

src/qchart.h +1 -1

                 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);
+                QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 virtual void setSize(const QSizeF& rect);
                 void setMargin(int margin);

src/qchartseries.h +5 -2

             public:
                 virtual ~QChartSeries(){};
-                //factory method
+                // Factory method
                 static QChartSeries* create(QObject* parent = 0 ){ return 0;}
-                //pure virtual
+                // Pure virtual
                 virtual QChartSeriesType type() const = 0;
+                virtual bool setData(QList<int> data) { return false; }
+                virtual bool setData(QList<qreal> data) { return false; }
+                virtual bool setData(QList<qreal> x, QList<qreal> y){ return false; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.cpp +2 -2

                 m_chart->addSeries(series);
             }
-            QChartSeries* QChartView::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            QChartSeries* QChartView::createSeries(QChartSeries::QChartSeriesType type)
             {
-                return m_chart->createSeries(x, y, type);
+                return m_chart->createSeries(type);
             }
             void QChartView::mousePressEvent(QMouseEvent *event)

src/qchartview.h +2 -2

                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
-                // TODO: addSeries and createSeries are optional solutions
                 void addSeries(QChartSeries* series);
-                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
+                // Convenience function
+                QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
             protected:
                 void mouseMoveEvent (QMouseEvent *event);

src/qchartwidget.cpp +2 -2

                 m_chart->addSeries(series);
             }
-            QChartSeries* QChartWidget::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            QChartSeries* QChartWidget::createSeries(QChartSeries::QChartSeriesType type)
             {
-                return m_chart->createSeries(x, y, type);
+                return m_chart->createSeries(type);
             }
             #include "moc_qchartwidget.cpp"

src/qchartwidget.h +1 -1

                 // TODO: addSeries and createSeries are optional solutions
                 // TODO: currently createSeries assumes x, y value pairs. This isn't case with all charts. So is there another createSeries for other types (for example one list of ints)?
                 void addSeries(QChartSeries* series);
-                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
+                QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
             private:
                 Q_DISABLE_COPY(QChartWidget)

src/qpieseries.cpp +17 -11

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QPieSeries::QPieSeries(QList<qreal> x, QGraphicsObject *parent) :
+            QPieSeries::QPieSeries(QGraphicsObject *parent) :
                 QChartSeries(parent),
-                m_x(x),
                 m_sizeFactor(1.0)
             {
+            }
+            QPieSeries::~QPieSeries()
+            {
+                while (m_slices.count())
+                    delete m_slices.takeLast();
+            }
+            bool QPieSeries::setData(QList<qreal> data)
+            {
+                m_data = data;
                 // Create slices
                 qreal fullPie = 360;
                 qreal total = 0;
-                foreach (qreal value, m_x)
+                foreach (qreal value, m_data)
                     total += value;
-                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent);
+                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent());
                 Q_ASSERT(parentItem);
                 m_chartSize = parentItem->boundingRect();
                 qreal angle = 0;
                 // TODO: no need to create new slices in case size changed; we should re-use the existing ones
-                foreach (qreal value, m_x) {
+                foreach (qreal value, m_data) {
                     qreal span = value / total * fullPie;
                     PieSlice *slice = new PieSlice(randomColor(), angle, span, parentItem->boundingRect());
                     slice->setParentItem(parentItem);
                 }
                 resizeSlices(m_chartSize);
+                return true;
-            QPieSeries::~QPieSeries()
-                while (m_slices.count())
-                    delete m_slices.takeLast();
             }
             void QPieSeries::chartSizeChanged(QRectF chartRect)

src/qpieseries.h +3 -2

             public:
                 // TODO: use a generic data class instead of x and y
-                QPieSeries(QList<qreal> x, QGraphicsObject *parent = 0);
+                QPieSeries(QGraphicsObject *parent = 0);
                 ~QPieSeries();
                 QColor randomColor();
                 void setSizeFactor(qreal sizeFactor);
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypePie; }
+                bool setData(QList<qreal> data);
             public Q_SLOTS:
                 void chartSizeChanged(QRectF rect);
                 //Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
                 // TODO: move the followin to internal impl
-                QList<qreal> m_x;
+                QList<qreal> m_data;
                 QList<PieSlice*> m_slices;
                 QRectF m_chartSize;
                 qreal m_sizeFactor;

src/qscatterseries.cpp +14 -6

             //#define QSeriesData QList<qreal>
-            QScatterSeriesPrivate::QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent) :
+            QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
                 QGraphicsItem(parent),
-                m_x(x),
-                m_y(y),
                 m_scalex(100), // TODO: let the use define the scale (or autoscaled)
                 m_scaley(100)
             {
-                resize(parent->boundingRect());
             }
             void QScatterSeriesPrivate::resize(QRectF rect)
                 }
             }
-            QScatterSeries::QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent) :
+            QScatterSeries::QScatterSeries(QObject *parent) :
                 QChartSeries(parent),
-                d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
+                d(new QScatterSeriesPrivate(qobject_cast<QGraphicsItem *> (parent)))
             {
             }
+            bool QScatterSeries::setData(QList<qreal> x, QList<qreal> y)
+            {
+                // TODO: validate data
+                d->m_x = x;
+                d->m_y = y;
+                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent());
+                Q_ASSERT(parentItem);
+                d->resize(parentItem->boundingRect());
+                return true;
+            }
             void QScatterSeries::chartSizeChanged(QRectF rect)
             {
                 // Recalculate scatter data point locations on the scene

src/qscatterseries.h +2 -1

                 Q_OBJECT
             public:
                 //QScatterSeries(QSeriesData *data, QObject *chart);
-                QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent = 0);
+                QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
+                bool setData(QList<qreal> x, QList<qreal> y);
             public Q_SLOTS:
                 void chartSizeChanged(QRectF rect);

src/qscatterseries_p.h +1 -1

             class QScatterSeriesPrivate : public QGraphicsItem
             {
             public:
-                QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent);
+                QScatterSeriesPrivate(QGraphicsItem *parent);
             public: // from QGraphicsItem
                 void resize(QRectF rect);

test/chartwidgettest/mainwidget.cpp +8 -12

             {
                 qDebug() << "addSeries: " << series << " data: " << data;
                 m_defaultSeriesName = series;
-                QChartSeries *newSeries = QXYChartSeries::create();
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                         x.append(i);
                         y.append(i);
                     }
-                    for (int i = 0; i < 20; i++)
-                        ((QXYChartSeries *)newSeries)->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++)
-                        ((QXYChartSeries *)newSeries)->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++)
-                        ((QXYChartSeries *)newSeries)->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)
-                        ((QXYChartSeries *)newSeries)->add(i + (rand() % 5), abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                 } else {
                     // TODO: check if data has a valid file name
+                    Q_ASSERT(false);
                 }
                 // TODO: color of the series
+                QChartSeries *newSeries = 0;
                 if (series == "Scatter") {
-                    newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
+                    newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypeScatter);
+                    Q_ASSERT(newSeries->setData(x, y));
                 } else if (series == "Pie") {
-                    newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypePie);
+                    newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypePie);
+                    Q_ASSERT(newSeries->setData(y));
                 } else if (series == "Line") {
-                    m_chartWidget->addSeries(newSeries);
+                    newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypePie);
+                    Q_ASSERT(newSeries->setData(x, y));
                 } 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