From 292c1267fda2da9b413532c1ef6cc915cdc95563 Mon Sep 17 00:00:00 2001
From: Eric Price <eric.price@tuebingen.mpg.de>
Date: Wed, 22 Mar 2017 10:24:44 +0100
Subject: [PATCH] LP-498 corrected comment lines per review suggestion
---
.../opmapcontrol/src/mapwidget/navitem.cpp | 2 +-
.../src/mapwidget/waypointitem.cpp | 34 -------------------
2 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/navitem.cpp b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/navitem.cpp
index a3e6ce085..1820135c5 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/navitem.cpp
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/navitem.cpp
@@ -2,7 +2,7 @@
******************************************************************************
*
* @file navitem.cpp
- * @author The LibrePilot Project, http://www.openpilot.org Copyright (C) 2017.
+ * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @brief A graphicsItem representing a WayPoint
* @see The GNU Public License (GPL) Version 3
* @defgroup OPMapWidget
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
index 25c5810a2..010a5c393 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
@@ -45,15 +45,6 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & alti
RefreshToolTip();
RefreshPos();
myHome = map->Home;
- // QList<QGraphicsItem *> list = map->childItems(); WTF?!?!?!?!????????
- // foreach(QGraphicsItem * obj, list) {
- // HomeItem *h = qgraphicsitem_cast <HomeItem *>(obj);
-
- // if (h) {
- // myHome = h;
- // }
- // }
-
if (myHome) {
map->Projection()->offSetFromLatLngs(myHome->Coord(), coord, relativeCoord.distance, relativeCoord.bearing);
relativeCoord.altitudeRelative = Altitude() - myHome->Altitude();
@@ -89,15 +80,6 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint) : reached(fa
RefreshToolTip();
RefreshPos();
myHome = map->Home;
- // QList<QGraphicsItem *> list = map->childItems(); WTF?!?!?!?!????????
- // foreach(QGraphicsItem * obj, list) {
- // HomeItem *h = qgraphicsitem_cast <HomeItem *>(obj);
-
- // if (h) {
- // myHome = h;
- // }
- // }
-
if (myHome) {
coord = map->Projection()->translate(myHome->Coord(), relativeCoord.distance, relativeCoord.bearing);
SetAltitude(myHome->Altitude() + relativeCoord.altitudeRelative);
@@ -123,14 +105,6 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & alti
RefreshToolTip();
RefreshPos();
myHome = map->Home;
- // QList<QGraphicsItem *> list = map->childItems(); WTF?!?!?!?!????????
- // foreach(QGraphicsItem * obj, list) {
- // HomeItem *h = qgraphicsitem_cast <HomeItem *>(obj);
-
- // if (h) {
- // myHome = h;
- // }
- // }
if (myHome) {
map->Projection()->offSetFromLatLngs(myHome->Coord(), coord, relativeCoord.distance, relativeCoord.bearing);
relativeCoord.altitudeRelative = Altitude() - myHome->Altitude();
@@ -145,14 +119,6 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & alti
WayPointItem::WayPointItem(const distBearingAltitude &relativeCoordenate, const QString &description, MapGraphicItem *map) : relativeCoord(relativeCoordenate), reached(false), description(description), shownumber(true), isDragging(false), map(map)
{
myHome = map->Home;
- // QList<QGraphicsItem *> list = map->childItems(); WTF?!?!?!?!????????
- // foreach(QGraphicsItem * obj, list) {
- // HomeItem *h = qgraphicsitem_cast <HomeItem *>(obj);
-
- // if (h) {
- // myHome = h;
- // }
- // }
if (myHome) {
connect(myHome, SIGNAL(homePositionChanged(internals::PointLatLng, float)), this, SLOT(onHomePositionChanged(internals::PointLatLng, float)));
coord = map->Projection()->translate(myHome->Coord(), relativeCoord.distance, relativeCoord.bearing);