Merge pull request #6473 from DonLakeFlyer/FWLandingFly

Use FW Landing visuals in Fly View

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()) {

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; }
 

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()