HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1218:b8de085c4198

Refactor xychartitem -> xychart

Michal Klocek -

r1218:b8de085c4198

parent child

Context file:

r1218:b8de085c4198

Collapse all files

src/animations/chartanimator.cpp +1 -1

             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "splineanimation_p.h"
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include "pieanimation_p.h"
             #include "baranimation_p.h"
             #include "barchartitem_p.h"

src/animations/xyanimation.cpp +2 -2

             ****************************************************************************/
             #include "xyanimation_p.h"
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include <QDebug>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            XYAnimation::XYAnimation(XYChartItem *item):ChartAnimation(item),
+            XYAnimation::XYAnimation(XYChart *item):ChartAnimation(item),
                 m_item(item),
                 m_dirty(false),
                 m_type(MoveDownAnimation)

src/animations/xyanimation_p.h +3 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class XYChartItem;
+            class XYChart;
             class XYAnimation : public ChartAnimation
             {
             public:
                 enum Animation { LineDrawAnimation, MoveDownAnimation, MoveUpAnimation };
-                XYAnimation(XYChartItem *item);
+                XYAnimation(XYChart *item);
                 ~XYAnimation();
                 void setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index);
                 void setAnimationType(Animation type);
                 void updateCurrentValue (const QVariant &value );
             private:
-                XYChartItem *m_item;
+                XYChart *m_item;
                 QVector<QPointF> m_oldPoints;
                 bool m_dirty;
                 Animation m_type;

src/linechart/linechartitem.cpp +9 -1

             #include "qlineseries_p.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
+            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
-            LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):XYChartItem(series,presenter),
+            LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):XYChart(series,presenter),
+            QGraphicsItem(presenter ? presenter->rootItem() : 0),
             m_series(series),
             m_pointsVisible(false)
             {
                 prepareGeometryChange();
                 m_path = linePath;
                 m_rect = linePath.boundingRect();
+                setPos(origin());
             }
             void LineChartItem::handleUpdated()
                 painter->restore();
             }
+            void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+            {
+                emit XYChart::clicked(calculateDomainPoint(event->pos()));
+            }
             #include "moc_linechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechartitem_p.h +4 -2

             #define LINECHARTITEM_H
             #include "qchartglobal.h"
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLineSeries;
             class ChartPresenter;
-            class LineChartItem :  public XYChartItem
+            class LineChartItem :  public XYChart , public QGraphicsItem
             {
                  Q_OBJECT
+                 Q_INTERFACES(QGraphicsItem)
             public:
                  explicit LineChartItem(QLineSeries *series,ChartPresenter *presenter);
                 ~LineChartItem() {};
                 void handleUpdated();
             protected:
                 void updateGeometry();
+                void mousePressEvent(QGraphicsSceneMouseEvent *event);
             private:
                 QLineSeries* m_series;

src/scatterchart/scatterchartitem.cpp +52 -47

             /****************************************************************************
-            **
+             **
-            ** Copyright (C) 2012 Digia Plc
+             ** Copyright (C) 2012 Digia Plc
-            ** All rights reserved.
+             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+             ** 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.
+             ** This file is part of the Qt Commercial Charts Add-on.
-            **
+             **
-            ** $QT_BEGIN_LICENSE$
+             ** $QT_BEGIN_LICENSE$
-            ** Licensees holding valid Qt Commercial licenses may use this file in
+             ** Licensees holding valid Qt Commercial licenses may use this file in
-            ** accordance with the Qt Commercial License Agreement provided with the
+             ** accordance with the Qt Commercial License Agreement provided with the
-            ** Software or, alternatively, in accordance with the terms contained in
+             ** Software or, alternatively, in accordance with the terms contained in
-            ** a written agreement between you and Digia.
+             ** a written agreement between you and Digia.
-            **
+             **
-            ** If you have questions regarding the use of this file, please use
+             ** If you have questions regarding the use of this file, please use
-            ** contact form at http://qt.digia.com
+             ** contact form at http://qt.digia.com
-            ** $QT_END_LICENSE$
+             ** $QT_END_LICENSE$
-            **
+             **
-            ****************************************************************************/
+             ****************************************************************************/
             #include "scatterchartitem_p.h"
             #include "qscatterseries.h"
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QDebug>
+            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ScatterChartItem::ScatterChartItem(QScatterSeries *series, ChartPresenter *presenter) :
-                XYChartItem(series,presenter),
+            XYChart(series,presenter),
-                m_series(series),
+            QGraphicsItem(presenter ? presenter->rootItem() : 0),
-                m_items(this),
+            m_series(series),
-                m_shape(QScatterSeries::MarkerShapeRectangle),
+            m_items(this),
-                m_size(15)
+            m_shape(QScatterSeries::MarkerShapeRectangle),
+            m_size(15)
             {
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(handleUpdated()));
             //    setGraphicsEffect(dropShadow);
             }
             QRectF ScatterChartItem::boundingRect() const
             {
                 return m_rect;
                     QGraphicsItem *item = 0;
                     switch (m_shape) {
-                               case QScatterSeries::MarkerShapeCircle:{
+                        case QScatterSeries::MarkerShapeCircle: {
-                                   QGraphicsEllipseItem* i = new QGraphicsEllipseItem(0,0,m_size,m_size);
+                            QGraphicsEllipseItem* i = new QGraphicsEllipseItem(0,0,m_size,m_size);
-                                   const QRectF& rect = i->boundingRect();
+                            const QRectF& rect = i->boundingRect();
-                                   i->setPos(-rect.width()/2,-rect.height()/2);
+                            i->setPos(-rect.width()/2,-rect.height()/2);
-                                   item = new Marker(i,this);
+                            item = new Marker(i,this);
-                                   break;
+                            break;
+                        }
-                               case QScatterSeries::MarkerShapeRectangle:{
+                        case QScatterSeries::MarkerShapeRectangle: {
-                                   QGraphicsRectItem* i = new QGraphicsRectItem(0,0,m_size,m_size);
+                            QGraphicsRectItem* i = new QGraphicsRectItem(0,0,m_size,m_size);
-                                   i->setPos(-m_size/2,-m_size/2);
+                            i->setPos(-m_size/2,-m_size/2);
-                                   item = new Marker(i,this);
+                            item = new Marker(i,this);
-                                   break;
+                            break;
+                        }
-                               default:
+                        default:
-                                   qWarning()<<"Unsupported marker type";
+                        qWarning()<<"Unsupported marker type";
-                                   break;
+                        break;
                     }
                     m_items.addToGroup(item);
             void ScatterChartItem::markerSelected(Marker *marker)
             {
-                emit XYChartItem::clicked(marker->point());
+                emit XYChart::clicked(marker->point());
             }
             void ScatterChartItem::updateGeometry()
                 prepareGeometryChange();
                 m_rect = clipRect();
+                setPos(origin());
             }
             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter)
             void ScatterChartItem::setPen(const QPen& pen)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
-                       static_cast<Marker*>(item)->setPen(pen);
+                    static_cast<Marker*>(item)->setPen(pen);
                 }
             }
             void ScatterChartItem::setBrush(const QBrush& brush)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
-                        static_cast<Marker*>(item)->setBrush(brush);
+                    static_cast<Marker*>(item)->setBrush(brush);
+                }
             }
             void ScatterChartItem::handleUpdated()
                 m_size = m_series->size();
                 m_shape = m_series->shape();
-                if(recreate){
+                if(recreate) {
                     deletePoints(count);
                     createPoints(count);
                 }
                 setBrush(m_series->brush());
             }
+            void ScatterChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+            {
+                emit XYChart::clicked(calculateDomainPoint(event->pos()));
+            }
             #include "moc_scatterchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/scatterchartitem_p.h +3 -2

             #define SCATTERCHARTITEM_H
             #include "qchartglobal.h"
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include <QGraphicsEllipseItem>
             #include <QPen>
             class QScatterSeries;
             class Marker;
-            class ScatterChartItem : public XYChartItem
+            class ScatterChartItem : public XYChart, public QGraphicsItem
             {
                 Q_OBJECT
             public:
             protected:
                 void updateGeometry();
+                void mousePressEvent(QGraphicsSceneMouseEvent *event);
             private:
                 QScatterSeries *m_series;

src/splinechart/splinechartitem.cpp +31 -26

             /****************************************************************************
-            **
+             **
-            ** Copyright (C) 2012 Digia Plc
+             ** Copyright (C) 2012 Digia Plc
-            ** All rights reserved.
+             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+             ** 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.
+             ** This file is part of the Qt Commercial Charts Add-on.
-            **
+             **
-            ** $QT_BEGIN_LICENSE$
+             ** $QT_BEGIN_LICENSE$
-            ** Licensees holding valid Qt Commercial licenses may use this file in
+             ** Licensees holding valid Qt Commercial licenses may use this file in
-            ** accordance with the Qt Commercial License Agreement provided with the
+             ** accordance with the Qt Commercial License Agreement provided with the
-            ** Software or, alternatively, in accordance with the terms contained in
+             ** Software or, alternatively, in accordance with the terms contained in
-            ** a written agreement between you and Digia.
+             ** a written agreement between you and Digia.
-            **
+             **
-            ** If you have questions regarding the use of this file, please use
+             ** If you have questions regarding the use of this file, please use
-            ** contact form at http://qt.digia.com
+             ** contact form at http://qt.digia.com
-            ** $QT_END_LICENSE$
+             ** $QT_END_LICENSE$
-            **
+             **
-            ****************************************************************************/
+             ****************************************************************************/
             #include "splinechartitem_p.h"
             #include "qsplineseries_p.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
-            #include <QDebug>
+            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             SplineChartItem::SplineChartItem(QSplineSeries *series, ChartPresenter *presenter) :
-                XYChartItem(series, presenter),
+            XYChart(series, presenter),
-                m_series(series),
+            QGraphicsItem(presenter ? presenter->rootItem() : 0),
-                m_pointsVisible(false),
+            m_series(series),
-                m_animation(0)
+            m_pointsVisible(false),
+            m_animation(0)
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
             void SplineChartItem::setAnimation(SplineAnimation* animation)
             {
                 m_animation=animation;
-                XYChartItem::setAnimation(animation);
+                XYChart::setAnimation(animation);
             }
             void SplineChartItem::setControlGeometryPoints(QVector<QPointF>& points)
             QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
             {
-                return XYChartItem::calculateGeometryPoint(m_series->d_func()->controlPoint(index));
+                return XYChart::calculateGeometryPoint(m_series->d_func()->controlPoint(index));
             }
             void SplineChartItem::updateGeometry()
                 prepareGeometryChange();
                 m_path = splinePath;
                 m_rect = splinePath.boundingRect();
+                setPos(origin());
             }
             //handlers
                 painter->restore();
             }
+            void SplineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+            {
+                emit XYChart::clicked(calculateDomainPoint(event->pos()));
+            }
             #include "moc_splinechartitem_p.cpp"

src/splinechart/splinechartitem_p.h +4 -2

             #define SPLINECHARTITEM_P_H
             #include "qsplineseries.h"
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include "splineanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class SplineChartItem : public XYChartItem
+            class SplineChartItem : public XYChart, public QGraphicsItem
             {
                 Q_OBJECT
+                Q_INTERFACES(QGraphicsItem)
             public:
                 SplineChartItem(QSplineSeries *series, ChartPresenter *presenter);
             protected:
                 void updateGeometry();
                 void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index);
+                void mousePressEvent(QGraphicsSceneMouseEvent *event);
             private:
                 QPointF calculateGeometryControlPoint(int index) const;

src/xychart/qxyseries.h +1 -1

                 Q_DECLARE_PRIVATE(QXYSeries);
                 Q_DISABLE_COPY(QXYSeries);
                 friend class XYLegendMarker;
-                friend class XYChartItem;
+                friend class XYChart;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychart.cpp ~~src/xychart/xychartitem.cpp~~ renamed +21 -32

              **
              ****************************************************************************/
-            #include "xychartitem_p.h"
+            #include "xychart_p.h"
             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
-            #include <QGraphicsSceneMouseEvent>
             #include <QAbstractItemModel>
             #include "qxymodelmapper.h"
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
-            XYChartItem::XYChartItem(QXYSeries *series, ChartPresenter *presenter):ChartItem(presenter),
+            XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):Chart(presenter),
             m_minX(0),
             m_maxX(0),
             m_minY(0),
                 QObject::connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
             }
-            void XYChartItem::setGeometryPoints(QVector<QPointF>& points)
+            void XYChart::setGeometryPoints(QVector<QPointF>& points)
             {
                 m_points = points;
             }
-            void XYChartItem::setClipRect(const QRectF &rect)
+            void XYChart::setClipRect(const QRectF &rect)
             {
                 m_clipRect = rect;
             }
-            void XYChartItem::setAnimation(XYAnimation* animation)
+            void XYChart::setAnimation(XYAnimation* animation)
             {
                 m_animation=animation;
             }
-            QPointF XYChartItem::calculateGeometryPoint(const QPointF &point) const
+            QPointF XYChart::calculateGeometryPoint(const QPointF &point) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 return QPointF(x,y);
             }
-            QPointF XYChartItem::calculateGeometryPoint(int index) const
+            QPointF XYChart::calculateGeometryPoint(int index) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 return QPointF(x,y);
             }
-            QVector<QPointF> XYChartItem::calculateGeometryPoints() const
+            QVector<QPointF> XYChart::calculateGeometryPoints() const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 return result;
             }
-            QPointF XYChartItem::calculateDomainPoint(const QPointF &point) const
+            QPointF XYChart::calculateDomainPoint(const QPointF &point) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 return QPointF(x,y);
             }
-            void XYChartItem::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
+            void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
             {
                 if (m_animation) {
                     m_animation->setValues(oldPoints, newPoints, index);
                 }
             }
-            void XYChartItem::updateGeometry()
-                update();
             //handlers
-            void XYChartItem::handlePointAdded(int index)
+            void XYChart::handlePointAdded(int index)
             {
                 if (m_series->model() == 0) {
                     Q_ASSERT(index<m_series->count());
                updateChart(m_points,points,index);
             }
-            void XYChartItem::handlePointsAdded(int start, int end)
+            void XYChart::handlePointsAdded(int start, int end)
             {
                 if (m_series->model() == 0) {
                     for (int i = start; i <= end; i++)
                 }
             }
-            void XYChartItem::handlePointRemoved(int index)
+            void XYChart::handlePointRemoved(int index)
             {
                 if (m_series->model() == 0) {
                     Q_ASSERT(index<m_series->count() + 1);
                 updateChart(m_points,points,index);
             }
-            void XYChartItem::handlePointsRemoved(int start, int end)
+            void XYChart::handlePointsRemoved(int start, int end)
             {
                 Q_UNUSED(start)
                 Q_UNUSED(end)
             }
-            void XYChartItem::handlePointReplaced(int index)
+            void XYChart::handlePointReplaced(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 updateChart(m_points,points,index);
             }
-            void XYChartItem::handleReinitialized()
+            void XYChart::handleReinitialized()
             {
                 QVector<QPointF> points = calculateGeometryPoints();
                 updateChart(m_points,points);
             }
-            void XYChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
+            void XYChart::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 m_minX=minX;
                 m_maxX=maxX;
                 updateChart(m_points,points);
             }
-            void XYChartItem::handleGeometryChanged(const QRectF &rect)
+            void XYChart::handleGeometryChanged(const QRectF &rect)
             {
                 Q_ASSERT(rect.isValid());
                 m_size=rect.size();
                 m_clipRect=rect.translated(-rect.topLeft());
-                setPos(rect.topLeft());
+                m_origin=rect.topLeft();
                 if (isEmpty()) return;
                 QVector<QPointF> points = calculateGeometryPoints();
                 updateChart(m_points,points);
             }
-            bool XYChartItem::isEmpty()
+            bool XYChart::isEmpty()
             {
                 return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY) || m_series->points().isEmpty();
             }
-            void XYChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+            #include "moc_xychart_p.cpp"
-                emit clicked(calculateDomainPoint(event->pos()));
-            #include "moc_xychartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychart.pri +2 -2

             DEPENDPATH += $$PWD
             SOURCES += \
-                $$PWD/xychartitem.cpp \
+                $$PWD/xychart.cpp \
                 $$PWD/qxyseries.cpp \
                 $$PWD/qxymodelmapper.cpp
             PRIVATE_HEADERS += \
-                $$PWD/xychartitem_p.h \
+                $$PWD/xychart_p.h \
                 $$PWD/qxyseries_p.h

src/xychart/xychart_p.h ~~src/xychart/xychartitem_p.h~~ renamed +8 -5

             class ChartPresenter;
             class QXYSeries;
-            class XYChartItem :  public ChartItem
+            class XYChart :  public Chart
             {
                  Q_OBJECT
             public:
-                 explicit XYChartItem(QXYSeries *series, ChartPresenter *presenter);
+                 explicit XYChart(QXYSeries *series, ChartPresenter *presenter);
-                ~XYChartItem(){};
+                ~XYChart(){};
                 void setGeometryPoints(QVector<QPointF>& points);
                 QVector<QPointF> geometryPoints() const { return m_points; }
                 void setClipRect(const QRectF &rect);
                 QRectF clipRect() const { return m_clipRect; }
+                QSizeF size() const { return m_size; }
+                QPointF origin() const { return m_origin; }
                 void setAnimation(XYAnimation* animation);
                 ChartAnimation* animation() const { return m_animation; }
-                virtual void updateGeometry();
+                virtual void updateGeometry() = 0;
             public Q_SLOTS:
                 void handlePointAdded(int index);
                 QPointF calculateGeometryPoint(int index) const;
                 QPointF calculateDomainPoint(const QPointF &point) const;
                 QVector<QPointF> calculateGeometryPoints() const;
-                void mousePressEvent(QGraphicsSceneMouseEvent *event);
             private:
                 inline bool isEmpty();
                 qreal m_maxY;
                 QXYSeries* m_series;
                 QSizeF m_size;
+                QPointF m_origin;
                 QRectF m_clipRect;
                 QVector<QPointF> m_points;
                 XYAnimation* m_animation;

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