Commit 8cbb74a1 authored by Valentin Platzgummer's avatar Valentin Platzgummer

race cond lambda removed from wima planer

parent d1eac7fe
...@@ -61,10 +61,8 @@ WimaPlaner::WimaPlaner(QObject *parent) ...@@ -61,10 +61,8 @@ WimaPlaner::WimaPlaner(QObject *parent)
#endif #endif
// NemoInterface // NemoInterface
connect(&this->_nemoInterface, &NemoInterface::progressChanged, [this] { connect(&this->_nemoInterface, &NemoInterface::progressChanged, this,
this->_measurementArea.setProgress(this->_nemoInterface.progress()); &WimaPlaner::nemoInterfaceProgressChangedHandler);
this->_update();
});
// StateMachine // StateMachine
connect(this->_stateMachine.get(), &StateMachine::upToDateChanged, this, connect(this->_stateMachine.get(), &StateMachine::upToDateChanged, this,
...@@ -558,6 +556,11 @@ void WimaPlaner::missionControllerMissionItemCountChangedHandler() { ...@@ -558,6 +556,11 @@ void WimaPlaner::missionControllerMissionItemCountChangedHandler() {
missionControllerVisualItemsChangedHandler(); missionControllerVisualItemsChangedHandler();
} }
void WimaPlaner::nemoInterfaceProgressChangedHandler() {
this->_measurementArea.setProgress(this->_nemoInterface.progress());
this->_update();
}
void WimaPlaner::saveToCurrent() { saveToFile(_currentFile); } void WimaPlaner::saveToCurrent() { saveToFile(_currentFile); }
void WimaPlaner::saveToFile(const QString &filename) { void WimaPlaner::saveToFile(const QString &filename) {
......
...@@ -139,6 +139,7 @@ private slots: ...@@ -139,6 +139,7 @@ private slots:
void missionControllerWaypointPathChangedHandler(); void missionControllerWaypointPathChangedHandler();
void missionControllerNewItemsFromVehicleHandler(); void missionControllerNewItemsFromVehicleHandler();
void missionControllerMissionItemCountChangedHandler(); void missionControllerMissionItemCountChangedHandler();
void nemoInterfaceProgressChangedHandler();
#ifndef NDEBUG #ifndef NDEBUG
void autoLoadMission(void); void autoLoadMission(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment