Browse Source

Merge pull request #6711 from DonLakeFlyer/Orbit

Fix orbit radius
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
f73ccdd36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      src/FlightDisplay/FlightDisplayViewMap.qml
  2. 2
      src/FlightDisplay/GuidedActionsController.qml

9
src/FlightDisplay/FlightDisplayViewMap.qml

@ -303,12 +303,11 @@ FlightMap { @@ -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 { @@ -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
}
}

2
src/FlightDisplay/GuidedActionsController.qml

@ -389,7 +389,7 @@ Item { @@ -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:

Loading…
Cancel
Save