diff --git a/resources/TrashDelete.svg b/resources/TrashDelete.svg
index cb4c5a3d7a24e8b7eb722bdd3730bfa4a5d70704..8d8af7f4e4dbbfdc2b3bd7f1d537b066eff67836 100644
--- a/resources/TrashDelete.svg
+++ b/resources/TrashDelete.svg
@@ -1,8 +1,116 @@
-
+
-
+
+
\ No newline at end of file
diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml
index baa9c655b9cdbd3544bd12f350aa41e1883fbce2..a6119058eb20f1af427d6774aef4f641c5c94596 100644
--- a/src/PlanView/MissionItemEditor.qml
+++ b/src/PlanView/MissionItemEditor.qml
@@ -47,6 +47,7 @@ Rectangle {
readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2
readonly property real _radius: ScreenTools.defaultFontPixelWidth / 2
readonly property real _hamburgerSize: commandPicker.height * 0.75
+ readonly property real _trashSize: commandPicker.height * 0.75
readonly property bool _waypointsOnlyMode: QGroundControl.corePlugin.options.missionWaypointsOnly
QGCPalette {
@@ -138,46 +139,6 @@ Rectangle {
QGCMenu {
id: hamburgerMenu
- QGCMenuItem {
- text: qsTr("Insert waypoint")
- onTriggered: insertWaypoint()
- }
-
- QGCMenu {
- id: patternMenu
- title: qsTr("Insert pattern")
- visible: !_singleComplexItem
-
- Instantiator {
- model: _missionController.complexMissionItemNames
-
- onObjectAdded: patternMenu.insertItem(index, object)
- onObjectRemoved: patternMenu.removeItem(object)
-
- QGCMenuItem {
- text: modelData
- onTriggered: insertComplexItem(modelData)
- }
- }
- }
-
- QGCMenuItem {
- text: qsTr("Insert ") + _missionController.complexMissionItemNames[0]
- visible: _singleComplexItem
- onTriggered: insertComplexItem(_missionController.complexMissionItemNames[0])
- }
-
- QGCMenuItem {
- text: qsTr("Delete")
- onTriggered: remove()
- }
-
- QGCMenuItem {
- text: qsTr("Change command...")
- onTriggered: commandPicker.clicked()
- visible: missionItem.isSimpleItem && !_waypointsOnlyMode
- }
-
QGCMenuItem {
text: qsTr("Edit position...")
visible: missionItem.specifiesCoordinate
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index d5f8ea0391f96d4dcbd69730cef31cfcb931a849..21a6d3ce298d8571ff388ef53b183292786a7e92 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -65,7 +65,14 @@ Item {
coordinate.latitude = coordinate.latitude.toFixed(_decimalPlaces)
coordinate.longitude = coordinate.longitude.toFixed(_decimalPlaces)
coordinate.altitude = coordinate.altitude.toFixed(_decimalPlaces)
- insertComplexMissionItem(complexItemName, coordinate, _missionController.visualItems.count)
+ var next_index = _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex)+1
+ if(next_index ==1 && _missionController.visualItems.count >1){
+ console.log(next_index, _missionController.visualItems.count)
+ insertComplexMissionItem(complexItemName, coordinate, next_index+1)
+ }
+ else if(next_index <= _missionController.visualItems.count){
+ insertComplexMissionItem(complexItemName, coordinate, next_index)
+ }
}
function insertComplexMissionItem(complexItemName, coordinate, index) {
@@ -468,7 +475,14 @@ Item {
switch (_editingLayer) {
case _layerMission:
if (_addWaypointOnClick) {
- insertSimpleMissionItem(coordinate, _missionController.visualItems.count)
+ var next_index = _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex)+1
+ if(next_index ==1 && _missionController.visualItems.count >1){
+ console.log(next_index, _missionController.visualItems.count)
+ insertSimpleMissionItem(coordinate, next_index+1)
+ }
+ else if(next_index <= _missionController.visualItems.count){
+ insertSimpleMissionItem(coordinate, next_index)
+ }
} else if (_addROIOnClick) {
_addROIOnClick = false
insertROIMissionItem(coordinate, _missionController.visualItems.count)