Browse Source

Merge pull request #8496 from DonLakeFlyer/TakeoffItemWizard

Takeoff item wizard mode fix
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
b32f352764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/MissionManager/TakeoffMissionItem.cc

5
src/MissionManager/TakeoffMissionItem.cc

@ -39,6 +39,7 @@ TakeoffMissionItem::TakeoffMissionItem(const MissionItem& missionItem, Vehicle* @@ -39,6 +39,7 @@ TakeoffMissionItem::TakeoffMissionItem(const MissionItem& missionItem, Vehicle*
, _settingsItem (settingsItem)
{
_init();
_wizardMode = false;
}
TakeoffMissionItem::~TakeoffMissionItem()
@ -71,7 +72,7 @@ void TakeoffMissionItem::_init(void) @@ -71,7 +72,7 @@ void TakeoffMissionItem::_init(void)
_initLaunchTakeoffAtSameLocation();
if (homePosition.isValid() && coordinate().isValid()) {
// Item already full specified, most likely from mission load from storage
// Item already fully specified, most likely from mission load from storage
_wizardMode = false;
} else {
if (_launchTakeoffAtSameLocation && homePosition.isValid()) {
@ -139,6 +140,7 @@ bool TakeoffMissionItem::load(QTextStream &loadStream) @@ -139,6 +140,7 @@ bool TakeoffMissionItem::load(QTextStream &loadStream)
if (success) {
_initLaunchTakeoffAtSameLocation();
}
_wizardMode = false; // Always be off for loaded items
return success;
}
@ -148,6 +150,7 @@ bool TakeoffMissionItem::load(const QJsonObject& json, int sequenceNumber, QStri @@ -148,6 +150,7 @@ bool TakeoffMissionItem::load(const QJsonObject& json, int sequenceNumber, QStri
if (success) {
_initLaunchTakeoffAtSameLocation();
}
_wizardMode = false; // Always be off for loaded items
return success;
}

Loading…
Cancel
Save