From 8c31a198a850fa1f5b12669bb8eea5303495a187 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 25 Aug 2018 13:10:51 -0700 Subject: [PATCH] Removed setCoordinate support to reduce confusion --- src/MissionManager/MissionItem.cc | 7 ------- src/MissionManager/MissionItem.h | 1 - src/MissionManager/MissionManagerTest.cc | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/MissionManager/MissionItem.cc b/src/MissionManager/MissionItem.cc index c35203fe4..f495f6a84 100644 --- a/src/MissionManager/MissionItem.cc +++ b/src/MissionManager/MissionItem.cc @@ -409,13 +409,6 @@ void MissionItem::setParam7(double param) } } -void MissionItem::setCoordinate(const QGeoCoordinate& coordinate) -{ - setParam5(coordinate.latitude()); - setParam6(coordinate.longitude()); - setParam7(coordinate.altitude()); -} - QGeoCoordinate MissionItem::coordinate(void) const { if(!std::isfinite(param5()) || !std::isfinite(param6())) { diff --git a/src/MissionManager/MissionItem.h b/src/MissionManager/MissionItem.h index ccc2b53bd..fb8cab6d9 100644 --- a/src/MissionManager/MissionItem.h +++ b/src/MissionManager/MissionItem.h @@ -96,7 +96,6 @@ public: void setParam5 (double param5); void setParam6 (double param6); void setParam7 (double param7); - void setCoordinate (const QGeoCoordinate& coordinate); void save(QJsonObject& json) const; bool load(QTextStream &loadStream); diff --git a/src/MissionManager/MissionManagerTest.cc b/src/MissionManager/MissionManagerTest.cc index 4a2fdc796..f354ee394 100644 --- a/src/MissionManager/MissionManagerTest.cc +++ b/src/MissionManager/MissionManagerTest.cc @@ -37,7 +37,9 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f // Editor has a home position item on the front, so we do the same MissionItem* homeItem = new MissionItem(NULL /* Vehicle */, this); homeItem->setCommand(MAV_CMD_NAV_WAYPOINT); - homeItem->setCoordinate(QGeoCoordinate(47.3769, 8.549444, 0)); + homeItem->setParam5(47.3769); + homeItem->setParam6(8.549444); + homeItem->setParam7(0); homeItem->setSequenceNumber(0); missionItems.append(homeItem); -- 2.22.0