wima planer state machine added

qgroundcontrol.pro

@@ -454,6 +454,7 @@ HEADERS += \
     src/Wima/Snake/SnakeTileLocal.h \
     src/Wima/Snake/SnakeTiles.h \
     src/Wima/Snake/SnakeTilesLocal.h \
+    src/Wima/StateMachine.h \
     src/Wima/WaypointManager/AreaInterface.h \
     src/Wima/WaypointManager/DefaultManager.h \
     src/Wima/WaypointManager/GenericWaypointManager.h \
@@ -515,6 +516,7 @@ SOURCES += \
     src/Wima/Snake/NemoInterface.cpp \
     src/Wima/Snake/QNemoProgress.cc \
     src/Wima/Snake/SnakeTile.cpp \
+    src/Wima/StateMachine.cpp \
     src/Wima/WaypointManager/AreaInterface.cpp \
     src/Wima/WaypointManager/DefaultManager.cpp \
     src/Wima/WaypointManager/GenericWaypointManager.cpp \

src/Wima/CircularSurvey.h

@@ -6,6 +6,9 @@
 #include "SettingsFact.h"
 #include "TransectStyleComplexItem.h"
 
+#include "Geometry/WimaJoinedAreaData.h"
+#include "Geometry/WimaMeasurementAreaData.h"
+
 class RoutingThread;
 class RoutingData;
 
@@ -50,8 +53,10 @@ public:
   // Property setters
   void setRefPoint(const QGeoCoordinate &refPt);
   void setHidePolygon(bool hide);
-  void setDepot(const QGeoCoordinate &depot);
-  void setSafeArea(const QList<QGeoCoordinate> &safeArea);
+  void setMeasurementArea(const WimaMeasurementAreaData &mArea);
+  void setJoinedArea(const WimaJoinedAreaData &jArea);
+  void setMeasurementArea(const WimaMeasurementArea &mArea);
+  void setJoinedArea(const WimaJoinedArea &jArea);
 
   // Property getters
   QGeoCoordinate refPoint() const;
@@ -68,7 +73,6 @@ public:
   QList<QString> variantNames() const;
   QList<QString> runNames() const;
   QGeoCoordinate depot() const;
-  QList<QGeoCoordinate> safeArea() const;
   const QList<QList<QGeoCoordinate>> &rawTransects() const;
 
   // Overrides
@@ -105,9 +109,10 @@ signals:
   void calculatingChanged();
   void hidePolygonChanged();
   void depotChanged();
-  void safeAreaChanged();
   void variantNamesChanged();
   void runNamesChanged();
+  void measurementAreaChanged();
+  void joinedAreaChanged();
 
 private slots:
   // Overrides from TransectStyleComplexItem
@@ -147,14 +152,16 @@ private:
   SettingsFact _run;
   QList<QString> _runNames;
 
+  // Area data
+  WimaMeasurementAreaData _mArea;
+  WimaJoinedAreaData _jArea;
+
   // Worker
   using PtrWorker = std::shared_ptr<RoutingThread>;
   PtrWorker _pWorker;
   PtrRoutingData _pRoutingData;
 
   // Routing data.
-  QGeoCoordinate _depot;
-  QList<QGeoCoordinate> _safeArea;
   QList<QList<QGeoCoordinate>> _rawTransects;
   using Runs = QVector<Transects>;
   QVector<Runs> _variantVector;

src/Wima/Geometry/GenericCircle.h

@@ -8,7 +8,7 @@
 #include "boost/units/systems/angle/degrees.hpp"
 #include "boost/units/systems/si.hpp"
 
-template <class Point, int k> auto get(Point &p);
+template <int k, class Point> auto get(const Point &p);
 
 namespace bu = boost::units;
 
@@ -112,11 +112,11 @@ void approximate(Circle &circ, long n, qty::Angle alpha1, qty::Angle alpha2,
   }
 
   double a = a1;
+  using Point =
+      std::remove_cv_t<std::remove_reference_t<decltype(circ.origin())>>;
   auto x0 = get<0>(circ.origin());
   auto y0 = get<1>(circ.origin());
   auto r = circ.radius();
-  using Point =
-      std::remove_cv_t<std::remove_reference_t<decltype(circ.origin())>>;
   using NumberType = std::remove_cv_t<std::remove_reference_t<decltype(x0)>>;
   while (n--) {
     auto x = NumberType(x0 + r * std::cos(a));
@@ -139,11 +139,11 @@ void approximate(Circle &circ, long n, Container &c) {
   }
 
   double a = 0;
+  using Point =
+      std::remove_cv_t<std::remove_reference_t<decltype(circ.origin())>>;
   auto x0 = get<0>(circ.origin());
   auto y0 = get<1>(circ.origin());
   auto r = circ.radius();
-  using Point =
-      std::remove_cv_t<std::remove_reference_t<decltype(circ.origin())>>;
   using NumberType = std::remove_cv_t<std::remove_reference_t<decltype(x0)>>;
   while (n--) {
     auto x = NumberType(x0 + r * std::cos(a));

src/Wima/Geometry/WimaAreaData.cc

 #include "WimaAreaData.h"
 
-WimaAreaData::WimaAreaData(QObject *parent) : QObject(parent) {
-  _maxAltitude = 0;
-}
+WimaAreaData::WimaAreaData(QObject *parent) : QObject(parent) {}
 
 WimaAreaData::~WimaAreaData() {}
 
-/*!
- * \fn double WimaAreaData::maxAltitude()
- *
- * Returns the maximum altitude at which vehicles are allowed to fly.
- */
-double WimaAreaData::maxAltitude() const { return _maxAltitude; }
+bool WimaAreaData::operator==(const WimaAreaData &data) const {
+  return this->_path == data._path && this->_center == data._center;
+}
+
+bool WimaAreaData::operator!=(const WimaAreaData &data) const {
+  return !this->operator==(data);
+}
 
-/*!
- * \fn double WimaAreaData::maxAltitude()
- *
- * Returns the path (vertex list defining the \l {Simple Polygon}).
- */
 QVariantList WimaAreaData::path() const { return _path; }
 
 QGeoCoordinate WimaAreaData::center() const { return _center; }
@@ -51,20 +45,6 @@ void WimaAreaData::clear() {
   _path.clear();
 }
 
-/*!
- * \fn void WimaAreaData::setMaxAltitude(double maxAltitude)
- *
- * Sets the maximum altitude member to \a maxAltitude and emits the \c
- * maxAltitudeChanged() signal if \a maxAltitude differs from the members value.
- */
-void WimaAreaData::setMaxAltitude(double maxAltitude) {
-  if (!qFuzzyCompare(_maxAltitude, maxAltitude)) {
-    _maxAltitude = maxAltitude;
-
-    emit maxAltitudeChanged(_maxAltitude);
-  }
-}
-
 void WimaAreaData::setPath(const QVariantList &coordinateList) {
   _path = coordinateList;
   _list.clear();
@@ -87,13 +67,11 @@ void WimaAreaData::setCenter(const QGeoCoordinate &center) {
  * Assigns \a other to the invoking object
  */
 void WimaAreaData::assign(const WimaAreaData &other) {
-  setMaxAltitude(other.maxAltitude());
   setPath(other.path());
   setCenter(other.center());
 }
 
 void WimaAreaData::assign(const WimaArea &other) {
-  setMaxAltitude(other.maxAltitude());
   setPath(other.path());
   setCenter(other.center());
 }
@@ -116,6 +94,13 @@ void WimaAreaData::setPath(const QList<QGeoCoordinate> &coordinateList) {
   emit pathChanged(_path);
 }
 
+bool operator==(const WimaAreaData &m1, const WimaArea &m2) {
+  return m1.path() == m2.path() && m1.center() == m2.center();
+}
+bool operator!=(const WimaAreaData &m1, const WimaArea &m2) {
+  return !operator==(m1, m2);
+}
+
 /*!
  * \class WimaArea::WimaAreaData
  * \brief Class to store and exchange data of a \c WimaArea Object.

src/Wima/Geometry/WimaAreaData.h

@@ -20,7 +20,9 @@ public:
   WimaAreaData &
   operator=(const WimaAreaData &otherData) = delete; // avoid slicing
 
-  double maxAltitude() const;
+  bool operator==(const WimaAreaData &data) const;
+  bool operator!=(const WimaAreaData &data) const;
+
   QVariantList path() const;
   QGeoCoordinate center() const;
   const QList<QGeoCoordinate> &coordinateList() const;
@@ -32,12 +34,10 @@ public:
   void clear();
 
 signals:
-  void maxAltitudeChanged(double maxAltitude);
   void pathChanged(const QVariantList &coordinateList);
   void centerChanged(void);
 
 public slots:
-  void setMaxAltitude(double maxAltitude);
   void setPath(const QList<QGeoCoordinate> &coordinateList);
   void setPath(const QVariantList &coordinateList);
   void setCenter(const QGeoCoordinate &center);
@@ -51,8 +51,10 @@ private:
 
   // Member Variables
   // see WimaArea.h for explanation
-  double _maxAltitude;
   QVariantList _path;
-  QList<QGeoCoordinate> _list;
+  mutable QList<QGeoCoordinate> _list;
   QGeoCoordinate _center;
 };
+
+bool operator==(const WimaAreaData &m1, const WimaArea &m2);
+bool operator!=(const WimaAreaData &m1, const WimaArea &m2);

src/Wima/Geometry/WimaMeasurementArea.cc

@@ -5,10 +5,14 @@
 
 #include <boost/units/systems/si.hpp>
 
+#include "QGCLoggingCategory.h"
+
 #ifndef SNAKE_MAX_TILES
 #define SNAKE_MAX_TILES 1000
 #endif
 
+QGC_LOGGING_CATEGORY(WimaMeasurementAreaLog, "WimaMeasurementAreaLog")
+
 TileData::TileData() : tiles(this) {}
 
 TileData::~TileData() { tiles.clearAndDeleteContents(); }
@@ -21,7 +25,7 @@ TileData &TileData::operator=(const TileData &other) {
     if (tile != nullptr) {
       this->tiles.append(new SnakeTile(*tile, this));
     } else {
-      qWarning("TileData::operator=: nullptr");
+      qCWarning(WimaMeasurementAreaLog) << "TileData::operator=: nullptr";
     }
   }
   this->tileCenterPoints = other.tileCenterPoints;
@@ -80,7 +84,7 @@ WimaMeasurementArea::WimaMeasurementArea(QObject *parent)
                                       this /* QObject parent */)),
       _showTiles(SettingsFact(settingsGroup, _metaDataMap[showTilesName],
                               this /* QObject parent */)),
-      _calculating(false) {
+      _state(STATE::IDLE) {
   init();
 }
 
@@ -104,7 +108,7 @@ WimaMeasurementArea::WimaMeasurementArea(const WimaMeasurementArea &other,
                                       this /* QObject parent */)),
       _showTiles(SettingsFact(settingsGroup, _metaDataMap[showTilesName],
                               this /* QObject parent */)),
-      _calculating(false) {
+      _state(STATE::IDLE) {
   init();
 }
 
@@ -123,11 +127,11 @@ operator=(const WimaMeasurementArea &other) {
 WimaMeasurementArea::~WimaMeasurementArea() {}
 
 QString WimaMeasurementArea::mapVisualQML() const {
-  return "WimaMeasurementAreaMapVisual.qml";
+  return QStringLiteral("WimaMeasurementAreaMapVisual.qml");
 }
 
 QString WimaMeasurementArea::editorQML() const {
-  return "WimaMeasurementAreaEditor.qml";
+  return QStringLiteral("WimaMeasurementAreaEditor.qml");
 }
 
 Fact *WimaMeasurementArea::tileHeight() { return &_tileHeight; }
@@ -146,7 +150,13 @@ QmlObjectListModel *WimaMeasurementArea::tiles() {
   return &this->_tileData.tiles;
 }
 
-QVector<int> WimaMeasurementArea::progress() { return this->_progress; }
+const QVector<int> &WimaMeasurementArea::progress() const {
+  return this->_progress;
+}
+
+QVector<int> WimaMeasurementArea::progressQml() const {
+  return this->_progress;
+}
 
 const QmlObjectListModel *WimaMeasurementArea::tiles() const {
   return &this->_tileData.tiles;
@@ -162,7 +172,7 @@ const TileData &WimaMeasurementArea::tileData() const {
 
 int WimaMeasurementArea::maxTiles() const { return SNAKE_MAX_TILES; }
 
-bool WimaMeasurementArea::ready() const { return !_calculating; }
+bool WimaMeasurementArea::ready() const { return this->_state == STATE::IDLE; }
 
 void WimaMeasurementArea::saveToJson(QJsonObject &json) {
   this->WimaArea::saveToJson(json);
@@ -230,7 +240,7 @@ bool WimaMeasurementArea::loadFromJson(const QJsonObject &json,
 }
 
 bool WimaMeasurementArea::setProgress(const QVector<int> &p) {
-  if (!_calculating) {
+  if (!ready()) {
     if (p.size() == this->tiles()->count() && this->_progress != p) {
       this->_progress = p;
       emit progressChanged();
@@ -246,18 +256,18 @@ bool WimaMeasurementArea::setProgress(const QVector<int> &p) {
 void WimaMeasurementArea::doUpdate() {
   using namespace snake;
   using namespace boost::units;
-#ifdef SNAKE_SHOW_TIME
+
   auto start = std::chrono::high_resolution_clock::now();
-#endif
+
   const auto height = this->_tileHeight.rawValue().toDouble() * si::meter;
   const auto width = this->_tileWidth.rawValue().toDouble() * si::meter;
   const auto tileArea = width * height;
   const auto totalArea = this->area() * si::meter * si::meter;
   const auto estNumTiles = totalArea / tileArea;
-  if (!this->_calculating &&
+  if (this->_state != STATE::UPDATE &&
       long(std::ceil(estNumTiles.value())) <= SNAKE_MAX_TILES &&
       this->count() >= 3 && this->isSimplePolygon()) {
-    this->_calculating = true;
+    setState(STATE::UPDATE);
     auto polygon = this->coordinateList();
     for (auto &v : polygon) {
       v.setAltitude(0);
@@ -266,9 +276,8 @@ void WimaMeasurementArea::doUpdate() {
         this->_minTileArea.rawValue().toDouble() * si::meter * si::meter;
     auto *th = this->thread();
     auto future = QtConcurrent::run([polygon, th, height, width, minArea] {
-#ifdef SNAKE_SHOW_TIME
       auto start = std::chrono::high_resolution_clock::now();
-#endif
+
       DataPtr pData(new TileData());
       // Convert to ENU system.
       QGeoCoordinate origin = polygon.first();
@@ -298,56 +307,67 @@ void WimaMeasurementArea::doUpdate() {
         }
       }
       pData->moveToThread(th);
-#ifdef SNAKE_SHOW_TIME
-      qDebug() << "WimaMeasurementArea::doUpdate concurrent update execution "
-                  "time: "
-               << std::chrono::duration_cast<std::chrono::milliseconds>(
-                      std::chrono::high_resolution_clock::now() - start)
-                      .count()
-               << " ms";
-#endif
+
+      qCDebug(WimaMeasurementAreaLog)
+          << "doUpdate(): update time: "
+          << std::chrono::duration_cast<std::chrono::milliseconds>(
+                 std::chrono::high_resolution_clock::now() - start)
+                 .count()
+          << " ms";
+
       return pData;
     }); // QtConcurrent::run()
 
     this->_watcher.setFuture(future);
   }
-#ifdef SNAKE_SHOW_TIME
-  qDebug() << "WimaMeasurementArea::doUpdate execution time: "
-           << std::chrono::duration_cast<std::chrono::milliseconds>(
-                  std::chrono::high_resolution_clock::now() - start)
-                  .count()
-           << " ms";
-#endif
+
+  qCDebug(WimaMeasurementAreaLog)
+      << "doUpdate(): execution time: "
+      << std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::high_resolution_clock::now() - start)
+             .count()
+      << " ms";
 }
 
 void WimaMeasurementArea::deferUpdate() {
-  if (this->_timer.isActive()) {
-    this->_timer.stop();
-  }
-  if (this->_tileData.size() > 0) {
-    this->_progress.clear();
-    emit this->progressChanged();
-    this->_tileData.clear();
-    emit this->tilesChanged();
+  if (this->_state == STATE::IDLE || this->_state == STATE::DEFERED) {
+    if (this->_state == STATE::IDLE) {
+      this->_progress.clear();
+      this->_tileData.clear();
+      emit this->progressChanged();
+      emit this->tilesChanged();
+    }
+    this->setState(STATE::DEFERED);
+    this->_timer.start(100);
+  } else if (this->_state == STATE::UPDATE) {
+    setState(STATE::RESTART);
   }
-  this->_timer.start(100);
 }
 
 void WimaMeasurementArea::storeTiles() {
-#ifdef SNAKE_SHOW_TIME
   auto start = std::chrono::high_resolution_clock::now();
-#endif
-  this->_tileData = *this->_watcher.result();
-  this->_calculating = false;
-  // This is expensive. Drawing tiles is expensive too.
-  emit this->tilesChanged();
-#ifdef SNAKE_SHOW_TIME
-  qDebug() << "WimaMeasurementArea::storeTiles() execution time: "
-           << std::chrono::duration_cast<std::chrono::milliseconds>(
-                  std::chrono::high_resolution_clock::now() - start)
-                  .count()
-           << " ms";
-#endif
+
+  if (this->_state == STATE::UPDATE) {
+
+    qCDebug(WimaMeasurementAreaLog) << "storeTiles(): update.";
+
+    this->_tileData = *this->_watcher.result();
+    // This is expensive. Drawing tiles is expensive too.
+    this->_progress = QVector<int>(this->_tileData.tiles.count(), 0);
+    this->progressChanged();
+    emit this->tilesChanged();
+    setState(STATE::IDLE);
+  } else if (this->_state == STATE::RESTART) {
+    qCDebug(WimaMeasurementAreaLog) << "storeTiles(): restart.";
+
+    doUpdate();
+  }
+  qCDebug(WimaMeasurementAreaLog)
+      << "storeTiles() execution time: "
+      << std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::high_resolution_clock::now() - start)
+             .count()
+      << " ms";
 }
 
 void WimaMeasurementArea::init() {
@@ -368,6 +388,16 @@ void WimaMeasurementArea::init() {
           &WimaMeasurementArea::storeTiles);
 }
 
+void WimaMeasurementArea::setState(WimaMeasurementArea::STATE s) {
+  if (this->_state != s) {
+    auto oldState = this->_state;
+    this->_state = s;
+    if (s == STATE::IDLE || oldState == STATE::IDLE) {
+      emit readyChanged();
+    }
+  }
+}
+
 /*!
  * \class WimaMeasurementArea
  * \brief Class defining the area inside which the actual drone measurements

src/Wima/Geometry/WimaMeasurementArea.h

@@ -26,6 +26,14 @@ public:
 
 class WimaMeasurementArea : public WimaArea {
   Q_OBJECT
+
+  enum class STATE {
+    IDLE,
+    DEFERED,
+    UPDATE,
+    RESTART,
+  };
+
 public:
   WimaMeasurementArea(QObject *parent = nullptr);
   WimaMeasurementArea(const WimaMeasurementArea &other,
@@ -41,7 +49,7 @@ public:
   Q_PROPERTY(Fact *showTiles READ showTiles CONSTANT)
   Q_PROPERTY(QmlObjectListModel *tiles READ tiles NOTIFY tilesChanged)
   Q_PROPERTY(int maxTiles READ maxTiles NOTIFY maxTilesChanged)
-  Q_PROPERTY(QVector<int> progress READ progress NOTIFY progressChanged)
+  Q_PROPERTY(QVector<int> progress READ progressQml NOTIFY progressChanged)
 
   // Overrides from WimaPolygon
   QString mapVisualQML(void) const;
@@ -54,7 +62,8 @@ public:
   Fact *minTransectLength();
   Fact *showTiles();
   QmlObjectListModel *tiles();
-  QVector<int> progress();
+  const QVector<int> &progress() const;
+  QVector<int> progressQml() const;
   const QmlObjectListModel *tiles() const;
   const QVariantList &tileCenterPoints() const; // List of QGeoCoordinate
   const TileData &tileData() const;
@@ -83,6 +92,7 @@ signals:
   void tilesChanged();
   void maxTilesChanged();
   void progressChanged();
+  void readyChanged();
 
 public slots:
   bool setProgress(const QVector<int> &p);
@@ -95,6 +105,7 @@ private slots:
 private:
   // Member Methodes
   void init();
+  void setState(STATE s);
 
   // Members
   QMap<QString, FactMetaData *> _metaDataMap;
@@ -111,7 +122,8 @@ private:
   using DataPtr = std::shared_ptr<TileData>;
   TileData _tileData;
   QFutureWatcher<DataPtr> _watcher;
-  bool _calculating;
+
+  STATE _state;
 
   QVector<int> _progress;
 };

src/Wima/Geometry/WimaMeasurementAreaData.cc

@@ -18,6 +18,18 @@ WimaMeasurementAreaData::WimaMeasurementAreaData(
   *this = other;
 }
 
+bool WimaMeasurementAreaData::
+operator==(const WimaMeasurementAreaData &other) const {
+  return this->WimaAreaData::operator==(other) &&
+         this->_tileData == other.tileData() &&
+         this->center() == other.center();
+}
+
+bool WimaMeasurementAreaData::
+operator!=(const WimaMeasurementAreaData &other) const {
+  return !(*this == other);
+}
+
 /*!
  * \overload operator=();
  *
@@ -82,9 +94,31 @@ void WimaMeasurementAreaData::assign(const WimaMeasurementArea &other) {
   WimaAreaData::assign(other);
   if (other.ready()) {
     this->_tileData = other.tileData();
-    qWarning() << "WimaMeasurementAreaData: add progress copy here.";
+    this->_progress = other.progress();
   } else {
     qWarning()
         << "WimaMeasurementAreaData::assign(): WimaMeasurementArea not ready.";
   }
 }
+
+bool operator==(const WimaMeasurementAreaData &m1,
+                const WimaMeasurementArea &m2) {
+  return operator==(*static_cast<const WimaAreaData *>(&m1),
+                    *static_cast<const WimaArea *>(&m2)) &&
+         m1.tileData() == m2.tileData() && m1.progress() == m2.progress();
+}
+
+bool operator!=(const WimaMeasurementAreaData &m1,
+                const WimaMeasurementArea &m2) {
+  return !(m1 == m2);
+}
+
+bool operator==(const WimaMeasurementArea &m1,
+                const WimaMeasurementAreaData &m2) {
+  return m2 == m1;
+}
+
+bool operator!=(const WimaMeasurementArea &m1,
+                const WimaMeasurementAreaData &m2) {
+  return m2 != m1;
+}

src/Wima/Geometry/WimaMeasurementAreaData.h

@@ -18,6 +18,9 @@ public:
   WimaMeasurementAreaData &operator=(const WimaMeasurementAreaData &other);
   WimaMeasurementAreaData &operator=(const WimaMeasurementArea &other);
 
+  bool operator==(const WimaMeasurementAreaData &other) const;
+  bool operator!=(const WimaMeasurementAreaData &other) const;
+
   QString type() const;
   WimaMeasurementAreaData *Clone() const {
     return new WimaMeasurementAreaData(*this);
@@ -42,3 +45,12 @@ private:
   TileData _tileData;
   QVector<int> _progress;
 };
+
+bool operator==(const WimaMeasurementAreaData &m1,
+                const WimaMeasurementArea &m2);
+bool operator!=(const WimaMeasurementAreaData &m1,
+                const WimaMeasurementArea &m2);
+bool operator==(const WimaMeasurementArea &m1,
+                const WimaMeasurementAreaData &m2);
+bool operator!=(const WimaMeasurementArea &m1,
+                const WimaMeasurementAreaData &m2);

src/Wima/RoutingThread.cpp

@@ -4,6 +4,9 @@
 // Qt
 #include <QDebug>
 
+#include "QGCLoggingCategory.h"
+QGC_LOGGING_CATEGORY(RoutingWorkerLog, "RoutingWorkerLog")
+
 RoutingThread::RoutingThread(QObject *parent)
     : QThread(parent), _calculating(false), _stop(false), _restart(false) {
 
@@ -41,16 +44,13 @@ void RoutingThread::route(const RoutingParameter &par,
 }
 
 void RoutingThread::run() {
-  qWarning() << "RoutingWorker::run(): thread start.";
+  qCWarning(RoutingWorkerLog) << "run(): thread start.";
   while (!this->_stop) {
-#ifdef DEBUG_CIRCULAR_SURVEY
-    qWarning() << "RoutingWorker::run(): calculation "
-                  "started.";
-#endif
+    qCWarning(RoutingWorkerLog) << "run(): calculation "
+                                   "started.";
     // Copy input.
-#ifdef SHOW_CIRCULAR_SURVEY_TIME
     auto start = std::chrono::high_resolution_clock::now();
-#endif
+
     this->_calculating = true;
     emit calculatingChanged();
     Lock lk(this->_mutex);
@@ -67,10 +67,8 @@ void RoutingThread::run() {
     if (generator(transectsENU)) {
       // Check if generation was successful.
       if (transectsENU.size() == 0) {
-#ifdef DEBUG_CIRCULAR_SURVEY
-        qWarning() << "RoutingWorker::run(): "
-                      "not able to generate transects.";
-#endif
+        qCWarning(RoutingWorkerLog) << "run(): "
+                                       "not able to generate transects.";
       } else {
         // Prepare data for routing.
         auto &solutionVector = pRouteData->solutionVector;
@@ -95,38 +93,29 @@ void RoutingThread::run() {
 
         // Check if routing was successful.
         if ((!success || solutionVector.size() < 1) && !this->_restart) {
-#ifdef DEBUG_CIRCULAR_SURVEY
-          qWarning() << "RoutingWorker::run(): "
-                        "routing failed.";
-          qWarning() << snakePar.errorString.c_str();
-#endif
+          qCWarning(RoutingWorkerLog) << "run(): "
+                                         "routing failed. "
+                                      << snakePar.errorString.c_str();
         } else if (this->_restart) {
-#ifdef DEBUG_CIRCULAR_SURVEY
-          qWarning() << "RoutingWorker::run(): "
-                        "restart requested.";
-#endif
+          qCWarning(RoutingWorkerLog) << "run(): "
+                                         "restart requested.";
         } else {
           // Notify main thread.
           emit result(pRouteData);
-#ifdef DEBUG_CIRCULAR_SURVEY
-          qWarning() << "RoutingWorker::run(): "
-                        "concurrent update success.";
-#endif
+          qCWarning(RoutingWorkerLog) << "run(): "
+                                         "concurrent update success.";
         }
       }
     } // end calculation
-#ifdef DEBUG_CIRCULAR_SURVEY
     else {
-      qWarning() << "RoutingWorker::run(): generator() failed.";
+      qCWarning(RoutingWorkerLog) << "run(): generator() failed.";
     }
-#endif
-#ifdef SHOW_CIRCULAR_SURVEY_TIME
-    qWarning() << "RoutingWorker::run(): execution time: "
-               << std::chrono::duration_cast<std::chrono::milliseconds>(
-                      std::chrono::high_resolution_clock::now() - start)
-                      .count()
-               << " ms";
-#endif
+    qCWarning(RoutingWorkerLog)
+        << "run(): execution time: "
+        << std::chrono::duration_cast<std::chrono::milliseconds>(
+               std::chrono::high_resolution_clock::now() - start)
+               .count()
+        << " ms";
     // Signal calulation end and set thread to sleep.
     this->_calculating = false;
     emit calculatingChanged();
@@ -136,5 +125,5 @@ void RoutingThread::run() {
     }
     this->_restart = false;
   } // main loop
-  qWarning() << "RoutingWorker::run(): thread end.";
+  qCWarning(RoutingWorkerLog) << "run(): thread end.";
 }

src/Wima/Snake/NemoInterface.cpp

@@ -48,7 +48,7 @@ public:
   void setAutoPublish(bool ap);