Commit 65210eff authored by Valentin Platzgummer's avatar Valentin Platzgummer

some bugs solved

parent 5e62e791
This diff is collapsed.
...@@ -57,6 +57,7 @@ public: ...@@ -57,6 +57,7 @@ public:
void setJoinedArea(const WimaJoinedAreaData &jArea); void setJoinedArea(const WimaJoinedAreaData &jArea);
void setMeasurementArea(const WimaMeasurementArea &mArea); void setMeasurementArea(const WimaMeasurementArea &mArea);
void setJoinedArea(const WimaJoinedArea &jArea); void setJoinedArea(const WimaJoinedArea &jArea);
void setDepot(const QGeoCoordinate &depot);
// Property getters // Property getters
QGeoCoordinate refPoint() const; QGeoCoordinate refPoint() const;
...@@ -155,6 +156,7 @@ private: ...@@ -155,6 +156,7 @@ private:
// Area data // Area data
WimaMeasurementAreaData _mArea; WimaMeasurementAreaData _mArea;
WimaJoinedAreaData _jArea; WimaJoinedAreaData _jArea;
QGeoCoordinate _depot;
// Worker // Worker
using PtrWorker = std::shared_ptr<RoutingThread>; using PtrWorker = std::shared_ptr<RoutingThread>;
......
...@@ -240,10 +240,11 @@ bool WimaMeasurementArea::loadFromJson(const QJsonObject &json, ...@@ -240,10 +240,11 @@ bool WimaMeasurementArea::loadFromJson(const QJsonObject &json,
} }
bool WimaMeasurementArea::setProgress(const QVector<int> &p) { bool WimaMeasurementArea::setProgress(const QVector<int> &p) {
if (!ready()) { if (ready()) {
if (p.size() == this->tiles()->count() && this->_progress != p) { if (p.size() == this->tiles()->count() && this->_progress != p) {
this->_progress = p; this->_progress = p;
emit progressChanged(); emit progressChanged();
emit progressAccepted();
return true; return true;
} }
} }
......
...@@ -92,6 +92,7 @@ signals: ...@@ -92,6 +92,7 @@ signals:
void tilesChanged(); void tilesChanged();
void maxTilesChanged(); void maxTilesChanged();
void progressChanged(); void progressChanged();
void progressAccepted();
void readyChanged(); void readyChanged();
public slots: public slots:
......
...@@ -61,6 +61,7 @@ WimaPlaner::WimaPlaner(QObject *parent) ...@@ -61,6 +61,7 @@ WimaPlaner::WimaPlaner(QObject *parent)
// NemoInterface // NemoInterface
connect(&this->_nemoInterface, &NemoInterface::progressChanged, [this] { connect(&this->_nemoInterface, &NemoInterface::progressChanged, [this] {
this->_measurementArea.setProgress(this->_nemoInterface.progress()); this->_measurementArea.setProgress(this->_nemoInterface.progress());
this->_update();
}); });
// StateMachine // StateMachine
...@@ -340,6 +341,7 @@ void WimaPlaner::_update() { ...@@ -340,6 +341,7 @@ void WimaPlaner::_update() {
&WimaPlaner::CSCalculatingChangedHandler); &WimaPlaner::CSCalculatingChangedHandler);
_survey->setMeasurementArea(this->_measurementArea); _survey->setMeasurementArea(this->_measurementArea);
_survey->setJoinedArea(this->_joinedArea); _survey->setJoinedArea(this->_joinedArea);
_survey->setDepot(this->_serviceArea.depot());
connect(_survey, &CircularSurvey::calculatingChanged, this, connect(_survey, &CircularSurvey::calculatingChanged, this,
&WimaPlaner::CSCalculatingChangedHandler); &WimaPlaner::CSCalculatingChangedHandler);
...@@ -491,6 +493,8 @@ void WimaPlaner::mAreaProgressChangedHandler() { ...@@ -491,6 +493,8 @@ void WimaPlaner::mAreaProgressChangedHandler() {
this->_stateMachine->updateState(EVENT::M_AREA_PROGRESS_CHANGED); this->_stateMachine->updateState(EVENT::M_AREA_PROGRESS_CHANGED);
} }
void WimaPlaner::mAreaProgressAcceptedHandler() { this->_update(); }
void WimaPlaner::sAreaPathChangedHandler() { void WimaPlaner::sAreaPathChangedHandler() {
this->_stateMachine->updateState(EVENT::S_AREA_PATH_CHANGED); this->_stateMachine->updateState(EVENT::S_AREA_PATH_CHANGED);
} }
...@@ -776,6 +780,8 @@ void WimaPlaner::enableMonitoring() { ...@@ -776,6 +780,8 @@ void WimaPlaner::enableMonitoring() {
&WimaPlaner::mAreaTilesChangedHandler); &WimaPlaner::mAreaTilesChangedHandler);
connect(&this->_measurementArea, &WimaMeasurementArea::progressChanged, this, connect(&this->_measurementArea, &WimaMeasurementArea::progressChanged, this,
&WimaPlaner::mAreaProgressChangedHandler); &WimaPlaner::mAreaProgressChangedHandler);
connect(&this->_measurementArea, &WimaMeasurementArea::progressAccepted, this,
&WimaPlaner::mAreaProgressAcceptedHandler);
connect(&this->_serviceArea, &WimaArea::pathChanged, this, connect(&this->_serviceArea, &WimaArea::pathChanged, this,
&WimaPlaner::sAreaPathChangedHandler); &WimaPlaner::sAreaPathChangedHandler);
connect(&this->_serviceArea, &WimaServiceArea::depotChanged, this, connect(&this->_serviceArea, &WimaServiceArea::depotChanged, this,
......
...@@ -126,6 +126,7 @@ private slots: ...@@ -126,6 +126,7 @@ private slots:
void mAreaPathChangedHandler(); void mAreaPathChangedHandler();
void mAreaTilesChangedHandler(); void mAreaTilesChangedHandler();
void mAreaProgressChangedHandler(); void mAreaProgressChangedHandler();
void mAreaProgressAcceptedHandler();
void sAreaPathChangedHandler(); void sAreaPathChangedHandler();
void corridorPathChangedHandler(); void corridorPathChangedHandler();
void depotChangedHandler(); void depotChangedHandler();
......
...@@ -132,11 +132,11 @@ Item { ...@@ -132,11 +132,11 @@ Item {
} }
} }
function getColor(progress) { function getColor(progress) {
if (progress < 25) if (progress === 0)
return "transparent" return "transparent"
if (progress < 50) if (progress < 33)
return "orange" return "orange"
if (progress < 75) if (progress < 66)
return "yellow" return "yellow"
if (progress < 100) if (progress < 100)
return "greenyellow" return "greenyellow"
...@@ -150,7 +150,8 @@ Item { ...@@ -150,7 +150,8 @@ Item {
Item{ Item{
property var _tileComponent property var _tileComponent
property int _progress: _root.areaItem.progress.length property int _progress: _root.areaItem.progress[index] ?
_root.areaItem.progress[index] : 0
Component.onCompleted: { Component.onCompleted: {
_tileComponent = tileComponent.createObject(map) _tileComponent = tileComponent.createObject(map)
......
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