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

Adjusting vehicle icon

QGC4.4
Gus Grubba 8 years ago
parent
59c8eaa35a
commit
012d1d3097
6 changed files with 51 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/FlightDisplay/FlightDisplayViewMap.qml
  2. 21
      src/FlightMap/Images/compassInstrumentArrow.svg
  3. 21
      src/FlightMap/Images/vehicleArrowOpaque.svg
  4. 21
      src/FlightMap/Images/vehicleArrowOutline.svg
  5. 2
      src/FlightMap/Widgets/QGCCompassWidget.qml
  6. 2
      src/MissionEditor/MissionEditor.qml

2
src/FlightDisplay/FlightDisplayViewMap.qml
Unescape View File

@ -199,7 +199,7 @@ FlightMap { @@ -199,7 +199,7 @@ FlightMap {
vehicle: object
coordinate: object.coordinate
isSatellite: flightMap.isSatelliteMap
size: _mainIsMap ? ScreenTools.defaultFontPixelHeight * 5 : ScreenTools.defaultFontPixelHeight * 2
size: _mainIsMap ? ScreenTools.defaultFontPixelHeight * 3 : ScreenTools.defaultFontPixelHeight
z: QGroundControl.zOrderMapItems - 1
}
}

21
src/FlightMap/Images/compassInstrumentArrow.svg
Unescape View File

@ -1,9 +1,20 @@ @@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<!-- Generator: Adobe Illustrator 21.0.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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:#231F20;stroke:#D23528;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;}
.st0{fill:#C72B27;}
.st1{fill:#7F0036;}
.st2{fill:#EE3424;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
<g>
<g>
<polygon class="st0" points="35.5,11.118 35.5,49.191 10.118,61.882 "/>
<path class="st1" d="M35,13.236v35.646L11.236,60.764L35,13.236 M36,9L9,63l27-13.5V9L36,9z"/>
</g>
<g>
<polygon class="st2" points="36.5,49.191 36.5,11.118 61.882,61.882 "/>
<path class="st1" d="M37,13.236l23.764,47.528L37,48.882V13.236 M36,9v40.5L63,63L36,9L36,9z"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 820 B

21
src/FlightMap/Images/vehicleArrowOpaque.svg
Unescape View File

@ -1,9 +1,20 @@ @@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<!-- Generator: Adobe Illustrator 21.0.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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF460A;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;}
.st0{fill:#C72B27;}
.st1{fill:#7F0036;}
.st2{fill:#EE3424;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
<g>
<g>
<polygon class="st0" points="35.5,2.118 35.5,53.691 1.118,70.882 "/>
<path class="st1" d="M35,4.236v49.146L2.236,69.764L35,4.236 M36,0L0,72l36-18V0L36,0z"/>
</g>
<g>
<polygon class="st2" points="36.5,53.691 36.5,2.118 70.882,70.882 "/>
<path class="st1" d="M37,4.236l32.764,65.528L37,53.382V4.236 M36,0v54l36,18L36,0L36,0z"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 808 B

21
src/FlightMap/Images/vehicleArrowOutline.svg
Unescape View File

@ -1,9 +1,20 @@ @@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<!-- Generator: Adobe Illustrator 21.0.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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;}
.st0{fill:#C72B27;}
.st1{fill:#7F0036;}
.st2{fill:#EE3424;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
<g>
<g>
<polygon class="st0" points="35.5,2.118 35.5,53.691 1.118,70.882 "/>
<path class="st1" d="M35,4.236v49.146L2.236,69.764L35,4.236 M36,0L0,72l36-18V0L36,0z"/>
</g>
<g>
<polygon class="st2" points="36.5,53.691 36.5,2.118 70.882,70.882 "/>
<path class="st1" d="M37,4.236l32.764,65.528L37,53.382V4.236 M36,0v54l36,18L36,0L36,0z"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 808 B

2
src/FlightMap/Widgets/QGCCompassWidget.qml
Unescape View File

@ -51,7 +51,7 @@ Item { @@ -51,7 +51,7 @@ Item {
id: pointer
source: vehicle ? vehicle.vehicleImageCompass : ""
mipmap: true
width: size * 0.75
width: size * 0.65
sourceSize.width: width
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent

2
src/MissionEditor/MissionEditor.qml
Unescape View File

@ -467,7 +467,7 @@ QGCView { @@ -467,7 +467,7 @@ QGCView {
vehicle: object
coordinate: object.coordinate
isSatellite: editorMap.isSatelliteMap
size: ScreenTools.defaultFontPixelHeight * 5
size: ScreenTools.defaultFontPixelHeight * 3
z: QGroundControl.zOrderMapItems - 1
}
}

Write Preview
Loading…
Cancel
Save