From 1314e10838f0e87dbf60af8891f7ba34ec6717d7 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 19 Aug 2016 21:11:03 -0700 Subject: [PATCH] Survey area and # shots moves to survey item editor --- src/MissionEditor/MissionItemStatus.qml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 7523ba2e2..e767d60e2 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -50,8 +50,6 @@ Rectangle { property real _gradient: _statusValid && _currentMissionItem.distance > 0 ? Math.atan(_currentMissionItem.altDifference / _currentMissionItem.distance) : 0 property real _gradientPercent: isNaN(_gradient) ? 0 : _gradient * 100 property real _azimuth: _statusValid ? _currentMissionItem.azimuth : -1 - property int _numberShots: _currentSurvey ? _currentMissionItem.cameraShots : 0 - property real _coveredArea: _currentSurvey ? _currentMissionItem.coveredArea : 0 property real _missionDistance: _missionValid ? missionDistance : 0 property real _missionMaxTelemetry: _missionValid ? missionMaxTelemetry : 0 property real _missionTime: _missionValid && _missionSpeed > 0 ? (_isVTOL ? _hoverTime + _cruiseTime : _missionDistance / _missionSpeed) : 0 @@ -71,8 +69,6 @@ Rectangle { property string _altText: _statusValid ? QGroundControl.metersToAppSettingsDistanceUnits(_altDifference).toFixed(2) + " " + QGroundControl.appSettingsDistanceUnitsString : " " property string _gradientText: _statusValid ? _gradientPercent.toFixed(0) + "%" : " " property string _azimuthText: _statusValid ? Math.round(_azimuth) : " " - property string _numberShotsText: _currentSurvey ? _numberShots.toFixed(0) : " " - property string _coveredAreaText: _currentSurvey ? QGroundControl.squareMetersToAppSettingsAreaUnits(_coveredArea).toFixed(2) + " " + QGroundControl.appSettingsAreaUnitsString : " " property string _missionDistanceText: _missionValid ? QGroundControl.metersToAppSettingsDistanceUnits(_missionDistance).toFixed(2) + " " + QGroundControl.appSettingsDistanceUnitsString : " " property string _missionTimeText: _missionValid ? _missionTime.toFixed(0) + "s" : " " property string _missionMaxTelemetryText: _missionValid ? QGroundControl.metersToAppSettingsDistanceUnits(_missionMaxTelemetry).toFixed(2) + " " + QGroundControl.appSettingsDistanceUnitsString : " " @@ -113,24 +109,6 @@ Rectangle { QGCLabel { text: qsTr("Azimuth:") } QGCLabel { text: _azimuthText } - - QGCLabel { - text: qsTr("# shots:") - visible: _currentSurvey - } - QGCLabel { - text: _numberShotsText - visible: _currentSurvey - } - - QGCLabel { - text: qsTr("Covered area:") - visible: _currentSurvey - } - QGCLabel { - text: _coveredAreaText - visible: _currentSurvey - } } ListView { -- 2.22.0