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
7fdb00b0
Commit
7fdb00b0
authored
Oct 10, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trying to add wp to flight view
parent
debee651
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
6 deletions
+26
-6
VisualMissionItem.cc
src/MissionManager/VisualMissionItem.cc
+1
-1
WimaController.cc
src/Wima/WimaController.cc
+25
-5
No files found.
src/MissionManager/VisualMissionItem.cc
View file @
7fdb00b0
...
...
@@ -79,7 +79,7 @@ const VisualMissionItem& VisualMissionItem::operator=(const VisualMissionItem& o
_vehicle
=
other
.
_vehicle
;
setIsCurrentItem
(
other
.
_isCurrentItem
);
setDirty
(
other
.
_dirty
)
;
_dirty
=
other
.
_dirty
;
_homePositionSpecialCase
=
other
.
_homePositionSpecialCase
;
_terrainAltitude
=
other
.
_terrainAltitude
;
setAltDifference
(
other
.
_altDifference
);
...
...
src/Wima/WimaController.cc
View file @
7fdb00b0
...
...
@@ -211,13 +211,33 @@ void WimaController::containerDataValidChanged(bool valid)
QList
<
const
MissionItem
*>
tempMissionItems
=
planData
.
missionItems
();
for
(
auto
missionItem
:
tempMissionItems
)
_missionItems
.
append
(
const_cast
<
MissionItem
*>
(
missionItem
));
// losing const qualifier here
_missionController
->
removeAll
();
QmlObjectListModel
*
missionItems
=
_missionController
->
visualItems
();
QmlObjectListModel
*
mission
ControllerVisual
Items
=
_missionController
->
visualItems
();
for
(
auto
missionItem
:
tempMissionItems
)
_missionController
->
insertSimpleMissionItem
(
*
missionItem
,
missionItems
->
count
());
_missionController
->
insertSimpleMissionItem
(
*
missionItem
,
missionControllerVisualItems
->
count
());
MissionSettingsItem
*
settingsItem
=
qobject_cast
<
MissionSettingsItem
*>
((
*
missionControllerVisualItems
)[
0
]);
if
(
settingsItem
==
nullptr
)
{
qWarning
(
"WimaController::containerDataValidChanged(): Nullptr at MissionSettingsItem!"
);
return
;
}
//_missionItems.append(settingsItem);
for
(
int
i
=
1
;
i
<
missionControllerVisualItems
->
count
();
i
++
)
{
SimpleMissionItem
*
visualItem
=
qobject_cast
<
SimpleMissionItem
*>
((
*
missionControllerVisualItems
)[
i
]);
if
(
visualItem
==
nullptr
)
{
qWarning
(
"WimaController::containerDataValidChanged(): Nullptr at SimpleMissionItem!"
);
return
;
}
SimpleMissionItem
*
visualItemCopy
=
new
SimpleMissionItem
(
*
visualItem
,
true
,
this
);
_missionItems
.
append
(
visualItemCopy
);
}
// remove warnings if you read this
qWarning
(
"Mission Item count:"
);
qWarning
()
<<
_missionItems
.
count
();
_missionController
->
removeAll
();
if
(
areaCounter
==
numAreas
)
_localPlanDataValid
=
true
;
...
...
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