Commit 92506689 authored by Valentin Platzgummer's avatar Valentin Platzgummer

propgress issue solved

parent 500ee39a
...@@ -248,6 +248,7 @@ bool NemoInterface::Impl::doTopicServiceSetup() { ...@@ -248,6 +248,7 @@ bool NemoInterface::Impl::doTopicServiceSetup() {
progressMsg.progress().clear(); progressMsg.progress().clear();
qgcApp()->showMessage("Invalid progress message received."); qgcApp()->showMessage("Invalid progress message received.");
} }
emit this->parent->progressChanged();
lk1.unlock(); lk1.unlock();
lk2.unlock(); lk2.unlock();
......
...@@ -90,11 +90,11 @@ MissionController *WimaController::missionController() { ...@@ -90,11 +90,11 @@ MissionController *WimaController::missionController() {
QmlObjectListModel *WimaController::visualItems() { return &_areas; } QmlObjectListModel *WimaController::visualItems() { return &_areas; }
QmlObjectListModel *WimaController::missionItems() { QmlObjectListModel *WimaController::missionItems() {
return const_cast<QmlObjectListModel *>(&_currentWM->missionItems()); return const_cast<QmlObjectListModel *>(&_currentWM->currentMissionItems());
} }
QVariantList WimaController::waypointPath() { QVariantList WimaController::waypointPath() {
return const_cast<QVariantList &>(_currentWM->waypointsVariant()); return const_cast<QVariantList &>(_currentWM->currentWaypointsVariant());
} }
Fact *WimaController::enableWimaController() { return &_enableWimaController; } Fact *WimaController::enableWimaController() { return &_enableWimaController; }
......
...@@ -144,8 +144,8 @@ void WimaPlaner::setProgressLocked(bool l) { ...@@ -144,8 +144,8 @@ void WimaPlaner::setProgressLocked(bool l) {
this->_progressLocked = l; this->_progressLocked = l;
emit progressLockedChanged(); emit progressLockedChanged();
if (!this->_progressLocked) { if (!this->_progressLocked) {
this->_measurementArea.setProgress(this->_nemoInterface.progress()); if (this->_measurementArea.setProgress(this->_nemoInterface.progress()))
this->_update(); this->_update();
} }
} }
} }
......
...@@ -323,7 +323,7 @@ Rectangle { ...@@ -323,7 +323,7 @@ Rectangle {
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
QGCCheckBox { QGCCheckBox {
property var nemo: wimaPlaner ? wimaPlaner.nemoInterface : undefined property var nemo: wimaPlaner ? wimaPlaner.nemoInterface : undefined
text: qsTr("Lock Progress") text: qsTr("Lock Progress")
...@@ -336,12 +336,10 @@ Rectangle { ...@@ -336,12 +336,10 @@ Rectangle {
} else { } else {
wimaPlaner.progressLocked = false wimaPlaner.progressLocked = false
} }
checked = Qt.binding(function(){return wimaPlaner.progressLocked})
} }
} }
Layout.minimumWidth: _mediumValueWidth Layout.minimumWidth: _mediumValueWidth
} }
} }
} }
......
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