Merge pull request #7789 from DonLakeFlyer/SplitIndicator

Use new SplitIndicator control

src/FlightMap/MapItems/SplitIndicator.qml

@@ -20,6 +20,7 @@ Rectangle {
     radius:         width / 2
     border.color:   indicatorColor
     color:          "transparent"
+    opacity:        0.75
 
     property color indicatorColor: "white"
 

src/MissionManager/QGCMapPolygonVisuals.qml

@@ -267,32 +267,14 @@ Item {
 
         MapQuickItem {
             id:             mapQuickItem
-            anchorPoint.x:  dragHandle.width / 2
-            anchorPoint.y:  dragHandle.height / 2
+            anchorPoint.x:  sourceItem.width / 2
+            anchorPoint.y:  sourceItem.height / 2
             visible:        !_circle
 
             property int vertexIndex
 
-            sourceItem: Rectangle {
-                id:         dragHandle
-                width:      ScreenTools.defaultFontPixelHeight * 1.5
-                height:     width
-                radius:     width / 2
-                border.color:      "white"
-                color:      "transparent"
-                opacity:    .50
+            sourceItem: SplitIndicator {
                 z: _zorderSplitHandle
-
-                QGCLabel {
-                    anchors.horizontalCenter:   parent.horizontalCenter
-                    anchors.verticalCenter:     parent.verticalCenter
-                    text:                       "+"
-                }
-
-                QGCMouseArea {
-                    fillItem:   parent
-                    onClicked:  mapPolygon.splitPolygonSegment(mapQuickItem.vertexIndex)
-                }
             }
         }
     }

src/MissionManager/QGCMapPolylineVisuals.qml

@@ -98,8 +98,6 @@ Item {
         }
     }
 
-    onVisibleChanged: _polylineComponent.visible = visible
-
     Component.onCompleted: {
         addVisuals()
         if (interactive) {
@@ -175,6 +173,7 @@ Item {
             line.width: lineWidth
             line.color: lineColor
             path:       mapPolyline.path
+            visible:    _root.visible
         }
     }
 
@@ -183,34 +182,17 @@ Item {
 
         MapQuickItem {
             id:             mapQuickItem
-            anchorPoint.x:  splitHandle.width / 2
-            anchorPoint.y:  splitHandle.height / 2
-
-            property int vertexIndex
-
-            sourceItem: Rectangle {
-                id:             splitHandle
-                width:          ScreenTools.defaultFontPixelHeight * 1.5
-                height:         width
-                radius:         width / 2
-                border.color:   "white"
-                color:          "transparent"
-                opacity:        .50
+            anchorPoint.x:  sourceItem.width / 2
+            anchorPoint.y:  sourceItem.height / 2
             z:              _zorderSplitHandle
 
-                QGCLabel {
-                    anchors.horizontalCenter:   parent.horizontalCenter
-                    anchors.verticalCenter:     parent.verticalCenter
-                    text:                       "+"
-                }
+            property int vertexIndex
 
-                QGCMouseArea {
-                    fillItem:   parent
+            sourceItem: SplitIndicator {
                 onClicked:  mapPolyline.splitSegment(mapQuickItem.vertexIndex)
             }
         }
     }
-    }
 
     Component {
         id: splitHandlesComponent

src/PlanView/CorridorScanMapVisual.qml

@@ -17,6 +17,8 @@ import QGroundControl.Controls      1.0
 
 /// Corridor Scan Complex Mission Item visuals
 TransectStyleMapVisuals {
+    polygonInteractive: false
+
     property bool _currentItem: object.isCurrentItem
 
     Component.onCompleted: mapPolylineVisuals.addInitialPolyline()

src/PlanView/SurveyMapVisual.qml

@@ -20,6 +20,8 @@ import QGroundControl.FlightMap     1.0
 
 /// Survey Complex Mission Item visuals
 TransectStyleMapVisuals {
+    polygonInteractive: true
+
     property var _mapPolygon: object.surveyAreaPolygon
 
     /// Add an initial 4 sided polygon if there is none

src/PlanView/TransectStyleMapVisuals.qml

@@ -23,6 +23,7 @@ Item {
     id: _root
 
     property var    map                                                 ///< Map control to place item in
+    property bool   polygonInteractive: true
 
     property var    _missionItem:               object
     property var    _mapPolygon:                object.surveyAreaPolygon
@@ -69,7 +70,7 @@ Item {
         id:                 mapPolygonVisuals
         mapControl:         map
         mapPolygon:         _mapPolygon
-        interactive:        _missionItem.isCurrentItem
+        interactive:        polygonInteractive && _missionItem.isCurrentItem
         borderWidth:        1
         borderColor:        "black"
         interiorColor:      "green"