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
861e7ff9
Commit
861e7ff9
authored
Aug 25, 2018
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
353853f3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
MissionItem.cc
src/MissionManager/MissionItem.cc
+0
-7
MissionItem.h
src/MissionManager/MissionItem.h
+0
-1
MissionManagerTest.cc
src/MissionManager/MissionManagerTest.cc
+3
-1
No files found.
src/MissionManager/MissionItem.cc
View file @
861e7ff9
...
@@ -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
QGeoCoordinate
MissionItem
::
coordinate
(
void
)
const
{
{
return
QGeoCoordinate
(
param5
(),
param6
(),
param7
());
return
QGeoCoordinate
(
param5
(),
param6
(),
param7
());
...
...
src/MissionManager/MissionItem.h
View file @
861e7ff9
...
@@ -96,7 +96,6 @@ public:
...
@@ -96,7 +96,6 @@ public:
void
setParam5
(
double
param5
);
void
setParam5
(
double
param5
);
void
setParam6
(
double
param6
);
void
setParam6
(
double
param6
);
void
setParam7
(
double
param7
);
void
setParam7
(
double
param7
);
void
setCoordinate
(
const
QGeoCoordinate
&
coordinate
);
void
save
(
QJsonObject
&
json
)
const
;
void
save
(
QJsonObject
&
json
)
const
;
bool
load
(
QTextStream
&
loadStream
);
bool
load
(
QTextStream
&
loadStream
);
...
...
src/MissionManager/MissionManagerTest.cc
View file @
861e7ff9
...
@@ -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
// Editor has a home position item on the front, so we do the same
MissionItem
*
homeItem
=
new
MissionItem
(
NULL
/* Vehicle */
,
this
);
MissionItem
*
homeItem
=
new
MissionItem
(
NULL
/* Vehicle */
,
this
);
homeItem
->
setCommand
(
MAV_CMD_NAV_WAYPOINT
);
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
);
homeItem
->
setSequenceNumber
(
0
);
missionItems
.
append
(
homeItem
);
missionItems
.
append
(
homeItem
);
...
...
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