Commit 92506689 authored by Valentin Platzgummer's avatar Valentin Platzgummer

propgress issue solved

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