From de984fa8098485a2806541edddb08840f90c4ff4 2012-08-21 14:27:12 From: Marek Rosa Date: 2012-08-21 14:27:12 Subject: [PATCH] DateTimeAxis formatString -> format --- diff --git a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp index fab4c00..a732951 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp +++ b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp @@ -51,7 +51,7 @@ void ChartDateTimeAxisX::createLabels(QStringList &labels,qreal min, qreal max, 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()); } } @@ -129,7 +129,7 @@ void ChartDateTimeAxisX::handleAxisUpdated() { //TODO:: fix this QDateTimeAxis* axis = qobject_cast(m_chartAxis); - m_tickCount = axis->ticksCount(); + m_tickCount = axis->tickCount(); ChartAxis::handleAxisUpdated(); } diff --git a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp index be72e28..07fc0dd 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp +++ b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp @@ -51,7 +51,7 @@ void ChartDateTimeAxisY::createLabels(QStringList &labels,qreal min, qreal max, 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()); } } @@ -134,7 +134,7 @@ void ChartDateTimeAxisY::handleAxisUpdated() { //TODO:: fix this QDateTimeAxis* axis = qobject_cast(m_chartAxis); - m_tickCount = axis->ticksCount(); + m_tickCount = axis->tickCount(); ChartAxis::handleAxisUpdated(); } diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp index b8e0bea..f349369 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis.cpp +++ b/src/axis/datetimeaxis/qdatetimeaxis.cpp @@ -32,30 +32,18 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \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. - - ValuesAxis can be setup to show axis line with tick marks, grid lines and shades. - Values of axis are drawn to position of ticks + QDateTimeAxis can be setup to show axis line with tick marks, grid lines and shades. */ /*! - \qmlclass ValuesAxis QDateTimeAxis - \brief The ValuesAxis element is used for manipulating chart's axes - - ValueAxis can be setup to show axis line with tick marks, grid lines and shades. - Values of axis are drawn to position of ticks - - To access Axes you can use ChartView API. For example: - \code - ChartView { - ValuesAxis { - id: xAxis - min: 0 - max: 10 - } - // Add a few series... - } - \endcode + \qmlclass DateTimeAxis QDateTimeAxis + \brief The DateTimeAxis element is used for manipulating chart's axes + + 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. + DateTimeAxis can be setup to show axis line with tick marks, grid lines and shades. */ /*! @@ -200,7 +188,7 @@ void QDateTimeAxis::setRange(QDateTime min, QDateTime max) 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; @@ -211,7 +199,7 @@ void QDateTimeAxis::setFormatString(QString 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; @@ -220,7 +208,7 @@ QString QDateTimeAxis::formatString() const /*! 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) { @@ -233,7 +221,7 @@ void QDateTimeAxis::setTicksCount(int count) \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; diff --git a/src/axis/datetimeaxis/qdatetimeaxis.h b/src/axis/datetimeaxis/qdatetimeaxis.h index 74ad3d0..5b47f08 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/axis/datetimeaxis/qdatetimeaxis.h @@ -32,7 +32,7 @@ class QDateTimeAxisPrivate; 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) @@ -53,12 +53,12 @@ public: QDateTime max() const; void setRange(QDateTime min, QDateTime max); - void setFormatString(QString format); - QString formatString() const; + void setFormat(QString format); + QString format() const; //ticks handling - void setTicksCount(int count); - int ticksCount() const; + void setTickCount(int count); + int tickCount() const; Q_SIGNALS: void minChanged(QDateTime min); diff --git a/src/axis/datetimeaxis/qdatetimeaxis_p.h b/src/axis/datetimeaxis/qdatetimeaxis_p.h index 7673ec4..c748772 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/axis/datetimeaxis/qdatetimeaxis_p.h @@ -49,13 +49,13 @@ class QDateTimeAxisPrivate : public QAbstractAxisPrivate 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;