From 06d6c9395791a8a125e2e206f9f9f9d059d6203f Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 20 May 2018 13:30:05 -0700 Subject: [PATCH] Use FW Landing visuals in Fly --- src/MissionManager/MissionController.cc | 6 ++---- src/MissionManager/VisualMissionItem.h | 2 ++ src/PlanView/FWLandingPatternMapVisual.qml | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index e518d4a64..ab3a44e70 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -1825,10 +1825,8 @@ void MissionController::setDirty(bool dirty) void MissionController::_scanForAdditionalSettings(QmlObjectListModel* visualItems, Vehicle* vehicle) { - if (!_flyView) { - // First we look for a Fixed Wing Landing Pattern which is at the end - FixedWingLandingComplexItem::scanForItem(visualItems, _flyView, vehicle); - } + // First we look for a Fixed Wing Landing Pattern which is at the end + FixedWingLandingComplexItem::scanForItem(visualItems, _flyView, vehicle); int scanIndex = 0; while (scanIndex < visualItems->count()) { diff --git a/src/MissionManager/VisualMissionItem.h b/src/MissionManager/VisualMissionItem.h index 21056a29d..7050c6886 100644 --- a/src/MissionManager/VisualMissionItem.h +++ b/src/MissionManager/VisualMissionItem.h @@ -66,6 +66,7 @@ public: Q_PROPERTY(double specifiedGimbalPitch READ specifiedGimbalPitch NOTIFY specifiedGimbalPitchChanged) ///< Gimbal pitch, NaN for not specified Q_PROPERTY(double missionGimbalYaw READ missionGimbalYaw NOTIFY missionGimbalYawChanged) ///< Current gimbal yaw state at this point in mission Q_PROPERTY(double missionVehicleYaw READ missionVehicleYaw NOTIFY missionVehicleYawChanged) ///< Expected vehicle yaw at this point in mission + Q_PROPERTY(bool flyView READ flyView CONSTANT) // The following properties are calculated/set by the MissionController recalc methods @@ -87,6 +88,7 @@ public: double distance (void) const { return _distance; } bool isCurrentItem (void) const { return _isCurrentItem; } double terrainAltitude (void) const { return _terrainAltitude; } + bool flyView (void) const { return _flyView; } QmlObjectListModel* childItems(void) { return &_childItems; } diff --git a/src/PlanView/FWLandingPatternMapVisual.qml b/src/PlanView/FWLandingPatternMapVisual.qml index b6fc98884..5792356bb 100644 --- a/src/PlanView/FWLandingPatternMapVisual.qml +++ b/src/PlanView/FWLandingPatternMapVisual.qml @@ -97,11 +97,11 @@ Item { Component.onCompleted: { if (_missionItem.landingCoordSet) { showItemVisuals() - if (_missionItem.isCurrentItem) { + if (!_missionItem.flyView && _missionItem.isCurrentItem) { showDragAreas() } _setFlightPath() - } else if (_missionItem.isCurrentItem) { + } else if (!_missionItem.flyView && _missionItem.isCurrentItem) { showMouseArea() } } @@ -116,6 +116,9 @@ Item { target: _missionItem onIsCurrentItemChanged: { + if (_missionItem.flyView) { + return + } if (_missionItem.isCurrentItem) { if (_missionItem.landingCoordSet) { showDragAreas() @@ -129,6 +132,9 @@ Item { } onLandingCoordSetChanged: { + if (_missionItem.flyView) { + return + } if (_missionItem.landingCoordSet) { hideMouseArea() showItemVisuals() -- 2.22.0