Skip to content

Q
qgroundcontrol
Commit ed7bdc69 authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files
Options

befor trying to convert StructureScanMapVisual.qml into Roi.qml

parent 3a459465
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 12 deletions
src/QuadView/QuadView.qml
View file @ ed7bdc69
...@@ -186,7 +186,7 @@ QGCView { ...@@ -186,7 +186,7 @@ QGCView {
Connections { Connections {
target: QGroundControl.airspaceManager target: QGroundControl.airspaceManager
onAirspaceVisibleChanged: { onAirspaceVisibleChanged: {oolStrip
planControlColapsed = QGroundControl.airspaceManager.airspaceVisible planControlColapsed = QGroundControl.airspaceManager.airspaceVisible
} }
} }
...@@ -601,20 +601,25 @@ QGCView { ...@@ -601,20 +601,25 @@ QGCView {
dropPanelComponent: syncDropPanel dropPanelComponent: syncDropPanel
}, },
{ {
name: qsTr("Waypoint"), name: qsTr("ROI"),
iconSource: "/qmlimages/MapAddMission.svg", iconSource: "/qmlimages/Target.svg",
toggle: true toggle: true
}, },
{ {
name: qsTr("ROI"), name: qsTr("No Fly"),
iconSource: "/qmlimages/Target.svg", iconSource: "/qmlimages/noFlyArea.svg",
toggle: true toggle: true
}, },
{ {
name: qsTr("Calculate"),
iconSource: "/qmlimages/calculate.svg",
toggle: true
},
/*{
name: _singleComplexItem ? _missionController.complexMissionItemNames[0] : qsTr("Pattern"), name: _singleComplexItem ? _missionController.complexMissionItemNames[0] : qsTr("Pattern"),
iconSource: "/qmlimages/MapDrawShape.svg", iconSource: "/qmlimages/MapDrawShape.svg",
dropPanelComponent: _singleComplexItem ? undefined : patternDropPanel dropPanelComponent: _singleComplexItem ? undefined : patternDropPanel
}, },*/
{ {
name: qsTr("Center"), name: qsTr("Center"),
iconSource: "/qmlimages/MapCenter.svg", iconSource: "/qmlimages/MapCenter.svg",
...@@ -633,23 +638,27 @@ QGCView { ...@@ -633,23 +638,27 @@ QGCView {
onClicked: { onClicked: {
switch (index) { switch (index) {
case 1: case 1:
_addWaypointOnClick = checked addComplexItem(_missionController.complexMissionItemNames[2])
_addROIOnClick = false /*_addWaypointOnClick = checked
_addROIOnClick = false*/
break break
case 2: case 2:
addComplexItem(_missionController.complexMissionItemNames[2])
/*
_addROIOnClick = checked _addROIOnClick = checked
_addWaypointOnClick = false _addWaypointOnClick = false*/
break break
case 3: case 3:
if (_singleComplexItem) {
/*if (_singleComplexItem) {
addComplexItem(_missionController.complexMissionItemNames[0]) addComplexItem(_missionController.complexMissionItemNames[0])
} }*/
break break
case 5: case 5:
editorMap.zoomLevel += 0.5 editorMap.zoomLevel += 0.5
break break
case 6: case 6:
//editorMap.zoomLevel -= 0.5 editorMap.zoomLevel -= 0.5
break break
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment