Skip to content

Q
qgroundcontrol
Commit 1f5582ec authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #1966 from dogmaphobic/planViewTweaks 

Plan View Tweaks
parents a6da2b7d c57edb58
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 118 deletions
qgroundcontrol.qrc
View file @ 1f5582ec
......@@ -63,13 +63,16 @@
<file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
<file alias="airplaneOutline.svg">src/FlightMap/Images/airplaneOutline.svg</file>
<file alias="airplaneOpaque.svg">src/FlightMap/Images/airplaneOpaque.svg</file>
<file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
<file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
<file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
<file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
<!-- Map Buttons -->
<file alias="Sync.png">resources/Sync.png</file>
<file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
<file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file>
<file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
<file alias="MapHome.svg">src/FlightMap/Images/MapHome.svg</file>
<file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
</qresource>
<qresource prefix="/qml">
<file alias="test.qml">src/test.qml</file>
......
src/FlightMap/Images/MapHomeTearDrop.svg → src/FlightMap/Images/Home.svg
View file @ 1f5582ec
......@@ -2,8 +2,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="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<path d="M54,22.971C54,34.166,45.941,69.3,36,69.3S18,34.166,18,22.971S26.059,2.7,36,2.7S54,11.776,54,22.971z"/>
<g>
<path fill="#FFFFFF" d="M28.8,38.643V20.286h2.429v7.538h9.541v-7.538H43.2v18.358h-2.429V29.99h-9.541v8.653H28.8z"/>
<polygon fill="#FFFFFF" points="70.2,41.7 36,1.797 1.8,41.7 10.35,41.7 10.35,70.203 27.45,70.203 27.45,47.401 44.55,47.401
44.55,70.203 61.65,70.203 61.65,41.7 "/>
</g>
</svg>
src/FlightMap/Images/MapAddMission.svg 0 → 100644
View file @ 1f5582ec
<?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="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<circle opacity="0.95" cx="36" cy="36" r="34.2"/>
<g>
<path fill="#FFFFFF" d="M33.787,48.612V38.146H23.401v-4.373h10.385V23.384h4.425v10.389h10.387v4.373H38.212v10.466H33.787z"/>
</g>
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="36" cy="36" r="22.38"/>
</svg>
src/FlightMap/Images/MapHome.svg 0 → 100644
View file @ 1f5582ec
<?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="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<circle opacity="0.95" cx="36" cy="36" r="34.2"/>
<g>
<polygon fill="#FFFFFF" points="48.6,36.098 36,21.397 23.4,36.098 26.55,36.098 26.55,46.599 32.85,46.599 32.85,38.199
39.15,38.199 39.15,46.599 45.45,46.599 45.45,36.098 "/>
</g>
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="36" cy="36" r="22.38"/>
</svg>
src/FlightMap/Images/MapSync.svg 0 → 100644
View file @ 1f5582ec
<?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="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<circle opacity="0.95" cx="36" cy="36" r="34.2"/>
<g>
<g>
<g>
<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M22.644,23.933C19.758,27.126,18,31.358,18,36
c0,9.941,8.059,18,18,18c0.009,0,0.017-0.001,0.026-0.001"/>
<g>
<polygon fill="#FFFFFF" points="34.578,44.921 35.03,63.138 43.911,53.804 "/>
</g>
</g>
</g>
<g>
<g>
<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M49.356,48.067C52.242,44.874,54,40.642,54,36
c0-9.941-8.059-18-18-18c-0.009,0-0.017,0.001-0.026,0.001"/>
<g>
<polygon fill="#FFFFFF" points="37.422,27.079 36.97,8.862 28.089,18.196 "/>
</g>
</g>
</g>
</g>
<g>
<path fill="none" d="M35.969,13.537"/>
</g>
</svg>
src/FlightMap/qmldir
View file @ 1f5582ec
......@@ -19,4 +19,4 @@ QGCSpeedWidget 1.0 QGCSpeedWidget.qml
# MapQuickItems
VehicleMapItem 1.0 VehicleMapItem.qml
MissionItemIndicator 1.0 MissionItemIndicator.qml
MissionItemIndicator 1.0 MissionItemIndicator.qml
src/MissionEditor/MissionEditor.qml
View file @ 1f5582ec
......@@ -130,88 +130,44 @@ QGCView {
}
}
Rectangle {
Image {
id: addMissionItemsButton
anchors.rightMargin: ScreenTools.defaultFontPixelHeight
anchors.right: homePositionManagerButton.left
anchors.top: homePositionManagerButton.top
radius: (ScreenTools.defaultFontPixelHeight * 3) / 2
width: radius * 2
height: radius * 2
border.width: 2
border.color: "white"
color: _addMissionItems ? _qgcPal.buttonHighlight : "black"
opacity: _addMissionItems ? 0.75 : 1.0
width: ScreenTools.defaultFontPixelHeight * 3
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
source: "/qmlimages/MapAddMission.svg"
opacity: _addMissionItems ? 1.0 : 0.75
MouseArea {
anchors.fill: parent
onClicked: {
_addMissionItems = !_addMissionItems
_showHomePositionManager = false
}
}
Rectangle {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
radius: width / 2
border.width: 2
border.color: "white"
color: "transparent"
QGCLabel {
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: "white"
text: "1"
}
}
}
Rectangle {
Image {
id: homePositionManagerButton
anchors.rightMargin: ScreenTools.defaultFontPixelHeight
anchors.right: centerMapButton.left
anchors.top: centerMapButton.top
radius: (ScreenTools.defaultFontPixelHeight * 3) / 2
width: radius * 2
height: radius * 2
border.width: 2
border.color: "white"
color: _showHomePositionManager ? _qgcPal.buttonHighlight : "black"
opacity: _showHomePositionManager ? 0.75 : 1.0
width: ScreenTools.defaultFontPixelHeight * 3
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
source: "/qmlimages/MapHome.svg"
opacity: _showHomePositionManager ? 1.0 : 0.75
MouseArea {
anchors.fill: parent
onClicked: {
_showHomePositionManager = !_showHomePositionManager
_addMissionItems = false
}
}
Rectangle {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
radius: width / 2
border.width: 2
border.color: "white"
color: "transparent"
QGCLabel {
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: "white"
text: "H"
}
}
}
DropButton {
......@@ -296,7 +252,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: mapTypeButton.left
anchors.top: mapTypeButton.top
dropDirection: dropDown
buttonImage: "/qmlimages/Sync.png"
buttonImage: "/qmlimages/MapSync.svg"
viewportMargins: ScreenTools.defaultFontPixelWidth / 2
exclusiveGroup: _dropButtonsExclusiveGroup
......@@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
text: "To add a new home position, click in the Map to set the position. " +
text: "To add a new home position, click on the Map to set the position. " +
"Then give it a new name and click Add/Update. " +
"To change the current home position, click in the Map to set the new position. " +
"To change the current home position, click on the Map to set the new position. " +
"Then click Add/Update without changing the name."
}
......@@ -716,28 +672,18 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.top: helpTitle.bottom
width: parent.width
wrapMode: Text.WordWrap
text: "In the upper right corner of the map you will see the Mission Planner tools:"
text: "Mission Planner tool buttons:"
}
Rectangle {
id: addMissionItemsHelpIcon
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: helpIconLabel.bottom
anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
radius: width / 2
border.width: 2
border.color: "white"
color: _qgcPal.window
QGCLabel {
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: "white"
text: "1"
}
Image {
id: addMissionItemsHelpIcon
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: helpIconLabel.bottom
width: ScreenTools.defaultFontPixelHeight * 3
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
source: "/qmlimages/MapAddMission.svg"
}
QGCLabel {
......@@ -747,30 +693,19 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: addMissionItemsHelpIcon.top
wrapMode: Text.WordWrap
text: "This is the Add Mission Items tool. " +
"Click it to turn on the ability to add mission items by clicking in the map. " +
"Click it again to turn it off."
text: "<b>Add Mission Items</b><br>" +
"When enabled, add mission items by clicking on the map."
}
Rectangle {
id: homePositionManagerHelpIcon
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: addMissionItemsHelpText.bottom
anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
radius: width / 2
border.width: 2
border.color: "white"
color: _qgcPal.window
QGCLabel {
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: "white"
text: "H"
}
Image {
id: homePositionManagerHelpIcon
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: addMissionItemsHelpText.bottom
width: ScreenTools.defaultFontPixelHeight * 3
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
source: "/qmlimages/MapHome.svg"
}
QGCLabel {
......@@ -780,8 +715,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: homePositionManagerHelpIcon.top
wrapMode: Text.WordWrap
text: "This is the Home Position Manager tool. " +
"This tool allows you to select/add/update home positions. " +
text: "<b>Home Position Manager</b><br>" +
"When enabled, allows you to select/add/update home positions. " +
"You can save multiple home position to represent multiple flying areas."
}
......@@ -803,8 +738,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: mapCenterHelpIcon.top
wrapMode: Text.WordWrap
text: "This is the Map Center tool. " +
"It will show a set of options which will center the map."
text: "<b>Map Center</b><br>" +
"Options for centering the map."
}
Image {
......@@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
source: "/qmlimages/Sync.png"
source: "/qmlimages/MapSync.svg"
}
QGCLabel {
......@@ -825,8 +760,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: syncHelpIcon.top
wrapMode: Text.WordWrap
text: "This is the Sync tool. " +
"It will show a set of options for saving/loading mission items."
text: "<b>Sync</b><br>" +
"Options for saving/loading mission items."
}
Image {
......@@ -847,8 +782,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: mapTypeHelpIcon.top
wrapMode: Text.WordWrap
text: "This is the Map Type tool. " +
"It will show a set of options for selecting map types."
text: "<b>Map Type</b><br>" +
"Map type options."
}
} // Item - Help Panel
} // Item
......
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