summaryrefslogtreecommitdiffstats
path: root/src/charts/domain/logxydomain.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-23 18:15:52 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-26 09:07:14 +0200
commit10b3639bf28e384cec0eba882de1e73e91462a2e (patch)
treefb637f329c3ee93885d8aeafe6e8b76a166207a9 /src/charts/domain/logxydomain.cpp
parentb01f476957f31a109b5e293b596aee2fb3c07c7f (diff)
Use QList instead of QVector
Notice the following API changes: -void QXYSeries::replace(QVector<QPointF> points); +void QXYSeries::replace(const QList<QPointF> &points); -bool QAbstractBarSeries::append(QVector<QBarSet *> sets); +bool QAbstractBarSeries::append(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsAdded(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsRemoved(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -void QBoxPlotSeries::boxsetsAdded(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets); -void QBoxPlotSeries::boxsetsRemoved(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets); -bool QPieSeries::append(QVector<QPieSlice *> slices); +bool QPieSeries::append(const QList<QPieSlice *> &slices); -QPieSlice *QPieSeries::append(QString label, qreal value); +QPieSlice *QPieSeries::append(const QString &label, qreal value); -void QPieSeries::added(QVector<QPieSlice *> slices); +void QPieSeries::added(const QList<QPieSlice *> &slices); -void QPieSeries::removed(QVector<QPieSlice *> slices); +void QPieSeries::removed(const QList<QPieSlice *> &slices); These should be source compatible changes. Task-number: QTBUG-84469 Change-Id: I153796e9d8244c8e22819993ef26aa91e7b71f99 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/charts/domain/logxydomain.cpp')
-rw-r--r--src/charts/domain/logxydomain.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp
index fb77656c..7334ce52 100644
--- a/src/charts/domain/logxydomain.cpp
+++ b/src/charts/domain/logxydomain.cpp
@@ -168,29 +168,28 @@ QPointF LogXYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) cons
return QPointF(x, y);
}
-QVector<QPointF> LogXYDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF> &list) const
{
const qreal deltaX = m_size.width() / (m_logRightX - m_logLeftX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
- QVector<QPointF> result;
- result.resize(vector.count());
+ QList<QPointF> result;
+ result.resize(list.count());
- for (int i = 0; i < vector.count(); ++i) {
- if (vector[i].x() > 0) {
- qreal x = ((std::log10(vector[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
+ for (int i = 0; i < list.count(); ++i) {
+ if (list[i].x() > 0) {
+ qreal x = ((std::log10(list[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
if (m_reverseX)
x = m_size.width() - x;
- qreal y = (vector[i].y() - m_minY) * deltaY;
+ qreal y = (list[i].y() - m_minY) * deltaY;
if (!m_reverseY)
y = m_size.height() - y;
result[i].setX(x);
result[i].setY(y);
} else {
qWarning() << "Logarithms of zero and negative values are undefined.";
- return QVector<QPointF>();
+ return QList<QPointF>();
}
-
}
return result;
}