From 49be4fd63f54dd2ca88aa0bb6d05a4412ba87cb4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 17 Nov 2019 12:33:20 -0800 Subject: [PATCH] Fix gradient calc --- src/PlanView/PlanToolBarIndicators.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/PlanView/PlanToolBarIndicators.qml b/src/PlanView/PlanToolBarIndicators.qml index a5907fe2fa..7b9d457325 100644 --- a/src/PlanView/PlanToolBarIndicators.qml +++ b/src/PlanView/PlanToolBarIndicators.qml @@ -38,8 +38,7 @@ Item { property real _rowSpacing: ScreenTools.isMobile ? 1 : 0 property real _distance: _statusValid && _currentMissionItem ? _currentMissionItem.distance : NaN property real _altDifference: _statusValid && _currentMissionItem ? _currentMissionItem.altDifference : NaN - property real _gradient: _statusValid && _currentMissionItem && _currentMissionItem.distance > 0 ? Math.atan(_currentMissionItem.altDifference / _currentMissionItem.distance) : NaN - property real _gradientPercent: isNaN(_gradient) ? NaN : _gradient * 100 + property real _gradient: _statusValid && _currentMissionItem && _currentMissionItem.distance > 0 ? (Math.atan(_currentMissionItem.altDifference / _currentMissionItem.distance) * (180.0/Math.PI)) : NaN property real _azimuth: _statusValid && _currentMissionItem ? _currentMissionItem.azimuth : NaN property real _heading: _statusValid && _currentMissionItem ? _currentMissionItem.missionVehicleYaw : NaN property real _missionDistance: _missionValid ? missionDistance : NaN @@ -53,7 +52,7 @@ Item { property string _distanceText: isNaN(_distance) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_distance).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString property string _altDifferenceText: isNaN(_altDifference) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_altDifference).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString - property string _gradientText: isNaN(_gradient) ? "-.-" : _gradientPercent.toFixed(0) + " %" + property string _gradientText: isNaN(_gradient) ? "-.-" : _gradient.toFixed(0) + " %" property string _azimuthText: isNaN(_azimuth) ? "-.-" : Math.round(_azimuth) % 360 property string _headingText: isNaN(_azimuth) ? "-.-" : Math.round(_heading) % 360 property string _missionDistanceText: isNaN(_missionDistance) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_missionDistance).toFixed(0) + " " + QGroundControl.appSettingsDistanceUnitsString -- GitLab