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
62345e4d
Unverified
Commit
62345e4d
authored
Aug 14, 2018
by
Don Gagne
Committed by
GitHub
Aug 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6797 from DonLakeFlyer/TerrainFixes
Terrain fixes
parents
13784ae0
303043d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
TransectStyleComplexItem.h
src/MissionManager/TransectStyleComplexItem.h
+2
-2
TerrainQuery.cc
src/Terrain/TerrainQuery.cc
+1
-1
No files found.
src/MissionManager/TransectStyleComplexItem.h
View file @
62345e4d
...
...
@@ -54,8 +54,8 @@ public:
Fact
*
hoverAndCapture
(
void
)
{
return
&
_hoverAndCaptureFact
;
}
Fact
*
refly90Degrees
(
void
)
{
return
&
_refly90DegreesFact
;
}
Fact
*
terrainAdjustTolerance
(
void
)
{
return
&
_terrainAdjustToleranceFact
;
}
Fact
*
terrainAdjustMaxDescentRate
(
void
)
{
return
&
_terrainAdjustMax
Climb
RateFact
;
}
Fact
*
terrainAdjustMaxClimbRate
(
void
)
{
return
&
_terrainAdjustMax
Descent
RateFact
;
}
Fact
*
terrainAdjustMaxDescentRate
(
void
)
{
return
&
_terrainAdjustMax
Descent
RateFact
;
}
Fact
*
terrainAdjustMaxClimbRate
(
void
)
{
return
&
_terrainAdjustMax
Climb
RateFact
;
}
const
Fact
*
hoverAndCapture
(
void
)
const
{
return
&
_hoverAndCaptureFact
;
}
...
...
src/Terrain/TerrainQuery.cc
View file @
62345e4d
...
...
@@ -416,7 +416,7 @@ bool TerrainTileManager::_getAltitudesForCoordinates(const QList<QGeoCoordinate>
error
=
true
;
qCWarning
(
TerrainQueryLog
)
<<
"TerrainTileManager::_getAltitudesForCoordinates Internal Error: negative elevation in tile cache"
;
}
else
{
qC
Warnin
g
(
TerrainQueryLog
)
<<
"TerrainTileManager::_getAltitudesForCoordinates returning elevation from tile cache"
<<
elevation
;
qC
Debu
g
(
TerrainQueryLog
)
<<
"TerrainTileManager::_getAltitudesForCoordinates returning elevation from tile cache"
<<
elevation
;
}
altitudes
.
push_back
(
elevation
);
}
else
{
...
...
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