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
ceaa61ac
Commit
ceaa61ac
authored
Nov 26, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2286 from DonLakeFlyer/LastAltitude
New item uses altitude from last item
parents
f2d6f386
c24e1e4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
0 deletions
+19
-0
MissionController.cc
src/MissionManager/MissionController.cc
+18
-0
MissionController.h
src/MissionManager/MissionController.h
+1
-0
No files found.
src/MissionManager/MissionController.cc
View file @
ceaa61ac
...
...
@@ -168,6 +168,9 @@ int MissionController::addMissionItem(QGeoCoordinate coordinate)
newItem
->
setCommand
(
MavlinkQmlSingleton
::
MAV_CMD_NAV_TAKEOFF
);
}
newItem
->
setDefaultsForCommand
();
if
((
MAV_CMD
)
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 @
ceaa61ac
...
...
@@ -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
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