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
76215f0a
Commit
76215f0a
authored
Apr 15, 2021
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Measurement Complex Item load -> sync issue (tile alt = nan) solved
parent
c508913f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
MeasurementComplexItem.cc
src/MeasurementComplexItem/MeasurementComplexItem.cc
+2
-2
GeoArea.cc
src/MeasurementComplexItem/geometry/GeoArea.cc
+8
-1
geopoint.h
...mm/ros_bridge/include/messages/geographic_msgs/geopoint.h
+1
-1
No files found.
src/MeasurementComplexItem/MeasurementComplexItem.cc
View file @
76215f0a
...
...
@@ -497,7 +497,7 @@ void MeasurementComplexItem::save(QJsonArray &planItems) {
// Variant names.
QJsonArray
jsonVariantNames
;
for
(
auto
const
&
name
:
_variantNames
)
{
for
(
auto
&
&
name
:
_variantNames
)
{
jsonVariantNames
.
append
(
name
);
}
saveObject
[
variantNamesKey
]
=
jsonVariantNames
;
...
...
@@ -1209,7 +1209,7 @@ bool MeasurementComplexItem::stopEditing(bool doUpdate) {
_updateRoute
();
}
if
(
correct
&&
isDifferent
)
{
if
(
correct
)
{
_syncTiles
();
}
...
...
src/MeasurementComplexItem/geometry/GeoArea.cc
View file @
76215f0a
...
...
@@ -40,8 +40,15 @@ bool GeoArea::loadFromJson(const QJsonObject &json, QString &errorString) {
errorString
))
{
qWarning
()
<<
errorString
;
return
false
;
}
}
else
{
// set altitude to 0
for
(
int
i
=
0
;
i
<
this
->
count
();
++
i
)
{
auto
vertex
=
this
->
vertexCoordinate
(
i
);
vertex
.
setAltitude
(
0
);
this
->
adjustVertex
(
i
,
vertex
);
}
}
return
true
;
}
...
...
src/comm/ros_bridge/include/messages/geographic_msgs/geopoint.h
View file @
76215f0a
...
...
@@ -105,7 +105,7 @@ template <class T> bool toJson(const T &p, QJsonObject &value) {
p
,
traits
::
Type2Type
<
Components
>
());
// If T has no member altitude()
// replace it by 0.0;
value
[
altKey
]
=
altitude
;
value
[
altKey
]
=
double
(
altitude
)
;
return
true
;
}
...
...
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