HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1654:746d930ea165

abstract axis qml documentation. bug fix to setArrowVisible

sauimone -

r1654:746d930ea165

parent child

Context file:

r1654:746d930ea165

Collapse all files

src/axis/chartaxis.cpp +1 -1

                  }
                  else {
-                     if (m_chartAxis->isAxisVisible()) {
+                     if (m_chartAxis->isArrowVisible()) {
                          setAxisOpacity(100);
                      }
                      else {

src/axis/qabstractaxis.cpp +51 -30

              */
              /*!
-               \fn void QAbstractAxis::visibleChanged(bool)
+               \fn void QAbstractAxis::visibleChanged(bool visible)
                Visiblity of the axis has changed to \a visible.
              */
              /*!
-               \fn void QAbstractAxis::labelsVisibleChanged(bool)
-               Visiblity of the labels of the axis has changed to \a visible.
+               \qmlsignal AbstractAxis::onVisibleChanged(bool visible)
+               Visiblity of the axis has changed to \a visible.
              */
              /*!
-               \fn void QAbstractAxis::gridVisibleChanged(bool)
-               Visiblity of the grid lines of the axis has changed to \a visible.
+               \fn void QAbstractAxis::arrowVisibleChanged(bool visible)
+               Visiblity of the axis arrow has changed to \a visible.
              */
-             /*
-               \fn void QAbstractAxis::minChanged(qreal min)
-               Axis emits signal when \a min of axis has changed.
+             /*!
+               \qmlsignal AbstractAxis::onArrowVisibleChanged(bool visible)
+               Visiblity of the axis arrow has changed to \a visible.
              */
-             /*
-               \fn void QAbstractAxis::maxChanged(qreal max)
-               Axis emits signal when \a max of axis has changed.
+             /*!
+               \fn void QAbstractAxis::labelsVisibleChanged(bool visible)
+               Visiblity of the labels of the axis has changed to \a visible.
              */
-             /*
-               \fn void QAbstractAxis::rangeChanged(qreal min, qreal max)
-               Axis emits signal when \a min or \a max of axis has changed.
+             /*!
+               \qmlsignal AbstractAxis::onLabelsVisibleChanged(bool visible)
+               Visiblity of the labels of the axis has changed to \a visible.
              */
-             /*
-               \fn QChartAxisCategories* QAbstractAxis::categories()
-               Returns pointer to the list of categories which correspond to the values on the axis.
+             /*!
+               \fn void QAbstractAxis::gridVisibleChanged(bool visible)
+               Visiblity of the grid lines of the axis has changed to \a visible.
+             */
+             /*!
+               \qmlsignal AbstractAxis::onGridVisibleChanged(bool visible)
+               Visiblity of the grid lines of the axis has changed to \a visible.
              */
              /*!
-               \fn void QAbstractAxis::colorChanged(QColor)
+               \fn void QAbstractAxis::colorChanged(QColor color)
+               Emitted if the \a color of the axis is changed.
+             */
+             /*!
+               \qmlsignal AbstractAxis::onColorChanged(QColor color)
                Emitted if the \a color of the axis is changed.
              */
              /*!
-               \fn void QAbstractAxis::labelsColorChanged(QColor)
+               \fn void QAbstractAxis::labelsColorChanged(QColor color)
+               Emitted if the \a color of the axis labels is changed.
+             */
+             /*!
+               \qmlsignal AbstractAxis::onLabelsColorChanged(QColor color)
                Emitted if the \a color of the axis labels is changed.
              */
                \fn void QAbstractAxis::shadesVisibleChanged(bool)
                Emitted if the visibility of the axis shades is changed to \a visible.
              */
+             /*!
+               \qmlsignal AbstractAxis::onShadesVisibleChanged(bool visible)
+               Emitted if the visibility of the axis shades is changed to \a visible.
+             */
              /*!
-               \fn void QAbstractAxis::shadesColorChanged(QColor)
+               \fn void QAbstractAxis::shadesColorChanged(QColor color)
+               Emitted if the \a color of the axis shades is changed.
+             */
+             /*!
+               \qmlsignal AbstractAxis::onShadesColorChanged(QColor color)
                Emitted if the \a color of the axis shades is changed.
              */
                \fn void QAbstractAxis::shadesBorderColorChanged(QColor)
                Emitted if the border \a color of the axis shades is changed.
              */
+             /*!
+               \qmlsignal AbstractAxis::onBorderColorChanged(QColor color)
+               Emitted if the border \a color of the axis shades is changed.
+             */
              /*!
                Constructs new axis object which is a child of \a parent. Ownership is taken by
              /*!
                Sets if axis and ticks are \a visible.
               */
-             void QAbstractAxis::setAxisVisible(bool visible)
+             void QAbstractAxis::setArrowVisible(bool visible)
              {
-                 if (d_ptr->m_axisVisible != visible) {
-                     d_ptr->m_axisVisible = visible;
+                 if (d_ptr->m_arrowVisible != visible) {
+                     d_ptr->m_arrowVisible = visible;
                      emit d_ptr->updated();
-                     emit visibleChanged(visible);
+                     emit arrowVisibleChanged(visible);
              	}
              }
-             bool QAbstractAxis::isAxisVisible() const
+             bool QAbstractAxis::isArrowVisible() const
              {
-                 return d_ptr->m_axisVisible;
+                 return d_ptr->m_arrowVisible;
              }
              void QAbstractAxis::setGridLineVisible(bool visible)
              QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis* q):
                  q_ptr(q),
                  m_visible(false),
-                 m_axisVisible(true),
+                 m_arrowVisible(true),
                  m_gridLineVisible(true),
                  m_labelsVisible(true),
                  m_labelsAngle(0),

src/axis/qabstractaxis.h +4 -4

              {
              	Q_OBJECT
              	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-                 Q_PROPERTY(bool axisVisible READ isAxisVisible WRITE setAxisVisible NOTIFY visibleChanged)
+                 Q_PROPERTY(bool arrowVisible READ isArrowVisible WRITE setArrowVisible NOTIFY arrowVisibleChanged)
                  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)
                  //axis handling
-                 bool isAxisVisible() const;
-                 void setAxisVisible(bool visible = true);
+                 bool isArrowVisible() const;
+                 void setArrowVisible(bool visible = true);
                  void setAxisPen(const QPen &pen);
                  QPen axisPen() const;
                  void setAxisPenColor(QColor color);
              Q_SIGNALS:
                  void visibleChanged(bool visible);
-                 void axisVisibleChanged(bool visible);
+                 void arrowVisibleChanged(bool visible);
                  void labelsVisibleChanged(bool visible);
                  void gridVisibleChanged(bool visible);
                  void colorChanged(QColor color);

src/axis/qabstractaxis_p.h +1 -1

                  QAbstractAxis *q_ptr;
                  bool m_visible;
-                 bool m_axisVisible;
+                 bool m_arrowVisible;
                  QPen m_axisPen;
                  QBrush m_axisBrush;

src/axis/qbarcategoriesaxis.cpp +10 -2

                Defines the minimum value on the axis.
              */
              /*!
-               \qmlproperty real BarCategoriesAxis::min
+               \qmlproperty QString BarCategoriesAxis::min
                Defines the minimum value on the axis.
              */
                Defines the maximum value on the axis.
              */
              /*!
-               \qmlproperty real BarCategoriesAxis::max
+               \qmlproperty QString BarCategoriesAxis::max
                Defines the maximum value on the axis.
              */
                \fn void QBarCategoriesAxis::minChanged(const QString &min)
                Axis emits signal when \a min of axis has changed.
              */
+             /*!
+               \qmlsignal BarCategoriesAxis::onMinChanged(const QString &min)
+               Axis emits signal when \a min of axis has changed.
+             */
              /*!
                \fn void QBarCategoriesAxis::maxChanged(const QString &max)
                Axis emits signal when \a max of axis has changed.
              */
+             /*!
+               \qmlsignal BarCategoriesAxis::onMaxChanged(const QString &max)
+               Axis emits signal when \a max of axis has changed.
+             */
              /*!
                \fn void QBarCategoriesAxis::rangeChanged(const QString &min, const QString &max)

src/axis/qintervalaxis.cpp +1 -1

              }
              /*!
-                 Appends \a categories to axis
+                 Appends \a category to axis
              */
              void QIntervalAxis::append(const QString& category, qreal x)
              {

src/axis/qvaluesaxis.cpp +8 0

                \fn void QValuesAxis::minChanged(qreal min)
                Axis emits signal when \a min of axis has changed.
              */
+             /*!
+               \qmlsignal ValuesAxis::onMinChanged(real min)
+               Axis emits signal when \a min of axis has changed.
+             */
              /*!
                \fn void QValuesAxis::maxChanged(qreal max)
                Axis emits signal when \a max of axis has changed.
              */
+             /*!
+               \qmlsignal ValuesAxis::onMaxChanged(real max)
+               Axis emits signal when \a max of axis has changed.
+             */
              /*!
                \fn void QValuesAxis::rangeChanged(qreal min, qreal max)

src/charttheme.cpp +1 -1

                  QBrush brush;
                  QFont font;
-                 if (axis->isAxisVisible()) {
+                 if (axis->isArrowVisible()) {
                      if(brush == axis->labelsBrush() ||  m_force){
                          axis->setLabelsBrush(m_labelBrush);

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