Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2823f6dd
Commit
2823f6dd
authored
Oct 16, 2020
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
min tile area -> percent
parent
5d91598d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
127 additions
and
126 deletions
+127
-126
WimaMeasurementArea.cc
src/Wima/Geometry/WimaMeasurementArea.cc
+115
-90
WimaMeasurementArea.h
src/Wima/Geometry/WimaMeasurementArea.h
+7
-14
WimaMeasurementArea.SettingsGroup.json
...Wima/Geometry/json/WimaMeasurementArea.SettingsGroup.json
+5
-22
No files found.
src/Wima/Geometry/WimaMeasurementArea.cc
View file @
2823f6dd
This diff is collapsed.
Click to expand it.
src/Wima/Geometry/WimaMeasurementArea.h
View file @
2823f6dd
...
...
@@ -27,12 +27,7 @@ public:
class
WimaMeasurementArea
:
public
WimaArea
{
Q_OBJECT
enum
class
STATE
{
IDLE
,
DEFERED
,
UPDATE
,
RESTART
,
};
enum
class
STATE
{
IDLE
,
DEFERED
,
UPDATEING
,
RESTARTING
,
STOP
};
public:
WimaMeasurementArea
(
QObject
*
parent
=
nullptr
);
...
...
@@ -71,10 +66,6 @@ public:
void
saveToJson
(
QJsonObject
&
json
);
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
const
char
*
settingsGroup
;
static
const
char
*
tileHeightName
;
...
...
@@ -98,6 +89,8 @@ private slots:
void
doUpdate
();
void
deferUpdate
();
void
storeTiles
();
void
disableUpdates
();
void
enableUpdates
();
private:
// Member Methodes
...
...
@@ -109,15 +102,15 @@ private:
SettingsFact
_tileHeight
;
SettingsFact
_tileWidth
;
SettingsFact
_minTileArea
;
SettingsFact
_minTileArea
Percent
;
// 0..100
SettingsFact
_showTiles
;
QVector
<
int
>
_progress
;
// Tile stuff.
mutable
QTimer
_timer
;
using
DataPtr
=
std
::
shared_ptr
<
TileData
>
;
mutable
STATE
_state
;
mutable
TileData
_tileData
;
mutable
QFutureWatcher
<
DataPtr
>
_watcher
;
mutable
STATE
_state
;
QVector
<
int
>
_progress
;
};
src/Wima/Geometry/json/WimaMeasurementArea.SettingsGroup.json
View file @
2823f6dd
...
...
@@ -18,31 +18,14 @@
"defaultValue"
:
5
},
{
"name"
:
"MinTileArea"
,
"shortDescription"
:
"The minimal allowed area
of a tile
"
,
"name"
:
"MinTileArea
Percent
"
,
"shortDescription"
:
"The minimal allowed area
in percent (of width*height).
"
,
"type"
:
"double"
,
"units"
:
"
m^2
"
,
"units"
:
"
%
"
,
"min"
:
0
,
"max"
:
100
,
"decimalPlaces"
:
2
,
"defaultValue"
:
5
},
{
"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
"defaultValue"
:
20
},
{
"name"
:
"ShowTiles"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment