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
5d26256c
Commit
5d26256c
authored
Mar 18, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tolerance based terrain follow
parent
2296ed0d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
160 additions
and
15 deletions
+160
-15
TransectStyleComplexItem.cc
src/MissionManager/TransectStyleComplexItem.cc
+146
-12
TransectStyleComplexItem.h
src/MissionManager/TransectStyleComplexItem.h
+5
-0
MockLink.cc
src/comm/MockLink.cc
+9
-3
No files found.
src/MissionManager/TransectStyleComplexItem.cc
View file @
5d26256c
This diff is collapsed.
Click to expand it.
src/MissionManager/TransectStyleComplexItem.h
View file @
5d26256c
...
...
@@ -183,6 +183,7 @@ protected:
static
const
char
*
_jsonTransectStyleComplexItemKey
;
static
const
char
*
_jsonTransectPointsKey
;
static
const
char
*
_jsonItemsKey
;
static
const
char
*
_jsonFollowTerrainKey
;
static
const
int
_terrainQueryTimeoutMsecs
;
static
const
double
_surveyEdgeIndicator
;
///< Altitude value in _transectPoints which indicates survey entry
...
...
@@ -191,4 +192,8 @@ private slots:
void
_rebuildTransects
(
void
);
void
_reallyQueryTransectsPathHeightInfo
(
void
);
private:
void
_addInterstitialTransectsForTerrain
(
void
);
double
_altitudeBetweenCoords
(
const
QGeoCoordinate
&
fromCoord
,
const
QGeoCoordinate
&
toCoord
,
double
percentTowardsTo
);
int
_maxPathHeight
(
const
TerrainPathQuery
::
PathHeightInfo_t
&
pathHeightInfo
,
int
fromIndex
,
int
toIndex
,
double
&
maxHeight
);
};
src/comm/MockLink.cc
View file @
5d26256c
...
...
@@ -35,9 +35,15 @@ QGC_LOGGING_CATEGORY(MockLinkVerboseLog, "MockLinkVerboseLog")
// Vehicle position is set close to default Gazebo vehicle location. This allows for multi-vehicle
// testing of a gazebo vehicle and a mocklink vehicle
double
MockLink
::
_defaultVehicleLatitude
=
47.397
f
;
double
MockLink
::
_defaultVehicleLongitude
=
8.5455
f
;
double
MockLink
::
_defaultVehicleAltitude
=
488.056
f
;
#if 1
double
MockLink
::
_defaultVehicleLatitude
=
47.397
;
double
MockLink
::
_defaultVehicleLongitude
=
8.5455
;
double
MockLink
::
_defaultVehicleAltitude
=
488.056
;
#else
double
MockLink
::
_defaultVehicleLatitude
=
47.6333022928789
;
double
MockLink
::
_defaultVehicleLongitude
=
-
122.08833157994995
;
double
MockLink
::
_defaultVehicleAltitude
=
19.0
;
#endif
int
MockLink
::
_nextVehicleSystemId
=
128
;
const
char
*
MockLink
::
_failParam
=
"COM_FLTMODE6"
;
...
...
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