HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2493:0a1f68456574

QML support for LogValueAxis...

Miikka Heikkinen -

r2493:0a1f68456574

parent child

Context file:

r2493:0a1f68456574

Collapse all files

doc/src/qml.qdoc +1 0

                                 <li><a href="qml-polarchartview.html">PolarChartView</a></li>
                                 <li><a href="qml-abstractaxis.html">AbstractAxis</a></li>
                                 <li><a href="qml-valueaxis.html">ValueAxis</a></li>
+                                <li><a href="qml-logvaluesaxis.html">LogValueAxis</a></li>
                                 <li><a href="qml-categoryaxis.html">CategoryAxis</a></li>
                                 <li><a href="qml-categoryrange.html">CategoryRange</a></li>
                                 <li><a href="qml-barcategoryaxis.html">BarCategoryAxis</a></li>

plugins/declarative/declarativechart.cpp +3 0

             #include "declarativescatterseries.h"
             #include "qbarcategoryaxis.h"
             #include "qvalueaxis.h"
+            #include "qlogvalueaxis.h"
             #include "qcategoryaxis.h"
             #include "qabstractseries_p.h"
             #include "declarativemargins.h"
                 case QAbstractAxis::AxisTypeDateTime:
                     return new QDateTimeAxis(this);
             #endif
+                case QAbstractAxis::AxisTypeLogValue:
+                    return new QLogValueAxis(this);
                 default:
                     // assume AxisTypeNoAxis
                     return 0;

plugins/declarative/plugin.cpp +3 0

             #include "qchart.h"
             #include "qabstractaxis.h"
             #include "qvalueaxis.h"
+            #include "qlogvalueaxis.h"
             #include "declarativecategoryaxis.h"
             #include "qbarcategoryaxis.h"
             #include "declarativechart.h"
             Q_DECLARE_METATYPE(QBarCategoryAxis *)
             Q_DECLARE_METATYPE(QCategoryAxis *)
             Q_DECLARE_METATYPE(QDateTimeAxis *)
+            Q_DECLARE_METATYPE(QLogValueAxis *)
             Q_DECLARE_METATYPE(QLegend *)
             Q_DECLARE_METATYPE(QLegendMarker *)
                     qmlRegisterType<DeclarativeScatterSeries, 3>(uri, 1, 3, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 3>(uri, 1, 3, "LineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 3>(uri, 1, 3, "AreaSeries");
+                    qmlRegisterType<QLogValueAxis>(uri, 1, 3, "LogValueAxis");
                 }
             };

src/axis/logvalueaxis/qlogvalueaxis.cpp +54 -3

             */
             /*!
+                \qmlclass LogValuesAxis QLogValueAxis
+                \brief The LogValueAxis element is used for manipulating chart's axes
+                \inherits AbstractAxis
+                \note If a LogValueAxis is attached to a series with one or more points with
+                negative or zero values on the associated dimension, the series will not be
+                plotted at all. This is particularly relevant when XYModelMappers are used,
+                since empty cells in models typically contain zero values.
+            */
+            /*!
               \property QLogValueAxis::min
               Defines the minimum value on the axis.
               When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
-              Value has to be greater then 0.
+              Value has to be greater than 0.
+            */
+            /*!
+              \qmlproperty real LogValuesAxis::min
+              Defines the minimum value on the axis.
+              When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
+              Value has to be greater than 0.
             */
             /*!
               \property QLogValueAxis::max
               Defines the maximum value on the axis.
               When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
-              Value has to be greater then 0.
+              Value has to be greater than 0.
+            */
+            /*!
+              \qmlproperty real LogValuesAxis::max
+              Defines the maximum value on the axis.
+              When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
+              Value has to be greater than 0.
             */
             /*!
               \property QLogValueAxis::base
               Defines the base of the logarithm.
-              Value has to be greater then 0 and not equal 1
+              Value has to be greater than 0 and not equal 1
+            */
+            /*!
+              \qmlproperty real LogValuesAxis::base
+              Defines the maximum value on the axis.
+              Defines the base of the logarithm.
+              Value has to be greater than 0 and not equal 1
             */
             /*!
               Supported specifiers are: d, i, o, x, X, f, F, e, E, g, G, c
               See QString::sprintf() for additional details.
             */
+            /*!
+              \qmlproperty real LogValuesAxis::labelFormat
+              Defines the label format of the axis.
+              Supported specifiers are: d, i, o, x, X, f, F, e, E, g, G, c
+              See QString::sprintf() for additional details.
+            */
             /*!
               \fn void QLogValueAxis::minChanged(qreal min)
               Axis emits signal when \a min of axis has changed.
             */
+            /*!
+              \qmlsignal LogValuesAxis::onMinChanged(qreal min)
+              Axis emits signal when \a min of axis has changed.
+            */
             /*!
               \fn void QLogValueAxis::maxChanged(qreal max)
               Axis emits signal when \a max of axis has changed.
             */
+            /*!
+              \qmlsignal LogValuesAxis::onMaxChanged(qreal max)
+              Axis emits signal when \a max of axis has changed.
+            */
             /*!
               \fn void QLogValueAxis::rangeChanged(qreal min, qreal max)
               \fn void QLogValueAxis::labelFormatChanged(const QString &format)
               Axis emits signal when \a format of axis labels has changed.
             */
+            /*!
+              \qmlsignal LogValueAxis::labelFormatChanged(const QString &format)
+               Axis emits signal when \a format of axis labels has changed.
+            */
             /*!
               \fn void QLogValueAxis::baseChanged(qreal base)
               Axis emits signal when \a base of logarithm of the axis has changed.
             */
+            /*!
+              \qmlsignal LogValuesAxis::baseChanged(qreal base)
+              Axis emits signal when \a base of logarithm of the axis has changed.
+            */
             /*!
                 Constructs an axis object which is a child of \a parent.

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