HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r846:accf902f8269

Refactoring QML impl for series

Tero Ahola -

r846:accf902f8269

parent child

Context file:

r846:accf902f8269

Collapse all files

qmlplugin/declarativechart.cpp +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativechart.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
             {
+                m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             QChart::ChartTheme DeclarativeChart::theme()
             {
                 return m_chart->theme();
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
                 Q_UNUSED(oldGeometry)
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
             }
             void DeclarativeChart::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 // TODO: optimized?
                 painter->setRenderHint(QPainter::Antialiasing, true);
             }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativelineseries.cpp +2 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativelineseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qlineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :
                 QLineSeries(parent)
             {
             }
-            void DeclarativeLineSeries::componentComplete()
+            QSeries *DeclarativeLineSeries::series()
             {
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
+                return this;
-                if (declarativeChart) {
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-                    chart->addSeries(this);
             }
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeLineSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativelineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativelineseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVELINESERIES_H
             #define DECLARATIVELINESERIES_H
             #include "qchartglobal.h"
             #include "qlineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeLineSeries(QObject *parent = 0);
             public:
-                void componentComplete();
+                QSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVELINESERIES_H

qmlplugin/declarativescatterseries.cpp +2 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativescatterseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qscatterseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
                 QScatterSeries(parent)
             {
             }
-            void DeclarativeScatterSeries::componentComplete()
+            QSeries *DeclarativeScatterSeries::series()
             {
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
+                return this;
-                if (declarativeChart) {
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-                    qDebug() << "chart:" << chart;
-                    chart->addSeries(this);
             }
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeScatterSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativescatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativescatterseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESCATTERSERIES_H
             #define DECLARATIVESCATTERSERIES_H
             #include "qchartglobal.h"
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
             public:
-                void componentComplete();
+                QSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESCATTERSERIES_H

qmlplugin/declarativesplineseries.cpp +2 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativesplineseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :
                 QSplineSeries(parent)
             {
             }
-            void DeclarativeSplineSeries::componentComplete()
+            QSeries *DeclarativeSplineSeries::series()
             {
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
+                return this;
-                if (declarativeChart) {
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-                    chart->addSeries(this);
             }
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeSplineSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativesplineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativesplineseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESPLINESERIES_H
             #define DECLARATIVESPLINESERIES_H
             #include "qchartglobal.h"
             #include "qsplineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
             public:
-                virtual void componentComplete();
+                QSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESPLINESERIES_H

qmlplugin/declarativexyseries.cpp +17 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //#include "DeclarativeXySeries.h"
             #include "declarativexyseries.h"
             #include "qxyseries.h"
+            #include "declarativechart.h"
+            #include <QObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeXySeries::DeclarativeXySeries()
             {
             }
             DeclarativeXySeries::~DeclarativeXySeries()
             {
             }
             void DeclarativeXySeries::classBegin()
             {
             }
+            void DeclarativeXySeries::componentComplete()
+            {
+                QSeries *thisObj = reinterpret_cast<QSeries *>(series());
+            //    QSeries *thisObj = qobject_cast<QSeries *>(this);
+            //    Q_ASSERT(thisObj);
+                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(thisObj->parent());
+                if (declarativeChart) {
+                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
+                    Q_ASSERT(chart);
+                    chart->addSeries(thisObj);
+                }
+            }
             void DeclarativeXySeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                                       DeclarativeXyPoint *element)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(list->object);
                 if (series)
-                    series->append(QPointF(element->x(), element->y()));
+                    series->append(element->x(), element->y());
             }
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativexyseries.h +3 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVE_XY_SERIES_H
             #define DECLARATIVE_XY_SERIES_H
             #include "qchartglobal.h"
             #include "declarativexypoint.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
+            class QSeries;
             class DeclarativeXySeries : public QDeclarativeParserStatus
             {
                 Q_INTERFACES(QDeclarativeParserStatus)
             public:
                 explicit DeclarativeXySeries();
                 ~DeclarativeXySeries();
             public: // from QDeclarativeParserStatus
                 virtual void classBegin();
-                virtual void componentComplete() = 0;
+                virtual void componentComplete();
             public:
+                virtual QSeries *series() = 0;
                 virtual QDeclarativeListProperty<DeclarativeXyPoint> points() = 0;
             public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVE_XY_SERIES_H

src/linechart/linechartitem.cpp +2 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "linechartitem_p.h"
             #include "qlineseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
             LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):XYChartItem(series,presenter),
             m_series(series),
             m_pointsVisible(false)
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
                 handleUpdated();
             }
             QRectF LineChartItem::boundingRect() const
             {
             	return m_rect;
             }
             QPainterPath LineChartItem::shape() const
             {
                 return m_path;
             }
             void LineChartItem::setLayout(QVector<QPointF>& points)
             {
+            //    qDebug() << "line: " << points.count();
                 if(points.size()==0)
                 {
                     XYChartItem::setLayout(points);
                     return;
                 }
                 QList<QGraphicsItem*> items = m_items.childItems();
                 QPainterPath linePath(points.at(0));
                 for(int i=1; i< points.size();i++) {
                     linePath.lineTo(points.at(i));
                 }
                 prepareGeometryChange();
                 m_path = linePath;
                 m_rect = linePath.boundingRect();
                 XYChartItem::setLayout(points);
             }
             void LineChartItem::handleUpdated()
             {
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
                 m_pointPen = m_series->pen();
                 m_pointPen.setWidthF(2*m_pointPen.width());
                 update();
             }
             //painter
             void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
                 painter->save();
                 painter->setPen(m_linePen);
                 painter->setClipRect(clipRect());
                 painter->drawPath(m_path);
                 if(m_pointsVisible){
                 	painter->setPen(m_pointPen);
                 	painter->drawPoints(points());
                 }
                 painter->restore();
             }
             #include "moc_linechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterchartitem.cpp +4 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "scatterchartitem_p.h"
             #include "qscatterseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QGraphicsScene>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ScatterChartItem::ScatterChartItem(QScatterSeries *series, ChartPresenter *presenter) :
                 XYChartItem(series,presenter),
                 m_series(series),
                 m_items(this),
                 m_shape(QScatterSeries::MarkerShapeRectangle),
                 m_size(15)
             {
                 QObject::connect(m_series,SIGNAL(updated()), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemHasNoContents);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 handleUpdated();
                 m_items.setHandlesChildEvents(false);
                 // TODO: how to draw a drop shadow?
             //    QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect();
             //    dropShadow->setOffset(2.0);
             //    dropShadow->setBlurRadius(2.0);
             //    setGraphicsEffect(dropShadow);
             }
             QRectF ScatterChartItem::boundingRect() const
             {
                 return m_rect;
             }
             void ScatterChartItem::createPoints(int count)
             {
                 for (int i = 0; i < count; ++i) {
                     QGraphicsItem *item = 0;
                     switch (m_shape) {
                                case QScatterSeries::MarkerShapeCircle:{
                                    QGraphicsEllipseItem* i = new QGraphicsEllipseItem(0,0,m_size,m_size);
                                    const QRectF& rect = i->boundingRect();
                                    i->setPos(-rect.width()/2,-rect.height()/2);
                                    item = new Marker(i,this);
                                    break;
                                }
                                case QScatterSeries::MarkerShapeRectangle:{
                                    QGraphicsRectItem* i = new QGraphicsRectItem(0,0,m_size,m_size);
                                    i->setPos(-m_size/2,-m_size/2);
                                    item = new Marker(i,this);
                                    break;
                                }
                                default:
                                    qWarning()<<"Unsupported marker type";
                                    break;
                     }
                     m_items.addToGroup(item);
                 }
             }
             void ScatterChartItem::deletePoints(int count)
             {
                 QList<QGraphicsItem *> items = m_items.childItems();
                 for (int i = 0; i < count; ++i) {
                     delete(items.takeLast());
                 }
             }
             void ScatterChartItem::markerSelected(Marker *marker)
             {
                 emit XYChartItem::clicked(QPointF(m_series->x(marker->index()), m_series->y(marker->index())));
             }
             void ScatterChartItem::setLayout(QVector<QPointF>& points)
             {
+            //    qDebug() << "scatter: " << points.count();
                 if(points.size()==0)
                 {
                     XYChartItem::setLayout(points);
                     return;
                 }
                 int diff = XYChartItem::points().size() - points.size();
                 if(diff>0) {
                     deletePoints(diff);
                 }
                 else if(diff<0) {
                     createPoints(-diff);
                 }
                 if(diff!=0) handleUpdated();
                 QList<QGraphicsItem*> items = m_items.childItems();
+            //    qDebug() << "items count" << items.count();
-                for(int i=0; i< points.size();i++) {
+                for (int i = 0; i < points.size() && i < items.count(); i++) {
+                    Q_ASSERT(i < items.count());
                     Marker* item = static_cast<Marker*>(items.at(i));
                     const QPointF& point = points.at(i);
                     const QRectF& rect = item->boundingRect();
                     item->setIndex(i);
                     item->setPos(point.x()-rect.width()/2,point.y()-rect.height()/2);
                     if(!clipRect().contains(point)) {
                         item->setVisible(false);
                     }
                     else {
                         item->setVisible(true);
                     }
                 }
                 prepareGeometryChange();
                 m_rect = clipRect();
                 XYChartItem::setLayout(points);
             }
             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter)
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
             }
             void ScatterChartItem::setPen(const QPen& pen)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
                        static_cast<Marker*>(item)->setPen(pen);
                 }
             }
             void ScatterChartItem::setBrush(const QBrush& brush)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
                         static_cast<Marker*>(item)->setBrush(brush);
                  }
             }
             void ScatterChartItem::handleUpdated()
             {
                 int count = m_items.childItems().count();
                 if(count==0) return;
                 bool recreate = m_size != m_series->size() || m_shape != m_series->shape();
                 //TODO: only rewrite on size change
                 m_size = m_series->size();
                 m_shape = m_series->shape();
                 if(recreate){
                     deletePoints(count);
                     createPoints(count);
                 }
                 setPen(m_series->pen());
                 setBrush(m_series->brush());
             }
             #include "moc_scatterchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

test/qmlchart/qml/qmlchart/main.qml +21 -21

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 width: parent.width
                 height: parent.height
                 // Another option for QML data api:
             //    ListModel {
             //        id: listModelForPie
             //        // PieDataElement
             //        ListElement {
             //            label: "Apple"
             //            value: 4.3
             //        }
             //        ListElement {
             //            label: "Blackberry"
             //            value: 15.1
             //        }
             //    }
                 Component.onCompleted: {
             //        console.log("model:" + myModel.item(0));
             //        myModel.insert(1, {"time":1.4; "speed":41.1 });
             //        scatter.appendData();
             //        chart1.theme = Chart.ThemeHighContrast;
             //        chart2.theme = Chart.ThemeHighContrast;
                 }
                 Chart {
                     id: chart1
                     anchors.top: parent.top
                     anchors.left: parent.left
                     anchors.right: parent.right
                     height: parent.height / 2
                     theme: Chart.ChartThemeBlueCerulean
                     BarSeries {
                         barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
                     }
                     PieSeries {
                         slices: [
                             PieSlice { label: "Volkswagen"; value: 13.5 },
                             PieSlice { label: "Toyota"; value: 10.9 },
                             PieSlice { label: "Ford"; value: 8.6 },
                             PieSlice { label: "Skoda"; value: 8.2 },
                             PieSlice { label: "Volvo"; value: 6.8 },
                             PieSlice { label: "Others"; value: 52.0 }
                         ]
                     }
                 }
                 Chart {
                     id: chart2
                     anchors.top: chart1.bottom
                     anchors.bottom: parent.bottom
                     anchors.left: parent.left
                     anchors.right: parent.right
                     theme: Chart.ChartThemeHighContrast
                     LineSeries {
                         points: [
                             XyPoint { x: 0.0; y: 0.0 },
                             XyPoint { x: 1.1; y: 2.1 },
                             XyPoint { x: 2.9; y: 4.9 },
                             XyPoint { x: 3.2; y: 3.0 }
                         ]
                     }
-                    SplineSeries {
+            //        SplineSeries {
-                        points: [
+            //            points: [
-                            XyPoint { x: 0.0; y: 0.3 },
+            //                XyPoint { x: 0.0; y: 0.3 },
-                            XyPoint { x: 1.1; y: 3.2 },
+            //                XyPoint { x: 1.1; y: 3.2 },
-                            XyPoint { x: 4.17; y: 3.15 }
+            //                XyPoint { x: 4.17; y: 3.15 }
+            //            ]
+            //        }
                     ScatterSeries {
                         points: [
                             XyPoint { x: 1.5; y: 1.5 },
                             XyPoint { x: 1.5; y: 1.6 },
                             XyPoint { x: 1.57; y: 1.55 }
                         ]
                     }
-                    ScatterSeries {
+            //        ScatterSeries {
-                        points: [
+            //            points: [
-                            XyPoint { x: 2.0; y: 2.0 },
+            //                XyPoint { x: 2.0; y: 2.0 },
-                            XyPoint { x: 2.0; y: 2.1 },
+            //                XyPoint { x: 2.0; y: 2.1 },
-                            XyPoint { x: 2.07; y: 2.05 }
+            //                XyPoint { x: 2.07; y: 2.05 }
+            //            ]
+            //        }
-                    ScatterSeries {
+            //        ScatterSeries {
-                        points: [
+            //            points: [
-                            XyPoint { x: 2.6; y: 2.6 },
+            //                XyPoint { x: 2.6; y: 2.6 },
-                            XyPoint { x: 2.6; y: 2.7 },
+            //                XyPoint { x: 2.6; y: 2.7 },
-                            XyPoint { x: 2.67; y: 2.65 }
+            //                XyPoint { x: 2.67; y: 2.65 }
+            //            ]
+            //        }
                 }
             }

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