HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r184:2e4df5890251

Fixes wrong shades zvalues

Michal Klocek -

r184:2e4df5890251

parent child

Context file:

r184:2e4df5890251

Collapse all files

example/axischart/main.cpp +1 -1

                 axis.setGridPen(Qt::DashLine);
                 chartView->setDefaultAxisX(axis);
-                //axis.setShadesBrush(Qt::gray);
+                axis.setShadesBrush(Qt::gray);
                 chartView->setDefaultAxisY(axis);
                 window.setCentralWidget(chartView);

src/axisitem.cpp +32 -3

             m_type(type),
             m_labelsAngle(0),
             m_shadesEnabled(true),
-            m_grid(this),
+            m_grid(parent),
-            m_shades(this),
+            m_shades(parent),
-            m_labels(this)
+            m_labels(parent)
             {
                 //initial initialization
+                m_shades.setZValue(0);
+                m_grid.setZValue(2);
                 createItems();
             }
                       {
                           const qreal deltaX = m_rect.width() / m_ticks;
+                          m_axis.setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
                           for (int i = 0; i <= m_ticks; ++i) {
                               int x = i * deltaX + m_rect.left();
                       {
                           const qreal deltaY = m_rect.height()/ m_ticks;
+                          m_axis.setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
                           for (int i = 0; i <= m_ticks; ++i) {
                               int y = i * -deltaY + m_rect.bottom();
             void AxisItem::handleAxisChanged(const QChartAxis& axis)
             {
+                if(axis.isAxisVisible()) {
+                       setAxisOpacity(100);
+                   }
+                   else {
+                       setAxisOpacity(0);
+                }
                 if(axis.isGridVisible()) {
                     setGridOpacity(100);
                 }
                     break;
                 }
+                setAxisPen(axis.axisPen());
                 setLabelsPen(axis.labelsPen());
                 setLabelsBrush(axis.labelsBrush());
                 setLabelsFont(axis.labelFont());
                 update();
             }
+            void AxisItem::setAxisOpacity(qreal opacity)
+            {
+                m_axis.setOpacity(opacity);
+            }
+            qreal AxisItem::axisOpacity() const
+            {
+                return m_axis.opacity();
+            }
             void AxisItem::setGridOpacity(qreal opacity)
             {
                 m_grid.setOpacity(opacity);
                 }
             }
+            void AxisItem::setAxisPen(const QPen& pen)
+            {
+                m_axis.setPen(pen);
+            }
             void AxisItem::setGridPen(const QPen& pen)
             {
                 foreach(QGraphicsItem* item , m_grid.childItems()) {

src/axisitem_p.h +5 0

                 AxisType axisType() const {return m_type;};
+                void setAxisOpacity(qreal opacity);
+                qreal axisOpacity() const;
                 void setGridOpacity(qreal opacity);
                 qreal gridOpacity() const;
                 void setShadesBrush(const QBrush& brush);
                 void setShadesPen(const QPen& pen);
+                void setAxisPen(const QPen& pen);
                 void setGridPen(const QPen& pen);
                 void setLabelsPen(const QPen& pen);
                 QGraphicsItemGroup m_grid;
                 QGraphicsItemGroup m_shades;
                 QGraphicsItemGroup m_labels;
+                QGraphicsLineItem m_axis;
             };

src/charttheme.cpp +1 0

                 axis.setLabelsBrush(Qt::black);
                 axis.setLabelsPen(Qt::NoPen);
+                axis.setShadesPen(Qt::NoPen);
                 item->handleAxisChanged(axis);
             }

src/qchartaxis.cpp 0 -5

                 m_axisPen=pen;
             }
-            void QChartAxis::setAxisBrush(const QBrush& brush)
-                m_axisBrush=brush;
             void QChartAxis::setAxisVisible(bool visible)
             {
                 m_axisVisible=visible;

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