HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1801:de984fa80984

DateTimeAxis formatString -> format

Marek Rosa -

r1801:de984fa80984

parent child

Context file:

r1801:de984fa80984

Collapse all files

src/axis/datetimeaxis/chartdatetimeaxisx.cpp +2 -2

                 n++;
                 for (int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
-                    labels << QDateTime::fromMSecsSinceEpoch(value).toString(axis->formatString());
+                    labels << QDateTime::fromMSecsSinceEpoch(value).toString(axis->format());
                 }
             }
             {
                 //TODO:: fix this
                 QDateTimeAxis* axis = qobject_cast<QDateTimeAxis*>(m_chartAxis);
-                m_tickCount = axis->ticksCount();
+                m_tickCount = axis->tickCount();
                 ChartAxis::handleAxisUpdated();
             }

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +2 -2

                 n++;
                 for (int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
-                    labels << QDateTime::fromMSecsSinceEpoch(value).toString(axis->formatString());
+                    labels << QDateTime::fromMSecsSinceEpoch(value).toString(axis->format());
                 }
             }
             {
                 //TODO:: fix this
                 QDateTimeAxis* axis = qobject_cast<QDateTimeAxis*>(m_chartAxis);
-                m_tickCount = axis->ticksCount();
+                m_tickCount = axis->tickCount();
                 ChartAxis::handleAxisUpdated();
             }

src/axis/datetimeaxis/qdatetimeaxis.cpp +12 -24

                 \brief The QDateTimeAxis class is used for manipulating chart's axis.
                 \mainclass
+                The labels can be configured by setting an appropriate DateTime format.
                 Note that any date before 4800 BCE or after about 1.4 million CE may not be accurately stored.
+                QDateTimeAxis can be setup to show axis line with tick marks, grid lines and shades.
-                ValuesAxis can be setup to show axis line with tick marks, grid lines and shades.
-                Values of axis are drawn to position of ticks
             */
             /*!
-                \qmlclass ValuesAxis QDateTimeAxis
+                \qmlclass DateTimeAxis QDateTimeAxis
-                \brief The ValuesAxis element is used for manipulating chart's axes
+                \brief The DateTimeAxis element is used for manipulating chart's axes
-                ValueAxis can be setup to show axis line with tick marks, grid lines and shades.
+                The labels can be configured by setting an appropriate DateTime format.
-                Values of axis are drawn to position of ticks
+                Note that any date before 4800 BCE or after about 1.4 million CE may not be accurately stored.
+                DateTimeAxis can be setup to show axis line with tick marks, grid lines and shades.
-                To access Axes you can use ChartView API. For example:
-                \code
-                    ChartView {
-                        ValuesAxis {
-                            id: xAxis
-                            min: 0
-                            max: 10
-                    // Add a few series...
-                \endcode
             */
             /*!
               Check QDateTime documentation for information on how the string should be defined.
               \sa formatString()
             */
-            void QDateTimeAxis::setFormatString(QString format)
+            void QDateTimeAxis::setFormat(QString format)
             {
                 Q_D(QDateTimeAxis);
                 d->m_format = format;
               Check QDateTime documentation for information on how the string should be defined.
               \sa setFormatString()
             */
-            QString QDateTimeAxis::formatString() const
+            QString QDateTimeAxis::format() const
             {
                 Q_D(const QDateTimeAxis);
                 return d->m_format;
             /*!
               Sets \a count for ticks on the axis.
             */
-            void QDateTimeAxis::setTicksCount(int count)
+            void QDateTimeAxis::setTickCount(int count)
             {
                 Q_D(QDateTimeAxis);
                 if (d->m_tickCount != count && count >=2) {
               \fn int QDateTimeAxis::ticksCount() const
               Return number of ticks on the axis
             */
-            int QDateTimeAxis::ticksCount() const
+            int QDateTimeAxis::tickCount() const
             {
                 Q_D(const QDateTimeAxis);
                 return d->m_tickCount;

src/axis/datetimeaxis/qdatetimeaxis.h +5 -5

             class QTCOMMERCIALCHART_EXPORT QDateTimeAxis : public QAbstractAxis
             {
                 Q_OBJECT
-                Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount)
+                Q_PROPERTY(int tickCount READ tickCount WRITE setTickCount)
                 Q_PROPERTY(QDateTime min READ min WRITE setMin NOTIFY minChanged)
                 Q_PROPERTY(QDateTime max READ max WRITE setMax NOTIFY maxChanged)
                 QDateTime max() const;
                 void setRange(QDateTime min, QDateTime max);
-                void setFormatString(QString format);
+                void setFormat(QString format);
-                QString formatString() const;
+                QString format() const;
                 //ticks handling
-                void setTicksCount(int count);
+                void setTickCount(int count);
-                int ticksCount() const;
+                int tickCount() const;
             Q_SIGNALS:
                 void minChanged(QDateTime min);

src/axis/datetimeaxis/qdatetimeaxis_p.h +2 -2

                 void handleDomainUpdated();
                 qreal min(){ return m_min.toMSecsSinceEpoch(); }
                 qreal max(){ return m_max.toMSecsSinceEpoch(); }
-                int count() const { /*TODO:*/ return 0;};
+                int count() const { /*TODO:*/ return 0;}
                 protected:
                 void setMin(const QVariant &min);
                 void setMax(const QVariant &max);
                 void setRange(const QVariant &min, const QVariant &max);
-                int ticksCount() const;
+                int tickCount() const;
                 protected:
                 QDateTime m_min;

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