From 127a8b2f7f28f183cbf602cca986315369093ffd Mon Sep 17 00:00:00 2001 From: Remek Zajac Date: Fri, 1 May 2020 13:26:44 +0200 Subject: [PATCH] more catches --- custom-example/res/CustomFlyViewOverlay.qml | 2 +- src/FlightMap/MapScale.qml | 2 +- src/PlanView/TerrainStatus.qml | 4 +++- src/QmlControls/QGroundControl/Specific/UnitsWizardPage.qml | 6 +++--- src/ui/preferences/GeneralSettings.qml | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/custom-example/res/CustomFlyViewOverlay.qml b/custom-example/res/CustomFlyViewOverlay.qml index ebae0ba3b..50bd38f3c 100644 --- a/custom-example/res/CustomFlyViewOverlay.qml +++ b/custom-example/res/CustomFlyViewOverlay.qml @@ -66,7 +66,7 @@ Item { if (activeVehicle && gcsPosition.latitude && Math.abs(gcsPosition.latitude) > 0.001 && gcsPosition.longitude && Math.abs(gcsPosition.longitude) > 0.001) { var gcs = QtPositioning.coordinate(gcsPosition.latitude, gcsPosition.longitude) var veh = activeVehicle.coordinate; - _distance = QGroundControl.metersToAppSettingsDistanceUnits(gcs.distanceTo(veh)); + _distance = QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(gcs.distanceTo(veh)); //-- Ignore absurd values if(_distance > 99999) _distance = 0; diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index 1ec4b77ec..b95b8ba36 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -121,7 +121,7 @@ Item { var leftCoord = mapControl.toCoordinate(Qt.point(0, scale.y), false /* clipToViewPort */) var rightCoord = mapControl.toCoordinate(Qt.point(scaleLinePixelLength, scale.y), false /* clipToViewPort */) var scaleLineMeters = Math.round(leftCoord.distanceTo(rightCoord)) - if (QGroundControl.settingsManager.unitsSettings.distanceUnits.value === UnitsSettings.DistanceUnitsFeet) { + if (QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits.value === UnitsSettings.HorizontalDistanceUnitsFeet) { calculateFeetRatio(scaleLineMeters, scaleLinePixelLength) } else { calculateMetersRatio(scaleLineMeters, scaleLinePixelLength) diff --git a/src/PlanView/TerrainStatus.qml b/src/PlanView/TerrainStatus.qml index ee3847a63..d93ab1bab 100644 --- a/src/PlanView/TerrainStatus.qml +++ b/src/PlanView/TerrainStatus.qml @@ -48,7 +48,9 @@ Rectangle { anchors.top: parent.bottom width: parent.height font.pointSize: ScreenTools.smallFontPointSize - text: qsTr("Height AMSL (%1)").arg(QGroundControl.appSettingsDistanceUnitsString) + text: qsTr("Height AMSL (%1)").arg( + QGroundControl.unitsConversion.appSettingsHorizontalDistanceUnitsString + ) horizontalAlignment: Text.AlignHCenter rotation: -90 transformOrigin: Item.TopLeft diff --git a/src/QmlControls/QGroundControl/Specific/UnitsWizardPage.qml b/src/QmlControls/QGroundControl/Specific/UnitsWizardPage.qml index 80df2bab5..893406500 100644 --- a/src/QmlControls/QGroundControl/Specific/UnitsWizardPage.qml +++ b/src/QmlControls/QGroundControl/Specific/UnitsWizardPage.qml @@ -57,18 +57,18 @@ BaseStartupWizardPage { model: [qsTr("Metric System"), qsTr("Imperial System")] Layout.preferredWidth: _comboFieldWidth - currentIndex: QGroundControl.settingsManager.unitsSettings.distanceUnits.value === UnitsSettings.DistanceUnitsMeters ? 0 : 1 + currentIndex: QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits.value === UnitsSettings.HorizontalDistanceUnitsMeters ? 0 : 1 onActivated: { var metric = (currentIndex === 0); - QGroundControl.settingsManager.unitsSettings.distanceUnits.value = metric ? UnitsSettings.DistanceUnitsMeters : UnitsSettings.DistanceUnitsFeet + QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits.value = metric ? UnitsSettings.HorizontalDistanceUnitsMeters : UnitsSettings.HorizontalDistanceUnitsFeet QGroundControl.settingsManager.unitsSettings.areaUnits.value = metric ? UnitsSettings.AreaUnitsSquareMeters : UnitsSettings.AreaUnitsSquareFeet QGroundControl.settingsManager.unitsSettings.speedUnits.value = metric ? UnitsSettings.SpeedUnitsMetersPerSecond : UnitsSettings.SpeedUnitsFeetPerSecond QGroundControl.settingsManager.unitsSettings.temperatureUnits.value = metric ? UnitsSettings.TemperatureUnitsCelsius : UnitsSettings.TemperatureUnitsFarenheit } } Repeater { - model: [ QGroundControl.settingsManager.unitsSettings.distanceUnits, QGroundControl.settingsManager.unitsSettings.areaUnits, QGroundControl.settingsManager.unitsSettings.speedUnits, QGroundControl.settingsManager.unitsSettings.temperatureUnits ] + model: [ QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits, QGroundControl.settingsManager.unitsSettings.areaUnits, QGroundControl.settingsManager.unitsSettings.speedUnits, QGroundControl.settingsManager.unitsSettings.temperatureUnits ] FactComboBox { Layout.preferredWidth: _comboFieldWidth fact: modelData diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 213202b43..0ace1bfbd 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -99,7 +99,7 @@ Rectangle { QGCLabel { text: modelData } } Repeater { - model: [ QGroundControl.settingsManager.unitsSettings.distanceUnits, QGroundControl.settingsManager.unitsSettings.areaUnits, QGroundControl.settingsManager.unitsSettings.speedUnits, QGroundControl.settingsManager.unitsSettings.temperatureUnits ] + model: [ QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits, QGroundControl.settingsManager.unitsSettings.areaUnits, QGroundControl.settingsManager.unitsSettings.speedUnits, QGroundControl.settingsManager.unitsSettings.temperatureUnits ] FactComboBox { Layout.preferredWidth: _comboFieldWidth fact: modelData @@ -162,7 +162,7 @@ Rectangle { text: qsTr("Map Provider") width: _labelWidth } - + QGCComboBox { id: mapCombo model: QGroundControl.mapEngineManager.mapProviderList -- 2.22.0