Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
62b4fe2d
Commit
62b4fe2d
authored
Jan 29, 2018
by
Gus Grubba
Browse files
Aircraft awareness graphics. Untested as I don't know how to test traffic monitoring.
parent
892de6c3
Changes
3
Show whitespace changes
Inline
Side-by-side
qgcresources.qrc
View file @
62b4fe2d
...
...
@@ -172,6 +172,7 @@
<file alias="APM/BrandImageSub">src/FirmwarePlugin/APM/APMBrandImageSub.png</file>
<file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
<file alias="subVehicleArrowOpaque.png">src/FlightMap/Images/sub.png</file>
<file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
</qresource>
<qresource prefix="/res">
<file alias="action.svg">resources/action.svg</file>
...
...
src/FlightMap/Images/AwarenessAircraft.svg
0 → 100644
View file @
62b4fe2d
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, 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"
width=
"72px"
height=
"72px"
viewBox=
"0 0 72 72"
style=
"enable-background:new 0 0 72 72;"
xml:space=
"preserve"
>
<style
type=
"text/css"
>
.st0{fill:#404040;}
.st1{fill:#808080;}
</style>
<circle
class=
"st0"
cx=
"36"
cy=
"36"
r=
"36"
/>
<circle
class=
"st1"
cx=
"36"
cy=
"36"
r=
"30.6"
/>
<g>
<g
id=
"flights"
>
<path
d=
"M34.066,9.531c-1.349,0.775-2.116,2.277-2.116,3.833l0,11.91c0,1.634-0.842,3.152-2.227,4.018L12.838,39.845
c-1.548,0.967-2.488,2.664-2.488,4.489V46.8l18.25-5.703c1.661-0.519,3.35,0.722,3.35,2.463V54.9l-4.364,3.273
c-0.652,0.489-1.036,1.257-1.036,2.073V63L36,60.3l9.45,2.7v-2.754c0-0.816-0.384-1.584-1.036-2.073L40.05,54.9V43.56
c0-1.741,1.688-2.982,3.35-2.463L61.65,46.8v-2.466c0-1.825-0.94-3.522-2.488-4.489L42.277,29.292
c-1.385-0.866-2.227-2.384-2.227-4.018V13.05C40.05,10.255,36.886,7.912,34.066,9.531z"
/>
</g>
</g>
</svg>
src/FlightMap/MapItems/VehicleMapItem.qml
View file @
62b4fe2d
...
...
@@ -10,6 +10,7 @@
import
QtQuick
2.3
import
QtLocation
5.3
import
QtPositioning
5.3
import
QtGraphicalEffects
1.0
import
QGroundControl
1.0
import
QGroundControl
.
ScreenTools
1.0
...
...
@@ -41,14 +42,30 @@ MapQuickItem {
height
:
vehicleIcon
.
height
opacity
:
vehicle
?
(
vehicle
.
active
?
1.0
:
0.5
)
:
1.0
Rectangle
{
id
:
vehicleShadow
anchors.fill
:
vehicleIcon
color
:
Qt
.
rgba
(
1
,
1
,
1
,
1
)
radius
:
width
*
0.5
visible
:
false
}
DropShadow
{
anchors.fill
:
arrowIconShadow
visible
:
vehicleIcon
.
visible
horizontalOffset
:
4
verticalOffset
:
4
radius
:
32.0
samples
:
65
color
:
Qt
.
rgba
(
0.94
,
0.91
,
0
,
0.5
)
source
:
vehicleShadow
}
Image
{
id
:
vehicleIcon
source
:
_adsbVehicle
?
"
/qmlimages/
adsbVehicle
.svg
"
:
vehicle
.
vehicleImageOpaque
source
:
_adsbVehicle
?
"
/qmlimages/
AwarenessAircraft
.svg
"
:
vehicle
.
vehicleImageOpaque
mipmap
:
true
width
:
size
sourceSize.width
:
size
fillMode
:
Image
.
PreserveAspectFit
transform
:
Rotation
{
origin.x
:
vehicleIcon
.
width
/
2
origin.y
:
vehicleIcon
.
height
/
2
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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