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
8cbb74a1
Commit
8cbb74a1
authored
Oct 14, 2020
by
Valentin Platzgummer
Browse files
race cond lambda removed from wima planer
parent
d1eac7fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Wima/WimaPlaner.cc
View file @
8cbb74a1
...
...
@@ -61,10 +61,8 @@ WimaPlaner::WimaPlaner(QObject *parent)
#endif
// NemoInterface
connect
(
&
this
->
_nemoInterface
,
&
NemoInterface
::
progressChanged
,
[
this
]
{
this
->
_measurementArea
.
setProgress
(
this
->
_nemoInterface
.
progress
());
this
->
_update
();
});
connect
(
&
this
->
_nemoInterface
,
&
NemoInterface
::
progressChanged
,
this
,
&
WimaPlaner
::
nemoInterfaceProgressChangedHandler
);
// StateMachine
connect
(
this
->
_stateMachine
.
get
(),
&
StateMachine
::
upToDateChanged
,
this
,
...
...
@@ -558,6 +556,11 @@ void WimaPlaner::missionControllerMissionItemCountChangedHandler() {
missionControllerVisualItemsChangedHandler
();
}
void
WimaPlaner
::
nemoInterfaceProgressChangedHandler
()
{
this
->
_measurementArea
.
setProgress
(
this
->
_nemoInterface
.
progress
());
this
->
_update
();
}
void
WimaPlaner
::
saveToCurrent
()
{
saveToFile
(
_currentFile
);
}
void
WimaPlaner
::
saveToFile
(
const
QString
&
filename
)
{
...
...
src/Wima/WimaPlaner.h
View file @
8cbb74a1
...
...
@@ -139,6 +139,7 @@ private slots:
void
missionControllerWaypointPathChangedHandler
();
void
missionControllerNewItemsFromVehicleHandler
();
void
missionControllerMissionItemCountChangedHandler
();
void
nemoInterfaceProgressChangedHandler
();
#ifndef NDEBUG
void
autoLoadMission
(
void
);
...
...
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