HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1617:07b0bddfc311

Adds visibity paramter to axis

Michal Klocek -

r1617:07b0bddfc311

parent child

Context file:

r1617:07b0bddfc311

Collapse all files

src/axis/chartaxis.cpp +30 -18

@@ -260,30 +260,42 void ChartAxis::handleAxisUpdated()
260		260
261	if (isEmpty()) return;	261	if (isEmpty()) return;
262		262
263	if (m_chartAxis->~~isAx~~isVisible()) {	263	if (!m_chartAxis->isVisible()) {
264	setAxisOpacity(100);
265	} else {
266	setAxisOpacity(0);	264	setAxisOpacity(0);
267	}
268
269	if (m_chartAxis->isGridLineVisible()) {
270	setGridOpacity(100);
271	} else {
272	setGridOpacity(0);	265	setGridOpacity(0);
273	}
274
275	if (m_chartAxis->labelsVisible()) {
276	setLabelsOpacity(100);
277	} else {
278	setLabelsOpacity(0);	266	setLabelsOpacity(0);
279	}
280
281	if (m_chartAxis->shadesVisible()) {
282	setShadesOpacity(100);
283	} else {
284	setShadesOpacity(0);	267	setShadesOpacity(0);
285	}	268	}
		269	else {
		270
		271	if (m_chartAxis->isAxisVisible()) {
		272	setAxisOpacity(100);
		273	}
		274	else {
		275	setAxisOpacity(0);
		276	}
286		277
		278	if (m_chartAxis->isGridLineVisible()) {
		279	setGridOpacity(100);
		280	}
		281	else {
		282	setGridOpacity(0);
		283	}
		284
		285	if (m_chartAxis->labelsVisible()) {
		286	setLabelsOpacity(100);
		287	}
		288	else {
		289	setLabelsOpacity(0);
		290	}
		291
		292	if (m_chartAxis->shadesVisible()) {
		293	setShadesOpacity(100);
		294	}
		295	else {
		296	setShadesOpacity(0);
		297	}
		298	}
287	setLabelsAngle(m_chartAxis->labelsAngle());	299	setLabelsAngle(m_chartAxis->labelsAngle());
288	setAxisPen(m_chartAxis->axisPen());	300	setAxisPen(m_chartAxis->axisPen());
289	setLabelsPen(m_chartAxis->labelsPen());	301	setLabelsPen(m_chartAxis->labelsPen());

src/axis/qabstractaxis.cpp +18 -10

             }
+            bool QAbstractAxis::isVisible() const
+            {
+                return d_ptr->m_visible;
+            }
             /*!
               Sets axis, shades, labels and grid lines to be visible.
             */
-            void QAbstractAxis::show()
+            void QAbstractAxis::setVisible(bool visible)
             {
-                d_ptr->m_axisVisible=true;
+                d_ptr->m_visible=visible;
-                d_ptr->m_gridLineVisible=true;
-                d_ptr->m_labelsVisible=true;
-                d_ptr->m_shadesVisible=true;
                 emit d_ptr->updated();
             }
+            /*!
+              Sets axis, shades, labels and grid lines to be visible.
+            */
+            void QAbstractAxis::show()
+            {
+                setVisible(true);
+            }
             /*!
               Sets axis, shades, labels and grid lines to not be visible.
             */
             void QAbstractAxis::hide()
             {
-                d_ptr->m_axisVisible = false;
+                setVisible(false);
-                d_ptr->m_gridLineVisible = false;
-                d_ptr->m_labelsVisible = false;
-                d_ptr->m_shadesVisible = false;
-                emit d_ptr->updated();
             }
             QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis* q):
                 q_ptr(q),
+                m_visible(true),
                 m_axisVisible(true),
                 m_gridLineVisible(true),
                 m_labelsVisible(true),

src/axis/qabstractaxis.h +8 -2

             class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject
             {
             	Q_OBJECT
+            	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-                Q_PROPERTY(bool visible READ isAxisVisible WRITE setAxisVisible NOTIFY visibleChanged)
+                Q_PROPERTY(bool axisVisible READ isAxisVisible WRITE setAxisVisible NOTIFY visibleChanged)
                 Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
                 virtual AxisType type() const = 0;
+                //visibilty hadnling
+                bool isVisible() const;
+                void setVisible(bool visible = true);
                 //axis handling
                 bool isAxisVisible() const;
                 void setAxisVisible(bool visible = true);
             Q_SIGNALS:
                 void visibleChanged(bool visible);
+                void axisVisibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
                 void gridVisibleChanged(bool visible);
                 void colorChanged(QColor color);

src/axis/qabstractaxis_p.h +1 0

             public:
                 QAbstractAxis *q_ptr;
+                bool m_visible;
                 bool m_axisVisible;
                 QPen m_axisPen;

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