From ba2b94b9d89a5068107ec9f24c72a8ef2578f4e5 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 13 Dec 2017 13:23:44 -0800 Subject: [PATCH] Disable battery swap point display Number calc doesn't work so hiding for now --- src/MissionManager/MissionController.cc | 3 +++ src/PlanView/PlanToolBar.qml | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 4d96c86a5..8d923f608 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -1084,6 +1084,9 @@ void MissionController::_updateBatteryInfo(int waypointIndex) _missionFlightStatus.hoverAmpsTotal = (_missionFlightStatus.hoverTime / 60.0) * _missionFlightStatus.hoverAmps; _missionFlightStatus.cruiseAmpsTotal = (_missionFlightStatus.cruiseTime / 60.0) * _missionFlightStatus.cruiseAmps; _missionFlightStatus.batteriesRequired = ceil((_missionFlightStatus.hoverAmpsTotal + _missionFlightStatus.cruiseAmpsTotal) / _missionFlightStatus.ampMinutesAvailable); + // FIXME: Battery change point code pretty much doesn't work. The reason is that is treats complex items as a black box. It needs to be able to look + // inside complex items in order to determine a swap point that is interior to a complex item. Current the swap point display in PlanToolbar is + // disabled to do this problem. if (waypointIndex != -1 && _missionFlightStatus.batteriesRequired == 2 && _missionFlightStatus.batteryChangePoint == -1) { _missionFlightStatus.batteryChangePoint = waypointIndex - 1; } diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml index c37b38257..ffc92a4b8 100644 --- a/src/PlanView/PlanToolBar.qml +++ b/src/PlanView/PlanToolBar.qml @@ -283,13 +283,15 @@ Rectangle { } Item { width: 1; height: 1 } - +/* + FIXME: Swap point display is currently hidden since the code which calcs it doesn't work correctly QGCLabel { text: qsTr("Swap waypoint:"); font.pointSize: _dataFontSize; } QGCLabel { text: _batteryChangePointText font.pointSize: _dataFontSize Layout.minimumWidth: _mediumValueWidth } +*/ } } -- 2.22.0