Commit 2823f6dd authored by Valentin Platzgummer's avatar Valentin Platzgummer

min tile area -> percent

parent 5d91598d
This diff is collapsed.
...@@ -27,12 +27,7 @@ public: ...@@ -27,12 +27,7 @@ public:
class WimaMeasurementArea : public WimaArea { class WimaMeasurementArea : public WimaArea {
Q_OBJECT Q_OBJECT
enum class STATE { enum class STATE { IDLE, DEFERED, UPDATEING, RESTARTING, STOP };
IDLE,
DEFERED,
UPDATE,
RESTART,
};
public: public:
WimaMeasurementArea(QObject *parent = nullptr); WimaMeasurementArea(QObject *parent = nullptr);
...@@ -71,10 +66,6 @@ public: ...@@ -71,10 +66,6 @@ public:
void saveToJson(QJsonObject &json); void saveToJson(QJsonObject &json);
bool loadFromJson(const QJsonObject &json, QString &errorString); bool loadFromJson(const QJsonObject &json, QString &errorString);
// Friends
friend void print(const WimaMeasurementArea &area, QString outputStr);
friend void print(const WimaMeasurementArea &area);
// Static Variables // Static Variables
static const char *settingsGroup; static const char *settingsGroup;
static const char *tileHeightName; static const char *tileHeightName;
...@@ -98,6 +89,8 @@ private slots: ...@@ -98,6 +89,8 @@ private slots:
void doUpdate(); void doUpdate();
void deferUpdate(); void deferUpdate();
void storeTiles(); void storeTiles();
void disableUpdates();
void enableUpdates();
private: private:
// Member Methodes // Member Methodes
...@@ -109,15 +102,15 @@ private: ...@@ -109,15 +102,15 @@ private:
SettingsFact _tileHeight; SettingsFact _tileHeight;
SettingsFact _tileWidth; SettingsFact _tileWidth;
SettingsFact _minTileArea; SettingsFact _minTileAreaPercent; // 0..100
SettingsFact _showTiles; SettingsFact _showTiles;
QVector<int> _progress;
// Tile stuff. // Tile stuff.
mutable QTimer _timer; mutable QTimer _timer;
using DataPtr = std::shared_ptr<TileData>; using DataPtr = std::shared_ptr<TileData>;
mutable STATE _state;
mutable TileData _tileData; mutable TileData _tileData;
mutable QFutureWatcher<DataPtr> _watcher; mutable QFutureWatcher<DataPtr> _watcher;
mutable STATE _state;
QVector<int> _progress;
}; };
...@@ -18,31 +18,14 @@ ...@@ -18,31 +18,14 @@
"defaultValue": 5 "defaultValue": 5
}, },
{ {
"name": "MinTileArea", "name": "MinTileAreaPercent",
"shortDescription": "The minimal allowed area of a tile", "shortDescription": "The minimal allowed area in percent (of width*height).",
"type": "double", "type": "double",
"units": "m^2", "units": "%",
"min": 0, "min": 0,
"max": 100,
"decimalPlaces": 2, "decimalPlaces": 2,
"defaultValue": 5 "defaultValue": 20
},
{
"name": "TransectDistance",
"shortDescription": "The transect distance",
"type": "double",
"units": "m",
"min": 0.3,
"decimalPlaces": 2,
"defaultValue": 2
},
{
"name": "MinTransectLength",
"shortDescription": "The minimal transect length",
"type": "double",
"units": "m",
"min": 0,
"decimalPlaces": 2,
"defaultValue": 1
}, },
{ {
"name": "ShowTiles", "name": "ShowTiles",
......
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