Commit 440913db authored by DonLakeFlyer's avatar DonLakeFlyer

Fix orbit radius

parent 8713316c
...@@ -303,12 +303,11 @@ FlightMap { ...@@ -303,12 +303,11 @@ FlightMap {
visible: false visible: false
property alias center: _mapCircle.center property alias center: _mapCircle.center
property real radius: defaultRadius
readonly property real defaultRadius: 30 readonly property real defaultRadius: 30
function show(coord) { function show(coord) {
orbitMapCircle.radius = defaultRadius _mapCircle.radius.rawValue = defaultRadius
orbitMapCircle.center = coord orbitMapCircle.center = coord
orbitMapCircle.visible = true orbitMapCircle.visible = true
} }
...@@ -317,12 +316,16 @@ FlightMap { ...@@ -317,12 +316,16 @@ FlightMap {
orbitMapCircle.visible = false orbitMapCircle.visible = false
} }
function radius() {
return _mapCircle.radius.rawValue
}
Component.onCompleted: guidedActionsController.orbitMapCircle = orbitMapCircle Component.onCompleted: guidedActionsController.orbitMapCircle = orbitMapCircle
QGCMapCircle { QGCMapCircle {
id: _mapCircle id: _mapCircle
interactive: true interactive: true
radius.rawValue: orbitMapCircle.radius radius.rawValue: 30
} }
} }
......
...@@ -389,7 +389,7 @@ Item { ...@@ -389,7 +389,7 @@ Item {
_activeVehicle.setCurrentMissionSequence(actionData) _activeVehicle.setCurrentMissionSequence(actionData)
break break
case actionOrbit: case actionOrbit:
_activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius, _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange) _activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius(), _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange)
orbitMapCircle.hide() orbitMapCircle.hide()
break break
case actionLandAbort: case actionLandAbort:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment