.old files removed

src/Wima/Geometry/WimaMeasurementArea.h.orig

-#pragma once
-
-#include <QFutureWatcher>
-#include <QObject>
-#include <QTimer>
-
-#include "WimaArea.h"
-
-#include "SettingsFact.h"
-
-class TileData : public QObject {
-public:
-  QmlObjectListModel tiles;
-  QVariantList tileCenterPoints;
-
-  TileData();
-  ~TileData();
-
-  TileData &operator=(const TileData &other);
-  bool operator==(const TileData &other) const;
-  bool operator!=(const TileData &other) const;
-
-  void clear();
-  std::size_t size() const;
-};
-
-class WimaMeasurementArea : public WimaArea {
-  Q_OBJECT
-
-  enum class STATE { IDLE, DEFERED, UPDATEING, RESTARTING, STOP };
-
-public:
-  WimaMeasurementArea(QObject *parent = nullptr);
-  WimaMeasurementArea(const WimaMeasurementArea &other,
-                      QObject *parent = nullptr);
-  WimaMeasurementArea &operator=(const WimaMeasurementArea &other);
-  ~WimaMeasurementArea();
-
-  Q_PROPERTY(Fact *tileHeight READ tileHeight CONSTANT)
-  Q_PROPERTY(Fact *tileWidth READ tileWidth CONSTANT)
-  Q_PROPERTY(Fact *minTileArea READ minTileArea CONSTANT)
-  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 progressQml NOTIFY progressChanged)
-
-  // Overrides from WimaPolygon
-  QString mapVisualQML(void) const;
-  QString editorQML(void) const;
-
-  // Property getters.
-  Fact *tileHeight();
-  Fact *tileWidth();
-  Fact *minTileArea();
-  Fact *showTiles();
-  QmlObjectListModel *tiles();
-  const QVector<int> &progress() const;
-  QVector<int> progressQml() const;
-  const QmlObjectListModel *tiles() const;
-  const QVariantList &tileCenterPoints() const; // List of QGeoCoordinate
-  const TileData &tileData() const;
-  int maxTiles() const;
-  bool ready() const;
-
-  // Member Methodes
-  void saveToJson(QJsonObject &json);
-  bool loadFromJson(const QJsonObject &json, QString &errorString);
-
-  // Static Variables
-  static const char *settingsGroup;
-  static const char *tileHeightName;
-  static const char *tileWidthName;
-  static const char *minTileAreaName;
-  static const char *showTilesName;
-  static const char *WimaMeasurementAreaName;
-
-signals:
-  void tilesChanged();
-  void maxTilesChanged();
-  void progressChanged();
-  void progressAccepted();
-  void progressNotAccepted();
-  void readyChanged();
-
-public slots:
-  bool setProgress(const QVector<int> &p);
-
-private slots:
-  void doUpdate();
-  void deferUpdate();
-  void storeTiles();
-  void disableUpdate();
-  void enableUpdate();
-
-private:
-  // Member Methodes
-  void init();
-  void setState(STATE s);
-
-  // Members
-  QMap<QString, FactMetaData *> _metaDataMap;
-
-  SettingsFact _tileHeight;
-  SettingsFact _tileWidth;
-<<<<<<< HEAD
-  SettingsFact _minTileAreaPercent; // 0..100
-=======
-  SettingsFact _minTileArea;
->>>>>>> 118a8e164c4fec6026709eb5bee77aa75fd3de95
-  SettingsFact _showTiles;
-
-  QVector<int> _progress;
-
-  // Tile stuff.
-  mutable QTimer _timer;
-  using DataPtr = std::shared_ptr<TileData>;
-<<<<<<< HEAD
-  mutable STATE _state;
-  mutable TileData _tileData;
-  mutable QFutureWatcher<DataPtr> _watcher;
-=======
-  mutable TileData _tileData;
-  mutable QFutureWatcher<DataPtr> _watcher;
-  mutable STATE _state;
-
-  QVector<int> _progress;
->>>>>>> 118a8e164c4fec6026709eb5bee77aa75fd3de95
-};

src/Wima/WimaPlanData_old.cc

-#include "WimaPlanData.h"
-
-WimaPlanData::WimaPlanData(QObject *parent) : QObject(parent) {}
-
-WimaPlanData::WimaPlanData(const WimaPlanData &other, QObject *parent)
-    : QObject(parent) {
-  *this = other;
-}
-
-/*!
- * \fn WimaPlanData &WimaPlanData::operator=(const WimaPlanData &other)
- *
- * Copies the data area list of \a other to the calling \c WimaPlanData object.
- * Returns a reference to the calling \c WimaPlanData object.
- */
-WimaPlanData &WimaPlanData::operator=(const WimaPlanData &other) {
-  // copy wima areas
-  QList<const WimaAreaData *> areaList = other.areaList();
-  _areaList.clear();
-  for (int i = 0; i < areaList.size(); i++) {
-    const WimaAreaData *areaData = areaList[i];
-    // determine area type and append
-    if (areaData->type() == WimaJoinedAreaData::typeString) {
-      this->append(*qobject_cast<const WimaJoinedAreaData *>(areaData));
-    } else if (areaData->type() == WimaServiceAreaData::typeString) {
-      this->append(*qobject_cast<const WimaServiceAreaData *>(areaData));
-    } else if (areaData->type() == WimaMeasurementAreaData::typeString) {
-      this->append(*qobject_cast<const WimaMeasurementAreaData *>(areaData));
-    } else if (areaData->type() == WimaCorridorData::typeString) {
-      this->append(*qobject_cast<const WimaCorridorData *>(areaData));
-    }
-  }
-
-  // copy mission items
-  _missionItems = other.missionItems();
-
-  return *this;
-}
-
-/*!
- * \fn void WimaPlanData::append(const WimaAreaData &areaData)
- *
- * Adds a WimaAreaData item.
- */
-void WimaPlanData::append(const WimaJoinedAreaData &areaData) {
-  _joinedArea = areaData;
-
-  if (!_areaList.contains(&_joinedArea)) {
-    _areaList.append(&_joinedArea);
-  }
-}
-
-/*!
- * \fn void WimaPlanData::append(const WimaServiceAreaData &areaData)
- *
- * Adds a WimaServiceAreaData item.
- */
-void WimaPlanData::append(const WimaServiceAreaData &areaData) {
-  _serviceArea = areaData;
-
-  if (!_areaList.contains(&_serviceArea)) {
-    _areaList.append(&_serviceArea);
-  }
-}
-
-/*!
- * \fn void WimaPlanData::append(const WimaServiceAreaData &areaData)
- *
- * Adds a WimaCorridorData item.
- */
-void WimaPlanData::append(const WimaCorridorData &areaData) {
-  _corridor = areaData;
-
-  if (!_areaList.contains(&_corridor)) {
-    _areaList.append(&_corridor);
-  }
-}
-
-/*!
- * \fn void WimaPlanData::append(const WimaServiceAreaData &areaData)
- *
- * Adds a WimaMeasurementAreaData item.
- */
-void WimaPlanData::append(const WimaMeasurementAreaData &areaData) {
-  _measurementArea = areaData;
-
-  if (!_areaList.contains(&_measurementArea)) {
-    _areaList.append(&_measurementArea);
-  }
-}
-
-void WimaPlanData::append(const QList<MissionItem *> &missionItems) {
-  for (auto *item : missionItems) {
-    item->setParent(this);
-    _missionItems.append(item);
-  }
-}
-
-/*!
- * \fn void WimaPlanData::append(const WimaServiceAreaData &areaData)
- *
- * Clears all stored objects
- */
-void WimaPlanData::clear() {
-  _areaList.clear();
-  _missionItems.clear();
-}
-
-const QList<const WimaAreaData *> &WimaPlanData::areaList() const {
-  return _areaList;
-}
-
-const QList<MissionItem> &WimaPlanData::missionItems() const {
-  return _missionItems;
-}
-
-/*!
- * \class WimaPlanData
- * \brief Class storing data generated by the \c WimaPlaner class.
- *
- * This class is designed to store data generated by the \c WimaPlaner class and
- * meant for data exchange between the \c WimaController and the \c WimaPlanner.
- * It stores a QList of \c WimaAreaData objects, called area data list,
- * containing the data of serveral \c WimaAreas generated by the \c WimaPlaner.
- *
- * \sa QList
- */