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
f73ccdd3
Unverified
Commit
f73ccdd3
authored
Jul 12, 2018
by
Don Gagne
Committed by
GitHub
Jul 12, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6711 from DonLakeFlyer/Orbit
Fix orbit radius
parents
8713316c
440913db
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
FlightDisplayViewMap.qml
src/FlightDisplay/FlightDisplayViewMap.qml
+6
-3
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+1
-1
No files found.
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
f73ccdd3
...
...
@@ -303,12 +303,11 @@ FlightMap {
visible
:
false
property
alias
center
:
_mapCircle
.
center
property
real
radius
:
defaultRadius
readonly
property
real
defaultRadius
:
30
function
show
(
coord
)
{
orbitMapCircle
.
radius
=
defaultRadius
_mapCircle
.
radius
.
rawValue
=
defaultRadius
orbitMapCircle
.
center
=
coord
orbitMapCircle
.
visible
=
true
}
...
...
@@ -317,12 +316,16 @@ FlightMap {
orbitMapCircle
.
visible
=
false
}
function
radius
()
{
return
_mapCircle
.
radius
.
rawValue
}
Component.onCompleted
:
guidedActionsController
.
orbitMapCircle
=
orbitMapCircle
QGCMapCircle
{
id
:
_mapCircle
interactive
:
true
radius.rawValue
:
orbitMapCircle
.
radius
radius.rawValue
:
30
}
}
...
...
src/FlightDisplay/GuidedActionsController.qml
View file @
f73ccdd3
...
...
@@ -389,7 +389,7 @@ Item {
_activeVehicle
.
setCurrentMissionSequence
(
actionData
)
break
case
actionOrbit
:
_activeVehicle
.
guidedModeOrbit
(
orbitMapCircle
.
center
,
orbitMapCircle
.
radius
,
_activeVehicle
.
altitudeAMSL
.
rawValue
+
actionAltitudeChange
)
_activeVehicle
.
guidedModeOrbit
(
orbitMapCircle
.
center
,
orbitMapCircle
.
radius
()
,
_activeVehicle
.
altitudeAMSL
.
rawValue
+
actionAltitudeChange
)
orbitMapCircle
.
hide
()
break
case
actionLandAbort
:
...
...
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