HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r535:774f7e43278b

Renames Grid to GridLine

Michal Klocek -

r535:774f7e43278b

parent child

Context file:

r535:774f7e43278b

Collapse all files

examples/axischart/main.cpp +1 -1

                 QChartAxis* axisX = chartView->axisX();
                 axisX->setLabelsAngle(45);
-                axisX->setGridPen(Qt::DashLine);
+                axisX->setGridLinePen(Qt::DashLine);
                 QChartAxisCategories* categoriesX = axisX->categories();
                 categoriesX->insert(0,"low");

examples/barchart/main.cpp +1 -1

                 //! [5]
                 //! [6]
-                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setGridLineVisible(false);
                 //! [6]
                 window.setCentralWidget(chartView);

examples/percentbarchart/main.cpp +1 -1

                 //! [6]
                 chartView->axisX()->setAxisVisible(false);
-                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setGridLineVisible(false);
                 chartView->axisX()->setLabelsVisible(false);
                 //! [6]

examples/stackedbarchart/main.cpp +1 -1

                 //! [5]
                 //! [6]
-                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setGridLineVisible(false);
                 //! [6]
                 window.setCentralWidget(chartView);

examples/stackedbarchartdrilldown/main.cpp +1 -1

                 // Disable axis, since they don't really apply to bar chart
             //    drilldownChart->axisX()->setAxisVisible(false);
-                drilldownChart->axisX()->setGridVisible(false);
+                drilldownChart->axisX()->setGridLineVisible(false);
             //    drilldownChart->axisX()->setLabelsVisible(false);
                 QLegend* l = drilldownChart->legend();

src/axis/axisitem.cpp +2 -2

                     setAxisOpacity(0);
                 }
-                if(m_chartAxis->isGridVisible()) {
+                if(m_chartAxis->isGridLineVisible()) {
                     setGridOpacity(100);
                 }
                 else {
                 setLabelsPen(m_chartAxis->labelsPen());
                 setLabelsBrush(m_chartAxis->labelsBrush());
                 setLabelsFont(m_chartAxis->labelsFont());
-                setGridPen(m_chartAxis->gridPen());
+                setGridPen(m_chartAxis->gridLinePen());
                 setShadesPen(m_chartAxis->shadesPen());
                 setShadesBrush(m_chartAxis->shadesBrush());

src/axis/qchartaxis.cpp +13 -13

             /*!
-               \fn bool QChartAxis::isGridVisible() const
+               \fn bool QChartAxis::isGridLineVisible() const
                \brief Returns if grid is visible
-               \sa setGridVisible()
+               \sa setGridLineVisible()
             */
             /*!
             QChartAxis::QChartAxis(QObject* parent):QObject(parent),
             m_axisVisible(true),
-            m_gridVisible(true),
+            m_gridLineVisible(true),
             m_labelsVisible(true),
             m_labelsAngle(0),
             m_shadesVisible(true),
             }
             /*!
-              Sets if grid is \a visible.
+              Sets if grid line is \a visible.
              */
-            void QChartAxis::setGridVisible(bool visible)
+            void QChartAxis::setGridLineVisible(bool visible)
             {
-            	if (m_gridVisible!=visible) {
+            	if (m_gridLineVisible!=visible) {
-                m_gridVisible=visible;
+                m_gridLineVisible=visible;
                 emit updated();
             	}
             }
             /*!
-              Sets \a pen used to draw grid.
+              Sets \a pen used to draw grid line.
              */
-            void QChartAxis::setGridPen(const QPen& pen)
+            void QChartAxis::setGridLinePen(const QPen& pen)
             {
-            	if (m_gridPen!=pen) {
+            	if (m_gridLinePen!=pen) {
-                m_gridPen=pen;
+                m_gridLinePen=pen;
                 emit updated();
             	}
             }
             void QChartAxis::show()
             {
                m_axisVisible=true;
-               m_gridVisible=true;
+               m_gridLineVisible=true;
                m_labelsVisible=true;
                m_shadesVisible=true;
                emit updated();
             void QChartAxis::hide()
             {
                 m_axisVisible=false;
-                m_gridVisible=false;
+                m_gridLineVisible=false;
                 m_labelsVisible=false;
                 m_shadesVisible=false;
                 emit updated();

src/axis/qchartaxis.h +6 -6

                 QPen axisPen() const { return m_axisPen;};
                 //grid handling
-                bool isGridVisible() const { return m_gridVisible;};
+                bool isGridLineVisible() const { return m_gridLineVisible;};
-                void setGridVisible(bool visible);
+                void setGridLineVisible(bool visible);
-                void setGridPen(const QPen& pen);
+                void setGridLinePen(const QPen& pen);
-                QPen gridPen() const {return m_gridPen;}
+                QPen gridLinePen() const {return m_gridLinePen;}
                 //labels handling
                 bool labelsVisible() const { return m_labelsVisible;};
                 QPen m_axisPen;
                 QBrush m_axisBrush;
-                bool m_gridVisible;
+                bool m_gridLineVisible;
-                QPen m_gridPen;
+                QPen m_gridLinePen;
                 bool m_labelsVisible;
                 QPen m_labelsPen;

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