From 17ab241a6d9756fd2564fa31d6117eb87657d699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C3=B9ma?= Date: Sat, 19 Mar 2016 09:06:43 +0100 Subject: [PATCH] Refactoring --- src/graphview.cpp | 5 +++-- src/poi.cpp | 18 ++++++++++-------- src/trackview.cpp | 26 ++++++++++++++++---------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/graphview.cpp b/src/graphview.cpp index fe2826ea..fa4064e2 100644 --- a/src/graphview.cpp +++ b/src/graphview.cpp @@ -140,8 +140,9 @@ void GraphView::loadData(const QVector &data) updateBounds(data.at(0)); path.moveTo(data.at(0).x(), -data.at(0).y()); for (int i = 1; i < data.size(); i++) { - path.lineTo(data.at(i).x(), -data.at(i).y()); - updateBounds(data.at(i)); + const QPointF &p = data.at(i); + path.lineTo(p.x(), -p.y()); + updateBounds(p); } pi = new QGraphicsPathItem(path); diff --git a/src/poi.cpp b/src/poi.cpp index be949ae7..79c73f29 100644 --- a/src/poi.cpp +++ b/src/poi.cpp @@ -46,14 +46,14 @@ bool POI::loadGPXFile(const QString &fileName) if (gpx.loadFile(fileName)) { for (int i = 0; i < gpx.waypoints().size(); i++) - _data.append(Waypoint(gpx.waypoints().at(i).coordinates(), - gpx.waypoints().at(i).description())); + _data.append(gpx.waypoints().at(i)); index.end = _data.size() - 1; for (int i = index.start; i <= index.end; i++) { + const QPointF &p = _data.at(i).coordinates(); qreal c[2]; - c[0] = _data.at(i).coordinates().x(); - c[1] = _data.at(i).coordinates().y(); + c[0] = p.x(); + c[1] = p.y(); _tree.Insert(c, c, i); } @@ -114,9 +114,10 @@ bool POI::loadCSVFile(const QString &fileName) index.end = _data.size() - 1; for (int i = index.start; i <= index.end; i++) { + const QPointF &p = _data.at(i).coordinates(); qreal c[2]; - c[0] = _data.at(i).coordinates().x(); - c[1] = _data.at(i).coordinates().y(); + c[0] = p.x(); + c[1] = p.y(); _tree.Insert(c, c, i); } @@ -173,9 +174,10 @@ void POI::enableFile(const QString &fileName, bool enable) continue; for (int j = idx.start; j <= idx.end; j++) { + const QPointF &p = _data.at(j).coordinates(); qreal c[2]; - c[0] = _data.at(j).coordinates().x(); - c[1] = _data.at(j).coordinates().y(); + c[0] = p.x(); + c[1] = p.y(); _tree.Insert(c, c, j); } } diff --git a/src/trackview.cpp b/src/trackview.cpp index 21df51d7..7c64b636 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -54,9 +54,12 @@ void TrackView::addTrack(const QVector &track) _tracks.append(track); - path.moveTo(ll2mercator(QPointF(track.at(0).x(), -track.at(0).y()))); - for (int i = 1; i < track.size(); i++) - path.lineTo(ll2mercator(QPointF(track.at(i).x(), -track.at(i).y()))); + const QPointF &p = track.at(0); + path.moveTo(ll2mercator(QPointF(p.x(), -p.y()))); + for (int i = 1; i < track.size(); i++) { + const QPointF &p = track.at(i); + path.lineTo(ll2mercator(QPointF(p.x(), -p.y()))); + } _maxLen = qMax(path.length(), _maxLen); @@ -80,16 +83,17 @@ void TrackView::addTrack(const QVector &track) void TrackView::addWaypoints(const QList &waypoints) { for (int i = 0; i < waypoints.count(); i++) { + const Waypoint &w = waypoints.at(i); WaypointItem *wi = new WaypointItem( - Waypoint(ll2mercator(QPointF(waypoints.at(i).coordinates().x(), - -waypoints.at(i).coordinates().y())), waypoints.at(i).description())); + Waypoint(ll2mercator(QPointF(w.coordinates().x(), + -w.coordinates().y())), w.description())); wi->setPos(wi->entry().coordinates() * 1.0/_scale); wi->setZValue(1); _scene->addItem(wi); _locations.append(wi); - _waypoints.append(waypoints.at(i).coordinates()); + _waypoints.append(w.coordinates()); } _zoom = qMin(_zoom, scale2zoom(waypointScale())); @@ -246,18 +250,20 @@ void TrackView::rescale(qreal scale) void TrackView::addPOI(const QVector &waypoints) { for (int i = 0; i < waypoints.size(); i++) { - if (_pois.contains(waypoints.at(i))) + const Waypoint &w = waypoints.at(i); + + if (_pois.contains(w)) continue; WaypointItem *pi = new WaypointItem( - Waypoint(ll2mercator(QPointF(waypoints.at(i).coordinates().x(), - -waypoints.at(i).coordinates().y())), waypoints.at(i).description())); + Waypoint(ll2mercator(QPointF(w.coordinates().x(), + -w.coordinates().y())), w.description())); pi->setPos(pi->entry().coordinates() * 1.0/_scale); pi->setZValue(1); _scene->addItem(pi); - _pois.insert(waypoints.at(i), pi); + _pois.insert(w, pi); } }