From df842d09a796f9dcf93a2d906e0fe3a2e518fd4f Mon Sep 17 00:00:00 2001 From: Pierre TILAK Date: Wed, 30 Oct 2019 10:17:19 +1300 Subject: [PATCH 1/3] Use current selected item as index for insert --- src/PlanView/PlanView.qml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml index d5f8ea0..21a6d3c 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) From 883956be099c56aeea4f3d0558768a7c30a1c6eb Mon Sep 17 00:00:00 2001 From: Pierre TILAK Date: Wed, 30 Oct 2019 15:15:02 +1300 Subject: [PATCH 2/3] Add Trash to MissionItemEditor, pimp icon --- resources/TrashDelete.svg | 122 ++++++++++++++++++++++++++++++++++--- src/PlanView/MissionItemEditor.qml | 1 + 2 files changed, 116 insertions(+), 7 deletions(-) diff --git a/resources/TrashDelete.svg b/resources/TrashDelete.svg index cb4c5a3..8d8af7f 100644 --- a/resources/TrashDelete.svg +++ b/resources/TrashDelete.svg @@ -1,8 +1,116 @@ - + - - - - + +image/svg+xml + + + \ No newline at end of file diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml index baa9c65..f39160a 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 { From be2d85d6c693d0d110eb43c009c282e4bd10c60f Mon Sep 17 00:00:00 2001 From: Pierre TILAK Date: Tue, 12 Nov 2019 11:44:07 +1300 Subject: [PATCH 3/3] Remove duplicate in Hamburger --- src/PlanView/MissionItemEditor.qml | 40 -------------------------------------- 1 file changed, 40 deletions(-) diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml index f39160a..a611905 100644 --- a/src/PlanView/MissionItemEditor.qml +++ b/src/PlanView/MissionItemEditor.qml @@ -140,46 +140,6 @@ Rectangle { 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 onTriggered: mainWindow.showComponentDialog(editPositionDialog, qsTr("Edit Position"), mainWindow.showDialogDefaultWidth, StandardButton.Close)