@@ -76,21 +76,24 QIntervalsAxis::QIntervalsAxis(QIntervalsAxisPrivate &d,QObject *parent):QValues | |||||
76 |
|
76 | |||
77 | /*! |
|
77 | /*! | |
78 | Appends new interval to the axis with an \a intervalLabel. |
|
78 | Appends new interval to the axis with an \a intervalLabel. | |
|
79 | Interval label has to be unique. | |||
79 | Parameter \a interval specifies the high end limit of the interval. |
|
80 | Parameter \a interval specifies the high end limit of the interval. | |
|
81 | It has to be greater than the high end limit of the previous interval. | |||
|
82 | Otherwise the method returns without adding a new interval. | |||
80 | */ |
|
83 | */ | |
81 | void QIntervalsAxis::append(const QString& intervalLabel, qreal interval) |
|
84 | void QIntervalsAxis::append(const QString& intervalLabel, qreal intervalEnd) | |
82 | { |
|
85 | { | |
83 | Q_D(QIntervalsAxis); |
|
86 | Q_D(QIntervalsAxis); | |
84 |
|
87 | |||
85 | if (!d->m_intervals.contains(intervalLabel)) |
|
88 | if (!d->m_intervals.contains(intervalLabel)) | |
86 | { |
|
89 | { | |
87 | if(d->m_intervals.isEmpty()){ |
|
90 | if(d->m_intervals.isEmpty()){ | |
88 | Range range(d->m_categoryMinimum,interval); |
|
91 | Range range(d->m_categoryMinimum, intervalEnd); | |
89 | d->m_intervalsMap.insert(intervalLabel, range); |
|
92 | d->m_intervalsMap.insert(intervalLabel, range); | |
90 | d->m_intervals.append(intervalLabel); |
|
93 | d->m_intervals.append(intervalLabel); | |
91 | }else if (interval > intervalMax(d->m_intervals.last())){ |
|
94 | }else if (intervalEnd > intervalMax(d->m_intervals.last())){ | |
92 | Range range = d->m_intervalsMap.value(d->m_intervals.last()); |
|
95 | Range range = d->m_intervalsMap.value(d->m_intervals.last()); | |
93 | d->m_intervalsMap.insert(intervalLabel, Range(range.second,interval)); |
|
96 | d->m_intervalsMap.insert(intervalLabel, Range(range.second, intervalEnd)); | |
94 | d->m_intervals.append(intervalLabel); |
|
97 | d->m_intervals.append(intervalLabel); | |
95 | } |
|
98 | } | |
96 | } |
|
99 | } | |
@@ -159,7 +162,7 void QIntervalsAxis::remove(const QString &intervalLabel) | |||||
159 | } |
|
162 | } | |
160 | } |
|
163 | } | |
161 |
|
164 | |||
162 | void QIntervalsAxis::replace(const QString& oldLabel, const QString& newLabel) |
|
165 | void QIntervalsAxis::replaceLabel(const QString& oldLabel, const QString& newLabel) | |
163 | { |
|
166 | { | |
164 | Q_D(QIntervalsAxis); |
|
167 | Q_D(QIntervalsAxis); | |
165 | int labelIndex = d->m_intervals.indexOf(oldLabel); |
|
168 | int labelIndex = d->m_intervals.indexOf(oldLabel); | |
@@ -182,7 +185,7 QStringList QIntervalsAxis::intervalsLabels() | |||||
182 | } |
|
185 | } | |
183 |
|
186 | |||
184 | /*! |
|
187 | /*! | |
185 |
Returns number of |
|
188 | Returns number of intervals. | |
186 | */ |
|
189 | */ | |
187 | int QIntervalsAxis::count() const |
|
190 | int QIntervalsAxis::count() const | |
188 | { |
|
191 | { |
@@ -42,9 +42,9 protected: | |||||
42 | public: |
|
42 | public: | |
43 | AxisType type() const; |
|
43 | AxisType type() const; | |
44 |
|
44 | |||
45 |
void append(const QString& label, qreal interval |
|
45 | void append(const QString& label, qreal intervalEnd); | |
46 | void remove(const QString& label); |
|
46 | void remove(const QString& label); | |
47 | void replace(const QString& oldLabel, const QString& newLabel); |
|
47 | void replaceLabel(const QString& oldLabel, const QString& newLabel); | |
48 |
|
48 | |||
49 | void setFisrtIntervalMinimum(qreal min); |
|
49 | void setFisrtIntervalMinimum(qreal min); | |
50 |
|
50 |
General Comments 0
You need to be logged in to leave comments.
Login now