Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b32f3527
Unverified
Commit
b32f3527
authored
Mar 06, 2020
by
Don Gagne
Committed by
GitHub
Mar 06, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8496 from DonLakeFlyer/TakeoffItemWizard
Takeoff item wizard mode fix
parents
31bf8a24
685cb036
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
TakeoffMissionItem.cc
src/MissionManager/TakeoffMissionItem.cc
+4
-1
No files found.
src/MissionManager/TakeoffMissionItem.cc
View file @
b32f3527
...
...
@@ -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)
_initLaunchTakeoffAtSameLocation
();
if
(
homePosition
.
isValid
()
&&
coordinate
().
isValid
())
{
// Item already full specified, most likely from mission load from storage
// Item already full
y
specified, most likely from mission load from storage
_wizardMode
=
false
;
}
else
{
if
(
_launchTakeoffAtSameLocation
&&
homePosition
.
isValid
())
{
...
...
@@ -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
if
(
success
)
{
_initLaunchTakeoffAtSameLocation
();
}
_wizardMode
=
false
;
// Always be off for loaded items
return
success
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment