Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1f5582ec
Commit
1f5582ec
authored
Oct 12, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1966 from dogmaphobic/planViewTweaks
Plan View Tweaks
parents
a6da2b7d
c57edb58
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
106 additions
and
118 deletions
+106
-118
qgroundcontrol.qrc
qgroundcontrol.qrc
+6
-3
Sync.png
resources/Sync.png
+0
-0
Home.svg
src/FlightMap/Images/Home.svg
+2
-2
MapAddMission.svg
src/FlightMap/Images/MapAddMission.svg
+10
-0
MapHome.svg
src/FlightMap/Images/MapHome.svg
+11
-0
MapSync.svg
src/FlightMap/Images/MapSync.svg
+29
-0
qmldir
src/FlightMap/qmldir
+1
-1
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+47
-112
No files found.
qgroundcontrol.qrc
View file @
1f5582ec
...
@@ -63,13 +63,16 @@
...
@@ -63,13 +63,16 @@
<file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
<file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
<file alias="airplaneOutline.svg">src/FlightMap/Images/airplaneOutline.svg</file>
<file alias="airplaneOutline.svg">src/FlightMap/Images/airplaneOutline.svg</file>
<file alias="airplaneOpaque.svg">src/FlightMap/Images/airplaneOpaque.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="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
<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="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>
<qresource prefix="/qml">
<qresource prefix="/qml">
<file alias="test.qml">src/test.qml</file>
<file alias="test.qml">src/test.qml</file>
...
...
resources/Sync.png
deleted
100644 → 0
View file @
a6da2b7d
3.94 KB
src/FlightMap/Images/
MapHomeTearDrop
.svg
→
src/FlightMap/Images/
Home
.svg
View file @
1f5582ec
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- 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"
<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"
>
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>
<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>
</g>
</svg>
</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
...
@@ -19,4 +19,4 @@ QGCSpeedWidget 1.0 QGCSpeedWidget.qml
# MapQuickItems
# MapQuickItems
VehicleMapItem 1.0 VehicleMapItem.qml
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 {
...
@@ -130,88 +130,44 @@ QGCView {
}
}
}
}
Rectangl
e
{
Imag
e
{
id
:
addMissionItemsButton
id
:
addMissionItemsButton
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.right
:
homePositionManagerButton
.
left
anchors.right
:
homePositionManagerButton
.
left
anchors.top
:
homePositionManagerButton
.
top
anchors.top
:
homePositionManagerButton
.
top
radius
:
(
ScreenTools
.
defaultFontPixelHeight
*
3
)
/
2
width
:
ScreenTools
.
defaultFontPixelHeight
*
3
width
:
radius
*
2
fillMode
:
Image
.
PreserveAspectFit
height
:
radius
*
2
mipmap
:
true
border.width
:
2
smooth
:
true
border.color
:
"
white
"
source
:
"
/qmlimages/MapAddMission.svg
"
color
:
_addMissionItems
?
_qgcPal
.
buttonHighlight
:
"
black
"
opacity
:
_addMissionItems
?
1.0
:
0.75
opacity
:
_addMissionItems
?
0.75
:
1.0
MouseArea
{
MouseArea
{
anchors.fill
:
parent
anchors.fill
:
parent
onClicked
:
{
onClicked
:
{
_addMissionItems
=
!
_addMissionItems
_addMissionItems
=
!
_addMissionItems
_showHomePositionManager
=
false
_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
"
}
}
}
}
Rectangl
e
{
Imag
e
{
id
:
homePositionManagerButton
id
:
homePositionManagerButton
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.right
:
centerMapButton
.
left
anchors.right
:
centerMapButton
.
left
anchors.top
:
centerMapButton
.
top
anchors.top
:
centerMapButton
.
top
radius
:
(
ScreenTools
.
defaultFontPixelHeight
*
3
)
/
2
width
:
ScreenTools
.
defaultFontPixelHeight
*
3
width
:
radius
*
2
fillMode
:
Image
.
PreserveAspectFit
height
:
radius
*
2
mipmap
:
true
border.width
:
2
smooth
:
true
border.color
:
"
white
"
source
:
"
/qmlimages/MapHome.svg
"
color
:
_showHomePositionManager
?
_qgcPal
.
buttonHighlight
:
"
black
"
opacity
:
_showHomePositionManager
?
1.0
:
0.75
opacity
:
_showHomePositionManager
?
0.75
:
1.0
MouseArea
{
MouseArea
{
anchors.fill
:
parent
anchors.fill
:
parent
onClicked
:
{
onClicked
:
{
_showHomePositionManager
=
!
_showHomePositionManager
_showHomePositionManager
=
!
_showHomePositionManager
_addMissionItems
=
false
_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
{
DropButton
{
...
@@ -296,7 +252,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -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.right
:
mapTypeButton
.
left
anchors.top
:
mapTypeButton
.
top
anchors.top
:
mapTypeButton
.
top
dropDirection
:
dropDown
dropDirection
:
dropDown
buttonImage
:
"
/qmlimages/
Sync.pn
g
"
buttonImage
:
"
/qmlimages/
MapSync.sv
g
"
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
exclusiveGroup
:
_dropButtonsExclusiveGroup
exclusiveGroup
:
_dropButtonsExclusiveGroup
...
@@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
QGCLabel
{
QGCLabel
{
width
:
parent
.
width
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
To add a new home position, click
i
n the Map to set the position.
"
+
text
:
"
To add a new home position, click
o
n the Map to set the position.
"
+
"
Then give it a new name and click Add/Update.
"
+
"
Then give it a new name and click Add/Update.
"
+
"
To change the current
home position, click i
n the Map to set the new position.
"
+
"
To change the current
home position, click o
n the Map to set the new position.
"
+
"
Then click Add/Update without changing the name.
"
"
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
...
@@ -716,28 +672,18 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.top
:
helpTitle
.
bottom
anchors.top
:
helpTitle
.
bottom
width
:
parent
.
width
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
In the upper right corner of the map you will see the Mission Planner tool
s:
"
text
:
"
Mission Planner tool button
s:
"
}
}
Rectangle
{
Image
{
id
:
addMissionItemsHelpIcon
id
:
addMissionItemsHelpIcon
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.top
:
helpIconLabel
.
bottom
anchors.top
:
helpIconLabel
.
bottom
anchors.horizontalCenter
:
mapTypeHelpIcon
.
horizontalCenter
width
:
ScreenTools
.
defaultFontPixelHeight
*
3
width
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
fillMode
:
Image
.
PreserveAspectFit
height
:
width
mipmap
:
true
radius
:
width
/
2
smooth
:
true
border.width
:
2
source
:
"
/qmlimages/MapAddMission.svg
"
border.color
:
"
white
"
color
:
_qgcPal
.
window
QGCLabel
{
anchors.fill
:
parent
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
color
:
"
white
"
text
:
"
1
"
}
}
}
QGCLabel
{
QGCLabel
{
...
@@ -747,30 +693,19 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -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.right
:
parent
.
right
anchors.top
:
addMissionItemsHelpIcon
.
top
anchors.top
:
addMissionItemsHelpIcon
.
top
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
This is the Add Mission Items tool.
"
+
text
:
"
<b>Add Mission Items</b><br>
"
+
"
Click it to turn on the ability to add mission items by clicking in the map.
"
+
"
When enabled, add mission items by clicking on the map.
"
"
Click it again to turn it off.
"
}
}
Rectangle
{
Image
{
id
:
homePositionManagerHelpIcon
id
:
homePositionManagerHelpIcon
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.top
:
addMissionItemsHelpText
.
bottom
anchors.top
:
addMissionItemsHelpText
.
bottom
anchors.horizontalCenter
:
mapTypeHelpIcon
.
horizontalCenter
width
:
ScreenTools
.
defaultFontPixelHeight
*
3
width
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
fillMode
:
Image
.
PreserveAspectFit
height
:
width
mipmap
:
true
radius
:
width
/
2
smooth
:
true
border.width
:
2
source
:
"
/qmlimages/MapHome.svg
"
border.color
:
"
white
"
color
:
_qgcPal
.
window
QGCLabel
{
anchors.fill
:
parent
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
color
:
"
white
"
text
:
"
H
"
}
}
}
QGCLabel
{
QGCLabel
{
...
@@ -780,8 +715,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -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.right
:
parent
.
right
anchors.top
:
homePositionManagerHelpIcon
.
top
anchors.top
:
homePositionManagerHelpIcon
.
top
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
This is the Home Position Manager tool.
"
+
text
:
"
<b>Home Position Manager</b><br>
"
+
"
This tool
allows you to select/add/update home positions.
"
+
"
When enabled,
allows you to select/add/update home positions.
"
+
"
You can save multiple home position to represent multiple flying areas.
"
"
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
...
@@ -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.right
:
parent
.
right
anchors.top
:
mapCenterHelpIcon
.
top
anchors.top
:
mapCenterHelpIcon
.
top
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
This is the Map Center tool.
"
+
text
:
"
<b>Map Center</b><br>
"
+
"
It will show a set of options which will center
the map.
"
"
Options for centering
the map.
"
}
}
Image
{
Image
{
...
@@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
mipmap
:
true
smooth
:
true
smooth
:
true
source
:
"
/qmlimages/
Sync.pn
g
"
source
:
"
/qmlimages/
MapSync.sv
g
"
}
}
QGCLabel
{
QGCLabel
{
...
@@ -825,8 +760,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -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.right
:
parent
.
right
anchors.top
:
syncHelpIcon
.
top
anchors.top
:
syncHelpIcon
.
top
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
This is the Sync tool.
"
+
text
:
"
<b>Sync</b><br>
"
+
"
It will show a set of o
ptions for saving/loading mission items.
"
"
O
ptions for saving/loading mission items.
"
}
}
Image
{
Image
{
...
@@ -847,8 +782,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
...
@@ -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.right
:
parent
.
right
anchors.top
:
mapTypeHelpIcon
.
top
anchors.top
:
mapTypeHelpIcon
.
top
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
text
:
"
This is the Map Type tool.
"
+
text
:
"
<b>Map Type</b><br>
"
+
"
It will show a set of options for selecting map type
s.
"
"
Map type option
s.
"
}
}
}
// Item - Help Panel
}
// Item - Help Panel
}
// Item
}
// Item
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment