root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Use SVG arrows instead of PNGs

Browse Source
This commit is contained in:
Martin Tůma 2024-11-13 17:16:22 +01:00
parent a9927911fc
commit 734ba4bf44
8 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpxsee.qrc
View File

@ -6,10 +6,8 @@
<!-- Common map stuff -->
<qresource prefix="/map">
<file alias="arrow.png">icons/map/arrow.png</file>
<file alias="arrow@2x.png">icons/map/arrow@2x.png</file>
<file alias="water-arrow.png">icons/map/water-arrow.png</file>
<file alias="water-arrow@2x.png">icons/map/water-arrow@2x.png</file>
<file alias="arrow.svg">icons/map/arrow.svg</file>
<file alias="water-arrow.svg">icons/map/water-arrow.svg</file>
</qresource>
<!-- POIs (IMG & ENC style) -->

BIN
icons/map/arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 175 B

12
icons/map/arrow.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16" height="8" viewBox="0 0 16 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<g transform="matrix(0.80193135,0,0,1.0047131,-0.02082299,-6.0023103)">
<path
style="fill:none;stroke:#ffffff;stroke-width:64;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 358.53516,372.24219 c -0.33985,-21.07032 -0.67969,-42.25391 -0.90625,-63.4375 H 46.332031 c -5.210937,0.11328 -13.480469,-8.15625 -13.480469,-18.57813 0,-10.42187 8.382813,-18.57812 13.59375,-18.57812 l 312.316408,0.11328 V 207.75781 L 547.26172,290 Z m 0,0"
transform="scale(0.0344828)"/>
<path
style="display:inline;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 12.363281,12.835938 c -0.01172,-0.726563 -0.02344,-1.457032 -0.03125,-2.1875 H 1.597656 c -0.179687,0.0039 -0.464844,-0.28125 -0.464844,-0.640626 0,-0.359374 0.289063,-0.640624 0.46875,-0.640624 l 10.769532,0.00391 V 7.164062 l 6.5,2.835938 z m 0,0"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icons/map/arrow@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 241 B

BIN
icons/map/water-arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 181 B

12
icons/map/water-arrow.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16" height="8" viewBox="0 0 16 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<g transform="matrix(0.80193135,0,0,1.0047131,-0.02082299,-6.0023103)">
<path
style="fill:none;stroke:#ffffff;stroke-width:64;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 358.53516,372.24219 c -0.33985,-21.07032 -0.67969,-42.25391 -0.90625,-63.4375 H 46.332031 c -5.210937,0.11328 -13.480469,-8.15625 -13.480469,-18.57813 0,-10.42187 8.382813,-18.57812 13.59375,-18.57812 l 312.316408,0.11328 V 207.75781 L 547.26172,290 Z m 0,0"
transform="scale(0.0344828)"/>
<path
style="display:inline;fill:#9fc4e1;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 12.363281,12.835938 c -0.01172,-0.726563 -0.02344,-1.457032 -0.03125,-2.1875 H 1.597656 c -0.179687,0.0039 -0.464844,-0.28125 -0.464844,-0.640626 0,-0.359374 0.289063,-0.640624 0.46875,-0.640624 l 10.769532,0.00391 V 7.164062 l 6.5,2.835938 z m 0,0"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icons/map/water-arrow@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 249 B

10
src/map/IMG/rastertile.cpp
View File

@ -1,6 +1,7 @@
#include <QFont>
#include <QPainter>
#include <QCache>
#include "common/util.h"
#include "map/dem.h"
#include "map/textpathitem.h"
#include "map/textpointitem.h"
@ -21,11 +22,6 @@ using namespace IMG;
#define AREA(rect) \
(rect.size().width() * rect.size().height())
#define HIDPI_IMG(dir, basename, ratio) \
(((ratio) > 1.0) \
? QImage(dir "/" basename "@2x.png") \
: QImage(dir "/" basename ".png"))
#define ROAD 0
#define WATER 1
@ -517,8 +513,8 @@ void RasterTile::render()
QList<TextItem*> textItems;
QImage arrows[2];
arrows[ROAD] = HIDPI_IMG(":/map", "arrow", _ratio);
arrows[WATER] = HIDPI_IMG(":/map", "water-arrow", _ratio);
arrows[ROAD] = Util::svg2img(":/map/arrow.svg", _ratio);
arrows[WATER] = Util::svg2img(":/map/water-arrow.svg", _ratio);
fetchData(polygons, lines, points);
ll2xy(polygons);