Skip to content

Q
qgroundcontrol
Commit f299ff45 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Added a Help button to the Plan View 

Also handling the toggling of the various panes on the right side of the screen to match the current selected task.
parent 37bd04f8
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 12 deletions
qgroundcontrol.qrc
View file @ f299ff45
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file> <file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
<!-- Map Buttons --> <!-- Map Buttons -->
<file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
<file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file> <file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
<file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file> <file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file>
<file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file> <file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
......
src/FlightMap/Images/Help.svg 0 → 100644
View file @ f299ff45
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="-53" cy="82" r="22.38"/>
<g>
<path fill="#FFFFFF" d="M-54.662,89.026c-0.012-0.439-0.018-0.768-0.018-0.987c0-1.291,0.183-2.406,0.548-3.344
c0.268-0.707,0.7-1.419,1.297-2.138c0.438-0.524,1.227-1.288,2.365-2.293s1.878-1.806,2.219-2.403
c0.341-0.597,0.511-1.249,0.511-1.955c0-1.279-0.499-2.403-1.498-3.372c-0.998-0.969-2.222-1.453-3.671-1.453
c-1.4,0-2.569,0.439-3.507,1.316c-0.938,0.877-1.553,2.248-1.845,4.112l-3.379-0.402c0.304-2.497,1.209-4.41,2.712-5.738
c1.504-1.328,3.492-1.992,5.964-1.992c2.618,0,4.706,0.713,6.265,2.138c1.559,1.425,2.338,3.149,2.338,5.172
c0,1.17-0.274,2.248-0.822,3.235s-1.619,2.187-3.215,3.6c-1.072,0.95-1.772,1.651-2.1,2.102c-0.329,0.451-0.572,0.969-0.731,1.553
c-0.158,0.585-0.25,1.535-0.274,2.851H-54.662z M-54.863,95.623v-3.746h3.744v3.746H-54.863z"/>
</g>
</svg>
src/MissionEditor/MissionEditor.qml
View file @ f299ff45
...@@ -47,6 +47,7 @@ QGCView { ...@@ -47,6 +47,7 @@ QGCView {
property var _missionItems: controller.missionItems property var _missionItems: controller.missionItems
property bool _showHomePositionManager: false property bool _showHomePositionManager: false
property bool _addMissionItems: false property bool _addMissionItems: false
property bool _showHelpPanel: true
property var _homePositionManager: QGroundControl.homePositionManager property var _homePositionManager: QGroundControl.homePositionManager
property string _homePositionName: _homePositionManager.homePositions.get(0).name property string _homePositionName: _homePositionManager.homePositions.get(0).name
...@@ -62,6 +63,12 @@ QGCView { ...@@ -62,6 +63,12 @@ QGCView {
id: _dropButtonsExclusiveGroup id: _dropButtonsExclusiveGroup
} }
function disableToggles() {
_showHomePositionManager = false
_addMissionItems = false
_showHelpPanel = false
}
function setCurrentItem(index) { function setCurrentItem(index) {
for (var i=0; i<_missionItems.count; i++) { for (var i=0; i<_missionItems.count; i++) {
_missionItems.get(i).isCurrentItem = (i == index) _missionItems.get(i).isCurrentItem = (i == index)
...@@ -141,8 +148,8 @@ QGCView { ...@@ -141,8 +148,8 @@ QGCView {
buttonImage: "/qmlimages/MapAddMission.svg" buttonImage: "/qmlimages/MapAddMission.svg"
exclusiveGroup: _dropButtonsExclusiveGroup exclusiveGroup: _dropButtonsExclusiveGroup
onClicked: { onClicked: {
disableToggles()
_addMissionItems = addMissionItemsButton.checked _addMissionItems = addMissionItemsButton.checked
_showHomePositionManager = false
} }
} }
...@@ -151,8 +158,8 @@ QGCView { ...@@ -151,8 +158,8 @@ QGCView {
buttonImage: "/qmlimages/MapHome.svg" buttonImage: "/qmlimages/MapHome.svg"
exclusiveGroup: _dropButtonsExclusiveGroup exclusiveGroup: _dropButtonsExclusiveGroup
onClicked: { onClicked: {
disableToggles()
_showHomePositionManager = homePositionManagerButton.checked _showHomePositionManager = homePositionManagerButton.checked
_addMissionItems = false
} }
} }
...@@ -164,8 +171,7 @@ QGCView { ...@@ -164,8 +171,7 @@ QGCView {
exclusiveGroup: _dropButtonsExclusiveGroup exclusiveGroup: _dropButtonsExclusiveGroup
onClicked: { onClicked: {
_showHomePositionManager = false disableToggles()
_addMissionItems = false
} }
dropDownComponent: Component { dropDownComponent: Component {
...@@ -242,8 +248,7 @@ QGCView { ...@@ -242,8 +248,7 @@ QGCView {
exclusiveGroup: _dropButtonsExclusiveGroup exclusiveGroup: _dropButtonsExclusiveGroup
onClicked: { onClicked: {
_showHomePositionManager = false disableToggles()
_addMissionItems = false
} }
dropDownComponent: Component { dropDownComponent: Component {
...@@ -299,8 +304,7 @@ QGCView { ...@@ -299,8 +304,7 @@ QGCView {
exclusiveGroup: _dropButtonsExclusiveGroup exclusiveGroup: _dropButtonsExclusiveGroup
onClicked: { onClicked: {
_showHomePositionManager = false disableToggles()
_addMissionItems = false
} }
dropDownComponent: Component { dropDownComponent: Component {
...@@ -326,6 +330,18 @@ QGCView { ...@@ -326,6 +330,18 @@ QGCView {
} }
} }
} }
RoundButton {
id: showHelpButton
buttonImage: "/qmlimages/Help.svg"
exclusiveGroup: _dropButtonsExclusiveGroup
checked: true
onClicked: {
disableToggles()
_showHelpPanel = showHelpButton.checked
}
}
} }
MissionItemIndicator { MissionItemIndicator {
...@@ -334,7 +350,14 @@ QGCView { ...@@ -334,7 +350,14 @@ QGCView {
coordinate: _homePositionCoordinate coordinate: _homePositionCoordinate
z: 2 z: 2
onClicked: _showHomePositionManager = true onClicked: {
disableToggles()
if (_dropButtonsExclusiveGroup.current) {
_dropButtonsExclusiveGroup.current.checked = false
}
homePositionManagerButton.checked = true
_showHomePositionManager = true
}
} }
// Add the mission items to the map // Add the mission items to the map
...@@ -349,7 +372,13 @@ QGCView { ...@@ -349,7 +372,13 @@ QGCView {
z: 2 z: 2
onClicked: { onClicked: {
disableToggles()
_showHomePositionManager = false _showHomePositionManager = false
_addMissionItems = true
if (_dropButtonsExclusiveGroup.current) {
_dropButtonsExclusiveGroup.current.checked = false
}
addMissionItemsButton.checked = true
setCurrentItem(object.sequenceNumber) setCurrentItem(object.sequenceNumber)
} }
} }
...@@ -432,7 +461,7 @@ QGCView { ...@@ -432,7 +461,7 @@ QGCView {
// Mission Item Editor // Mission Item Editor
Item { Item {
anchors.fill: parent anchors.fill: parent
visible: !_showHomePositionManager && controller.missionItems.count != 0 visible: !_showHomePositionManager && controller.missionItems.count != 0 && !_showHelpPanel
ListView { ListView {
id: missionItemSummaryList id: missionItemSummaryList
...@@ -476,7 +505,7 @@ QGCView { ...@@ -476,7 +505,7 @@ QGCView {
// Home Position Manager // Home Position Manager
Item { Item {
anchors.fill: parent anchors.fill: parent
visible: _showHomePositionManager visible: _showHomePositionManager && !_showHelpPanel
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -651,7 +680,7 @@ QGCView { ...@@ -651,7 +680,7 @@ QGCView {
// Help Panel // Help Panel
Item { Item {
anchors.fill: parent anchors.fill: parent
visible: !_showHomePositionManager && controller.missionItems.count == 0 visible: !_showHomePositionManager && (controller.missionItems.count == 0 || _showHelpPanel)
QGCLabel { QGCLabel {
id: helpTitle id: helpTitle
......
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