Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0ed293bd
Commit
0ed293bd
authored
Nov 25, 2015
by
Don Gagne
Browse files
New item uses altitude from last item
parent
dcd33841
Changes
2
Show whitespace changes
Inline
Side-by-side
src/MissionManager/MissionController.cc
View file @
0ed293bd
...
...
@@ -168,6 +168,9 @@ int MissionController::addMissionItem(QGeoCoordinate coordinate)
newItem
->
setCommand
(
MavlinkQmlSingleton
::
MAV_CMD_NAV_TAKEOFF
);
}
newItem
->
setDefaultsForCommand
();
if
(
newItem
->
command
()
==
MAV_CMD_NAV_WAYPOINT
)
{
newItem
->
setParam7
(
_findLastAltitude
());
}
_missionItems
->
append
(
newItem
);
_recalcAll
();
...
...
@@ -592,3 +595,18 @@ QmlObjectListModel* MissionController::missionItems(void)
{
return
_missionItems
;
}
double
MissionController
::
_findLastAltitude
(
void
)
{
double
lastAltitude
=
MissionItem
::
defaultAltitude
;
for
(
int
i
=
0
;
i
<
_missionItems
->
count
();
i
++
)
{
MissionItem
*
item
=
qobject_cast
<
MissionItem
*>
(
_missionItems
->
get
(
i
));
if
(
item
->
specifiesCoordinate
())
{
lastAltitude
=
item
->
param7
();
}
}
return
lastAltitude
;
}
src/MissionManager/MissionController.h
View file @
0ed293bd
...
...
@@ -95,6 +95,7 @@ private:
void
_setupMissionItems
(
bool
loadFromVehicle
,
bool
forceLoad
);
void
_setupActiveVehicle
(
Vehicle
*
activeVehicle
,
bool
forceLoadFromVehicle
);
double
_calcDistance
(
bool
homePositionValid
,
double
homeAlt
,
MissionItem
*
item1
,
MissionItem
*
item2
);
double
_findLastAltitude
(
void
);
private:
bool
_editMode
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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