From 82d343f35d2d4aa7b6465e4d03152489697db27e 2012-08-21 08:41:26
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-08-21 08:41:26
Subject: [PATCH] QIntervalsAxis some names updates

---

diff --git a/src/axis/intervalsaxis/qintervalsaxis.cpp b/src/axis/intervalsaxis/qintervalsaxis.cpp
index 353b0d0..d545a31 100644
--- a/src/axis/intervalsaxis/qintervalsaxis.cpp
+++ b/src/axis/intervalsaxis/qintervalsaxis.cpp
@@ -76,21 +76,24 @@ QIntervalsAxis::QIntervalsAxis(QIntervalsAxisPrivate &d,QObject *parent):QValues
 
 /*!
     Appends new interval to the axis with an \a intervalLabel.
+    Interval label has to be unique.
     Parameter \a interval specifies the high end limit of the interval.
+    It has to be greater than the high end limit of the previous interval.
+    Otherwise the method returns without adding a new interval.
 */
-void QIntervalsAxis::append(const QString& intervalLabel, qreal interval)
+void QIntervalsAxis::append(const QString& intervalLabel, qreal intervalEnd)
 {
     Q_D(QIntervalsAxis);
 
     if (!d->m_intervals.contains(intervalLabel))
     {
         if(d->m_intervals.isEmpty()){
-            Range range(d->m_categoryMinimum,interval);
+            Range range(d->m_categoryMinimum, intervalEnd);
             d->m_intervalsMap.insert(intervalLabel, range);
             d->m_intervals.append(intervalLabel);
-        }else if (interval > intervalMax(d->m_intervals.last())){
+        }else if (intervalEnd > intervalMax(d->m_intervals.last())){
             Range range = d->m_intervalsMap.value(d->m_intervals.last());
-            d->m_intervalsMap.insert(intervalLabel, Range(range.second,interval));
+            d->m_intervalsMap.insert(intervalLabel, Range(range.second, intervalEnd));
             d->m_intervals.append(intervalLabel);
         }
     }
@@ -159,7 +162,7 @@ void QIntervalsAxis::remove(const QString &intervalLabel)
     }
 }
 
-void QIntervalsAxis::replace(const QString& oldLabel, const QString& newLabel)
+void QIntervalsAxis::replaceLabel(const QString& oldLabel, const QString& newLabel)
 {
     Q_D(QIntervalsAxis);
     int labelIndex = d->m_intervals.indexOf(oldLabel);
@@ -182,7 +185,7 @@ QStringList QIntervalsAxis::intervalsLabels()
 }
 
 /*!
-  Returns number of categories.
+  Returns number of intervals.
  */
 int QIntervalsAxis::count() const
 {
diff --git a/src/axis/intervalsaxis/qintervalsaxis.h b/src/axis/intervalsaxis/qintervalsaxis.h
index f1cb337..3664e72 100644
--- a/src/axis/intervalsaxis/qintervalsaxis.h
+++ b/src/axis/intervalsaxis/qintervalsaxis.h
@@ -42,9 +42,9 @@ protected:
 public:
     AxisType type() const;
 
-    void append(const QString& label, qreal interval = 1);
+    void append(const QString& label, qreal intervalEnd);
     void remove(const QString& label);
-    void replace(const QString& oldLabel, const QString& newLabel);
+    void replaceLabel(const QString& oldLabel, const QString& newLabel);
 
     void setFisrtIntervalMinimum(qreal min);
 
diff --git a/tests/tests.pro b/tests/tests.pro
index a53bb70..11b1f33 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,7 +6,7 @@ TEMPLATE = subdirs
 SUBDIRS += \ 
     auto \
     chartwidgettest \
-    qmlchartproperties 
+    qmlchartproperties
 
 !linux-arm*: {
     SUBDIRS += \