zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add Plan/Fly switch to ToolStrip

QGC4.4
Gus Grubba 6 years ago
parent
fa793fe43d
commit
fed816bc93
2 changed files with 52 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/FlightDisplay/FlightDisplayView.qml
  2. 57
      src/PlanView/PlanView.qml

28
src/FlightDisplay/FlightDisplayView.qml
Unescape View File

@ -570,8 +570,9 @@ Item {
anchors.top: _mapAndVideo.top anchors.top: _mapAndVideo.top
z: _mapAndVideo.z + 4 z: _mapAndVideo.z + 4
maxHeight: (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y maxHeight: (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
buttonVisible: [_useChecklist, _guidedController.showTakeoff || !_guidedController.showLand, _guidedController.showLand && !_guidedController.showTakeoff, true, _guidedController.showPause, !_guidedController.showPause ]
buttonEnabled: [_useChecklist && activeVehicle, _guidedController.showTakeoff, _guidedController.showLand, _guidedController.showRTL, _guidedController.showPause, _anyActionAvailable ] buttonVisible: [true, _useChecklist, _guidedController.showTakeoff || !_guidedController.showLand, _guidedController.showLand && !_guidedController.showTakeoff, true, _guidedController.showPause, !_guidedController.showPause ]
buttonEnabled: [true, _useChecklist && activeVehicle, _guidedController.showTakeoff, _guidedController.showLand, _guidedController.showRTL, _guidedController.showPause, _anyActionAvailable ]
property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort
property var _actionModel: [ property var _actionModel: [
@ -609,8 +610,12 @@ Item {
model: [ model: [
{ {
name: "Checklist", name: "Plan",
iconSource: "/qmlimages/check.svg", iconSource: "/qmlimages/Plan.svg",
},
{
name: "Checklist",
iconSource: "/qmlimages/check.svg",
dropPanelComponent: checklistDropPanel dropPanelComponent: checklistDropPanel
}, },
{ {
@ -642,13 +647,18 @@ Item {
onClicked: { onClicked: {
guidedActionsController.closeAll() guidedActionsController.closeAll()
var action = model[index].action if(index === 0) {
if (action === -1) { mainWindow.showPlanView()
guidedActionList.model = _actionModel
guidedActionList.visible = true
} else { } else {
_guidedController.confirmAction(action) var action = model[index].action
if (action === -1) {
guidedActionList.model = _actionModel
guidedActionList.visible = true
} else {
_guidedController.confirmAction(action)
}
} }
} }
} }

57
src/PlanView/PlanView.qml
Unescape View File

@ -544,16 +544,22 @@ Item {
anchors.topMargin: _toolButtonTopMargin + anchors.leftMargin anchors.topMargin: _toolButtonTopMargin + anchors.leftMargin
anchors.top: parent.top anchors.top: parent.top
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
showAlternateIcon: [ _planMasterController.dirty, false, false, false, false, false, false ]
rotateImage: [ _planMasterController.syncInProgress, false, false, false, false, false, false ] showAlternateIcon: [ false, _planMasterController.dirty, false, false, false, false, false, false ]
animateImage: [ _planMasterController.dirty, false, false, false, false, false, false ] rotateImage: [ false, _planMasterController.syncInProgress, false, false, false, false, false, false ]
buttonEnabled: [ !_planMasterController.syncInProgress, true, true, true, true, true, true ] animateImage: [ false, _planMasterController.dirty, false, false, false, false, false, false ]
buttonVisible: [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ] buttonEnabled: [ true, !_planMasterController.syncInProgress, true, true, true, true, true, true ]
buttonVisible: [ true, true, true, _waypointsOnlyMode, true, true, false, false ]
maxHeight: mapScale.y - toolStrip.y maxHeight: mapScale.y - toolStrip.y
property bool _showZoom: !ScreenTools.isMobile property bool _showZoom: !ScreenTools.isMobile
model: [ model: [
{ {
name: qsTr("Fly"),
iconSource: "/qmlimages/PaperPlane.svg",
},
{
name: qsTr("File"), name: qsTr("File"),
iconSource: "/qmlimages/MapSync.svg", iconSource: "/qmlimages/MapSync.svg",
alternateIconSource: "/qmlimages/MapSyncChanged.svg", alternateIconSource: "/qmlimages/MapSyncChanged.svg",
@ -591,25 +597,28 @@ Item {
onClicked: { onClicked: {
switch (index) { switch (index) {
case 1: case 0:
_addWaypointOnClick = checked mainWindow.showFlyView()
_addROIOnClick = false break;
break case 2:
case 2: _addWaypointOnClick = checked
_addROIOnClick = checked _addROIOnClick = false
_addWaypointOnClick = false break
break case 3:
case 3: _addROIOnClick = checked
if (_singleComplexItem) { _addWaypointOnClick = false
addComplexItem(_missionController.complexMissionItemNames[0]) break
} case 4:
break if (_singleComplexItem) {
case 5: addComplexItem(_missionController.complexMissionItemNames[0])
editorMap.zoomLevel += 0.5 }
break break
case 6: case 6:
editorMap.zoomLevel -= 0.5 editorMap.zoomLevel += 0.5
break break
case 7:
editorMap.zoomLevel -= 0.5
break
} }
} }
} }

Write Preview
Loading…
Cancel
Save