HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r262:461b2e61910e

Adds ZOrder enum to presenter

Michal Klocek -

r262:461b2e61910e

parent child

Context file:

r262:461b2e61910e

src/axisitem.cpp +5 -4

             #include "axisitem_p.h"
             #include "qchartaxis.h"
+            #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QDebug>
             m_shadesEnabled(true),
             m_grid(parent),
             m_shades(parent),
-            m_labels(parent)
+            m_labels(parent),
+            m_origin(0,0)
             {
                 //initial initialization
-                m_shades.setZValue(0);
+                m_shades.setZValue(ChartPresenter::ShadesZValue);
-                m_grid.setZValue(2);
+                m_grid.setZValue(ChartPresenter::GridZValue);
             }
             AxisItem::~AxisItem()
                 m_grid.setOpacity(opacity);
             }
             qreal AxisItem::gridOpacity() const
             {
                 return m_grid.opacity();

src/axisitem_p.h +4 -3

                 void setLabelsFont(const QFont& font);
             public slots:
-                void handleAxisUpdate(QChartAxis* axis);
+                void handleAxisUpdate(QChartAxis* axis); //look and feel
-                void handleLabelsChanged(QChartAxis* axis,const QStringList& labels);
+                void handleLabelsChanged(QChartAxis* axis,const QStringList& labels); //labels from dataset
-                void handleGeometryChanged(const QRectF& size);
+                void handleGeometryChanged(const QRectF& size); // geometry from presenter
             protected:
                 void updateItem(int count);
             private:
                 QGraphicsItemGroup m_labels;
                 QGraphicsLineItem m_axis;
                 QStringList m_thicksList;
+                QPointF m_origin;
             };

src/chartpresenter_p.h +2 0

             {
                 Q_OBJECT
             public:
+                enum ZValues { BackgroundZValue = -1 , ShadesZValue, GridZValue,  AxisZValue , LineChartZValue };
                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();

src/linechart/linechartitem.cpp +1 -1

             m_dirtyGeometry(false),
             m_dirtyDomain(false)
             {
+                setZValue(ChartPresenter::LineChartZValue);
             }
             QRectF LineChartItem::boundingRect() const

src/qchart.cpp +5 -2

             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new QGraphicsRectItem(this);
-                    m_backgroundItem->setZValue(-1);
+                    m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChart::createChartTitleItem()
             {
-                if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this);
+                if(!m_titleItem) {
+                    m_titleItem = new QGraphicsTextItem(this);
+                    m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
+                }
             }
             int QChart::margin() const

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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