From ed7bdc69c3157a6f237dd3a5edac81c997ca3cf1 Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Mon, 11 Mar 2019 14:18:52 +0100 Subject: [PATCH] befor trying to convert StructureScanMapVisual.qml into Roi.qml --- src/QuadView/QuadView.qml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/QuadView/QuadView.qml b/src/QuadView/QuadView.qml index fdde5fef2..a308c6902 100644 --- a/src/QuadView/QuadView.qml +++ b/src/QuadView/QuadView.qml @@ -186,7 +186,7 @@ QGCView { Connections { target: QGroundControl.airspaceManager - onAirspaceVisibleChanged: { + onAirspaceVisibleChanged: {oolStrip planControlColapsed = QGroundControl.airspaceManager.airspaceVisible } } @@ -601,20 +601,25 @@ QGCView { dropPanelComponent: syncDropPanel }, { - name: qsTr("Waypoint"), - iconSource: "/qmlimages/MapAddMission.svg", + name: qsTr("ROI"), + iconSource: "/qmlimages/Target.svg", toggle: true }, { - name: qsTr("ROI"), - iconSource: "/qmlimages/Target.svg", + name: qsTr("No Fly"), + iconSource: "/qmlimages/noFlyArea.svg", toggle: true }, { + name: qsTr("Calculate"), + iconSource: "/qmlimages/calculate.svg", + toggle: true + }, + /*{ name: _singleComplexItem ? _missionController.complexMissionItemNames[0] : qsTr("Pattern"), iconSource: "/qmlimages/MapDrawShape.svg", dropPanelComponent: _singleComplexItem ? undefined : patternDropPanel - }, + },*/ { name: qsTr("Center"), iconSource: "/qmlimages/MapCenter.svg", @@ -633,23 +638,27 @@ QGCView { onClicked: { switch (index) { case 1: - _addWaypointOnClick = checked - _addROIOnClick = false + addComplexItem(_missionController.complexMissionItemNames[2]) + /*_addWaypointOnClick = checked + _addROIOnClick = false*/ break case 2: + addComplexItem(_missionController.complexMissionItemNames[2]) + /* _addROIOnClick = checked - _addWaypointOnClick = false + _addWaypointOnClick = false*/ break case 3: - if (_singleComplexItem) { + + /*if (_singleComplexItem) { addComplexItem(_missionController.complexMissionItemNames[0]) - } + }*/ break case 5: editorMap.zoomLevel += 0.5 break case 6: - //editorMap.zoomLevel -= 0.5 + editorMap.zoomLevel -= 0.5 break } } -- 2.22.0