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
b9e20a58
Commit
b9e20a58
authored
Dec 30, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs found by unit tests
parent
9c82f915
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
MissionItem.cc
src/MissionManager/MissionItem.cc
+2
-2
No files found.
src/MissionManager/MissionItem.cc
View file @
b9e20a58
...
...
@@ -171,10 +171,10 @@ bool MissionItem::load(QTextStream &loadStream)
{
const
QStringList
&
wpParams
=
loadStream
.
readLine
().
split
(
"
\t
"
);
if
(
wpParams
.
size
()
==
12
)
{
setCommand
((
MAV_CMD
)
wpParams
[
3
].
toInt
());
// Has to be first since it triggers defaults to be set, which are then override by below set calls
setSequenceNumber
(
wpParams
[
0
].
toInt
());
setIsCurrentItem
(
wpParams
[
1
].
toInt
()
==
1
?
true
:
false
);
setFrame
((
MAV_FRAME
)
wpParams
[
2
].
toInt
());
setCommand
((
MAV_CMD
)
wpParams
[
3
].
toInt
());
setParam1
(
wpParams
[
4
].
toDouble
());
setParam2
(
wpParams
[
5
].
toDouble
());
setParam3
(
wpParams
[
6
].
toDouble
());
...
...
@@ -300,8 +300,8 @@ bool MissionItem::load(const QJsonObject& json, int sequenceNumber, QString& err
}
// Make sure to set these first since they can signal other changes
setFrame
((
MAV_FRAME
)
convertedJson
[
_jsonFrameKey
].
toInt
());
setCommand
((
MAV_CMD
)
convertedJson
[
_jsonCommandKey
].
toInt
());
setFrame
((
MAV_FRAME
)
convertedJson
[
_jsonFrameKey
].
toInt
());
_doJumpId
=
-
1
;
if
(
convertedJson
.
contains
(
_jsonDoJumpIdKey
))
{
...
...
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