Browse Source

Removed setCoordinate support to reduce confusion

QGC4.4
Don Gagne 7 years ago committed by Gus Grubba
parent
commit
8c31a198a8
  1. 7
      src/MissionManager/MissionItem.cc
  2. 1
      src/MissionManager/MissionItem.h
  3. 4
      src/MissionManager/MissionManagerTest.cc

7
src/MissionManager/MissionItem.cc

@ -409,13 +409,6 @@ void MissionItem::setParam7(double param) @@ -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())) {

1
src/MissionManager/MissionItem.h

@ -96,7 +96,6 @@ public: @@ -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);

4
src/MissionManager/MissionManagerTest.cc

@ -37,7 +37,9 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f @@ -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);

Loading…
Cancel
Save