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
a372fbf9
Commit
a372fbf9
authored
Oct 16, 2020
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.wima files fixed
parent
3f817087
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
6359 deletions
+27
-6359
KlingenbachVardiff.wima
Paths/KlingenbachVardiff.wima
+4
-4463
Routing error.wima
Paths/Routing error.wima
+4
-940
Routing error2.wima
Paths/Routing error2.wima
+4
-940
WimaMeasurementArea.cc
src/Wima/Geometry/WimaMeasurementArea.cc
+13
-14
WimaMeasurementArea.h
src/Wima/Geometry/WimaMeasurementArea.h
+2
-2
No files found.
Paths/KlingenbachVardiff.wima
View file @
a372fbf9
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Paths/Routing error.wima
View file @
a372fbf9
This diff is collapsed.
Click to expand it.
Paths/Routing error2.wima
View file @
a372fbf9
This diff is collapsed.
Click to expand it.
src/Wima/Geometry/WimaMeasurementArea.cc
View file @
a372fbf9
...
...
@@ -171,41 +171,40 @@ void WimaMeasurementArea::saveToJson(QJsonObject &json) {
bool
WimaMeasurementArea
::
loadFromJson
(
const
QJsonObject
&
json
,
QString
&
errorString
)
{
if
(
this
->
WimaArea
::
loadFromJson
(
json
,
errorString
))
{
disableUpdate
s
();
disableUpdate
();
bool
retVal
=
true
;
if
(
!
json
.
contains
(
tileHeightName
)
||
!
json
[
tileHeightName
].
isDouble
())
{
errorString
.
append
(
tr
(
"Could not load tile height!
\n
"
));
retVal
=
false
;
}
else
{
_tileHeight
.
setRawValue
(
json
[
tileHeightName
].
toDouble
());
}
if
(
!
json
.
contains
(
tileWidthName
)
||
!
json
[
tileWidthName
].
isDouble
())
{
errorString
.
append
(
tr
(
"Could not load tile width!
\n
"
));
retVal
=
false
;
}
else
{
_tileWidth
.
setRawValue
(
json
[
tileWidthName
].
toDouble
());
}
if
(
!
json
.
contains
(
minTileAreaName
)
||
!
json
[
minTileAreaName
].
isDouble
())
{
errorString
.
append
(
tr
(
"Could not load minimal tile area!
\n
"
));
retVal
=
false
;
}
else
{
_minTileAreaPercent
.
setRawValue
(
json
[
minTileAreaName
].
toDouble
());
}
if
(
!
json
.
contains
(
showTilesName
)
||
!
json
[
showTilesName
].
isBool
())
{
errorString
.
append
(
tr
(
"Could not load show tiles !
\n
"
));
retVal
=
false
;
}
if
(
retVal
)
{
_tileHeight
.
setRawValue
(
json
[
tileHeightName
].
toDouble
());
_tileWidth
.
setRawValue
(
json
[
tileWidthName
].
toDouble
());
_minTileAreaPercent
.
setRawValue
(
json
[
minTileAreaName
].
toDouble
());
_showTiles
.
setRawValue
(
json
[
showTilesName
].
toBool
());
enableUpdates
();
doUpdate
();
}
else
{
enableUpdates
(
);
_showTiles
.
setRawValue
(
json
[
showTilesName
].
toBool
()
);
}
enableUpdate
();
doUpdate
();
return
retVal
;
}
else
{
return
false
;
...
...
@@ -348,12 +347,12 @@ void WimaMeasurementArea::storeTiles() {
<<
" ms"
;
}
void
WimaMeasurementArea
::
disableUpdate
s
()
{
void
WimaMeasurementArea
::
disableUpdate
()
{
setState
(
STATE
::
IDLE
);
this
->
_timer
.
stop
();
}
void
WimaMeasurementArea
::
enableUpdate
s
()
{
void
WimaMeasurementArea
::
enableUpdate
()
{
if
(
this
->
_state
==
STATE
::
STOP
)
{
setState
(
STATE
::
IDLE
);
}
...
...
src/Wima/Geometry/WimaMeasurementArea.h
View file @
a372fbf9
...
...
@@ -89,8 +89,8 @@ private slots:
void
doUpdate
();
void
deferUpdate
();
void
storeTiles
();
void
disableUpdate
s
();
void
enableUpdate
s
();
void
disableUpdate
();
void
enableUpdate
();
private:
// Member Methodes
...
...
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