Unverified Commit 6fa7ef2d authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8173 from DonLakeFlyer/Fixes

Fixes
parents 16baab6f b308d72d
......@@ -48,6 +48,8 @@ FlightMap {
property var _activeVehicleCoordinate: activeVehicle ? activeVehicle.coordinate : QtPositioning.coordinate()
property real _toolButtonTopMargin: parent.height - mainWindow.height + (ScreenTools.defaultFontPixelHeight / 2)
property bool _airspaceEnabled: QGroundControl.airmapSupported ? (QGroundControl.settingsManager.airMapSettings.enableAirMap.rawValue && QGroundControl.airspaceManager.connected): false
property var _flyViewSettings: QGroundControl.settingsManager.flyViewSettings
property bool _keepMapCenteredOnVehicle: _flyViewSettings.keepMapCenteredOnVehicle.rawValue
property bool _disableVehicleTracking: false
property bool _keepVehicleCentered: mainIsMap ? false : true
......@@ -129,7 +131,7 @@ FlightMap {
function updateMapToVehiclePosition() {
// We let FlightMap handle first vehicle position
if (firstVehiclePositionReceived && _activeVehicleCoordinate.isValid && !_disableVehicleTracking) {
if (!_keepMapCenteredOnVehicle && firstVehiclePositionReceived && _activeVehicleCoordinate.isValid && !_disableVehicleTracking) {
if (_keepVehicleCentered) {
flightMap.center = _activeVehicleCoordinate
} else {
......@@ -140,6 +142,12 @@ FlightMap {
}
}
on_ActiveVehicleCoordinateChanged: {
if (_keepMapCenteredOnVehicle && _activeVehicleCoordinate.isValid && !_disableVehicleTracking) {
flightMap.center = _activeVehicleCoordinate
}
}
Timer {
id: panRecenterTimer
interval: 10000
......
......@@ -107,7 +107,6 @@ Item {
}
QGCMenuItem {
text: qsTr("Reset all to firmware's defaults")
visible: !activeVehicle.apmFirmware
onTriggered: mainWindow.showComponentDialog(resetToDefaultConfirmComponent, qsTr("Reset All"), mainWindow.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Reset)
}
QGCMenuItem {
......
......@@ -37,6 +37,12 @@
"type": "bool",
"defaultValue": false
},
{
"name": "keepMapCenteredOnVehicle",
"shortDescription": "Keep map centered on vehicle",
"type": "bool",
"defaultValue": false
},
{
"name": "maxGoToLocationDistance",
"shortDescription": "Maximum distance allowed for Go To Location.",
......
......@@ -24,3 +24,4 @@ DECLARE_SETTINGSFACT(FlyViewSettings, alternateInstrumentPanel)
DECLARE_SETTINGSFACT(FlyViewSettings, showAdditionalIndicatorsCompass)
DECLARE_SETTINGSFACT(FlyViewSettings, lockNoseUpCompass)
DECLARE_SETTINGSFACT(FlyViewSettings, maxGoToLocationDistance)
DECLARE_SETTINGSFACT(FlyViewSettings, keepMapCenteredOnVehicle)
......@@ -26,4 +26,5 @@ public:
DEFINE_SETTINGFACT(showAdditionalIndicatorsCompass)
DEFINE_SETTINGFACT(lockNoseUpCompass)
DEFINE_SETTINGFACT(maxGoToLocationDistance)
DEFINE_SETTINGFACT(keepMapCenteredOnVehicle)
};
......@@ -257,7 +257,7 @@ Rectangle {
setupIndicator: false
text: qsTr("PX4Flow")
Layout.fillWidth: true
onClicked: showPX4FlowPanel(this, "PX4FlowSensor.qml")
onClicked: showPanel(this, "PX4FlowSensor.qml")
}
SubMenuButton {
......@@ -268,7 +268,7 @@ Rectangle {
visible: _fullParameterVehicleAvailable && joystickManager.joysticks.length !== 0
text: qsTr("Joystick")
Layout.fillWidth: true
onClicked: showJoystickPanel(this, "JoystickConfig.qml")
onClicked: showPanel(this, "JoystickConfig.qml")
}
Repeater {
......
......@@ -468,6 +468,14 @@ Rectangle {
property Fact _useChecklist: QGroundControl.settingsManager.appSettings.useChecklist
}
FactCheckBox {
text: qsTr("Keep Map Centered On Vehicle")
fact: _keepMapCenteredOnVehicle
visible: _keepMapCenteredOnVehicle.visible
property Fact _keepMapCenteredOnVehicle: QGroundControl.settingsManager.flyViewSettings.keepMapCenteredOnVehicle
}
FactCheckBox {
text: qsTr("Show Telemetry Log Replay Status Bar")
fact: _showLogReplayStatusBar
......
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