HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1844:691cce09e051

QAbstractAxis: renamed Arrow and Axis to line in methods names

Marek Rosa -

r1844:691cce09e051

parent child

Context file:

r1844:691cce09e051

Collapse all files

examples/customchart/main.cpp +2 -2

                 // Customize axis colors
                 QPen axisPen(QRgb(0xd18952));
                 axisPen.setWidth(2);
-                axisX->setAxisPen(axisPen);
+                axisX->setLinePen(axisPen);
-                axisY->setAxisPen(axisPen);
+                axisY->setLinePen(axisPen);
                 // Customize axis label colors
                 QBrush axisBrush(Qt::white);

src/axis/chartaxis.cpp +2 -2

                 bool visible = m_chartAxis->isVisible();
-                setArrowVisibility(visible && m_chartAxis->isArrowVisible());
+                setArrowVisibility(visible && m_chartAxis->isLineVisible());
                 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
                 setLabelsVisibility(visible && m_chartAxis->labelsVisible());
                 setShadesVisibility(visible && m_chartAxis->shadesVisible());
                 setLabelsAngle(m_chartAxis->labelsAngle());
-                setArrowPen(m_chartAxis->axisPen());
+                setArrowPen(m_chartAxis->linePen());
                 setLabelsPen(m_chartAxis->labelsPen());
                 setLabelsBrush(m_chartAxis->labelsBrush());
                 setLabelsFont(m_chartAxis->labelsFont());

src/axis/qabstractaxis.cpp +8 -8

             /*!
               Sets \a pen used to draw axis line and ticks.
              */
-            void QAbstractAxis::setAxisPen(const QPen &pen)
+            void QAbstractAxis::setLinePen(const QPen &pen)
             {
             	if (d_ptr->m_axisPen!=pen) {
             	    d_ptr->m_axisPen = pen;
             /*!
               Returns pen used to draw axis and ticks.
             */
-            QPen QAbstractAxis::axisPen() const
+            QPen QAbstractAxis::linePen() const
             {
                 return d_ptr->m_axisPen;
             }
-            void QAbstractAxis::setAxisPenColor(QColor color)
+            void QAbstractAxis::setLinePenColor(QColor color)
             {
                 QPen p = d_ptr->m_axisPen;
                 if (p.color() != color) {
                     p.setColor(color);
-                    setAxisPen(p);
+                    setLinePen(p);
                     emit colorChanged(color);
                 }
             }
-            QColor QAbstractAxis::axisPenColor() const
+            QColor QAbstractAxis::linePenColor() const
             {
                 return d_ptr->m_axisPen.color();
             }
             /*!
               Sets if axis and ticks are \a visible.
              */
-            void QAbstractAxis::setArrowVisible(bool visible)
+            void QAbstractAxis::setLineVisible(bool visible)
             {
                 if (d_ptr->m_arrowVisible != visible) {
                     d_ptr->m_arrowVisible = visible;
                     d_ptr->emitUpdated();
-                    emit arrowVisibleChanged(visible);
+                    emit lineVisibleChanged(visible);
             	}
             }
-            bool QAbstractAxis::isArrowVisible() const
+            bool QAbstractAxis::isLineVisible() const
             {
                 return d_ptr->m_arrowVisible;
             }

src/axis/qabstractaxis.h +9 -9

             {
             	Q_OBJECT
             	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-                Q_PROPERTY(bool arrowVisible READ isArrowVisible WRITE setArrowVisible NOTIFY arrowVisibleChanged)
+                Q_PROPERTY(bool arrowVisible READ isLineVisible WRITE setLineVisible NOTIFY lineVisibleChanged)
-                Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
+                Q_PROPERTY(QColor color READ linePenColor WRITE setLinePenColor NOTIFY colorChanged)
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
                 Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont)
                 //axis handling
-                bool isArrowVisible() const;
+                bool isLineVisible() const;
-                void setArrowVisible(bool visible = true);
+                void setLineVisible(bool visible = true);
-                void setAxisPen(const QPen &pen);
+                void setLinePen(const QPen &pen);
-                QPen axisPen() const;
+                QPen linePen() const;
-                void setAxisPenColor(QColor color);
+                void setLinePenColor(QColor color);
-                QColor axisPenColor() const;
+                QColor linePenColor() const;
                 //grid handling
                 bool isGridLineVisible() const;
             Q_SIGNALS:
                 void visibleChanged(bool visible);
-                void arrowVisibleChanged(bool visible);
+                void lineVisibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
                 void gridVisibleChanged(bool visible);
                 void colorChanged(QColor color);

src/charttheme.cpp +3 -3

                 bool axisX = axis->orientation()== Qt::Horizontal;
-                if (axis->isArrowVisible()) {
+                if (axis->isLineVisible()) {
                     if(m_force || brush == axis->labelsBrush()){
                         axis->setLabelsBrush(m_labelBrush);
                         }
                     }
-                    if(m_force || pen == axis->axisPen()){
+                    if(m_force || pen == axis->linePen()){
-                        axis->setAxisPen(m_axisLinePen);
+                        axis->setLinePen(m_axisLinePen);
                     }
                     if(m_force || pen == axis->gridLinePen()){

tests/auto/qabstractaxis/tst_qabstractaxis.cpp +11 -11

             void tst_QAbstractAxis::qabstractaxis()
             {
-                QCOMPARE(m_axis->axisPen(), QPen());
+                QCOMPARE(m_axis->linePen(), QPen());
                 //TODO QCOMPARE(m_axis->axisPenColor(), QColor());
                 QCOMPARE(m_axis->gridLinePen(), QPen());
-                QCOMPARE(m_axis->isArrowVisible(), true);
+                QCOMPARE(m_axis->isLineVisible(), true);
                 QCOMPARE(m_axis->isGridLineVisible(), true);
                 QCOMPARE(m_axis->isVisible(), false);
                 QCOMPARE(m_axis->labelsAngle(), 0);
                 QCOMPARE(m_axis->labelsPen(), QPen());
                 QCOMPARE(m_axis->labelsVisible(), true);
                 QCOMPARE(m_axis->orientation(), Qt::Orientation(0));
-                m_axis->setArrowVisible(false);
+                m_axis->setLineVisible(false);
-                m_axis->setAxisPen(QPen());
+                m_axis->setLinePen(QPen());
-                m_axis->setAxisPenColor(QColor());
+                m_axis->setLinePenColor(QColor());
                 m_axis->setGridLinePen(QPen());
                 m_axis->setGridLineVisible(false);
                 m_axis->setLabelsAngle(-1);
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
-                m_axis->setAxisPen(axisPen);
+                m_axis->setLinePen(axisPen);
-                QCOMPARE(m_axis->axisPen(), axisPen);
+                QCOMPARE(m_axis->linePen(), axisPen);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
             {
                 QFETCH(bool, arrowVisible);
-                m_axis->setArrowVisible(!arrowVisible);
+                m_axis->setLineVisible(!arrowVisible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
-                m_axis->setArrowVisible(arrowVisible);
+                m_axis->setLineVisible(arrowVisible);
-                QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+                QCOMPARE(m_axis->isLineVisible(), arrowVisible);
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
-                QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+                QCOMPARE(m_axis->isLineVisible(), arrowVisible);
             }
             void tst_QAbstractAxis::gridLineVisible_data()

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