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

Added fog signals rendering

Browse Source
This commit is contained in:
Martin Tůma 2023-03-23 01:05:44 +01:00
parent 416bd3472f
commit f057ebdbb7
7 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpxsee.qrc
View File

@ -195,6 +195,8 @@
<file alias="overfalls.png">icons/map/marine/overfalls.png</file> <file alias="overfalls.png">icons/map/marine/overfalls.png</file>
<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file> <file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
<file alias="light.png">icons/map/marine/light.png</file> <file alias="light.png">icons/map/marine/light.png</file>
<file alias="building.png">icons/map/marine/building.png</file>
<file alias="fog-signal.png">icons/map/marine/fog-signal.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

BIN
icons/map/marine/building.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 108 B

BIN
icons/map/marine/fog-signal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

1
src/map/ENC/mapdata.cpp
View File

@ -20,6 +20,7 @@ static QMap<uint,uint> orderMapInit()
QMap<uint,uint> map; QMap<uint,uint> map;
map.insert(TYPE(LIGHTS), 0); map.insert(TYPE(LIGHTS), 0);
map.insert(TYPE(FOGSIG), 0);
map.insert(TYPE(CGUSTA), 1); map.insert(TYPE(CGUSTA), 1);
map.insert(SUBTYPE(BUAARE, 1), 2); map.insert(SUBTYPE(BUAARE, 1), 2);

1
src/map/ENC/objects.h
View File

@ -39,6 +39,7 @@
#define FNCLNE 52 #define FNCLNE 52
#define FERYRT 53 #define FERYRT 53
#define FLODOC 57 #define FLODOC 57
#define FOGSIG 58
#define GATCON 61 #define GATCON 61
#define HRBFAC 64 #define HRBFAC 64
#define HULKES 65 #define HULKES 65

20
src/map/ENC/rastertile.cpp
View File

@ -57,6 +57,12 @@ static const QImage *light()
return &img; return &img;
} }
static const QImage *signal()
{
static QImage img(":/marine/fog-signal.png");
return &img;
}
static const Style& style() static const Style& style()
{ {
static Style s; static Style s;
@ -277,16 +283,18 @@ void RasterTile::processPoints(QList<TextItem*> &textItems,
QList<TextItem*> &lights, QList<QImage*> &images) QList<TextItem*> &lights, QList<QImage*> &images)
{ {
const Style &s = style(); const Style &s = style();
PointMap lightsMap; PointMap lightsMap, signalsMap;
int i; int i;
std::sort(_points.begin(), _points.end(), pointLess); std::sort(_points.begin(), _points.end(), pointLess);
/* Lights */ /* Lights & Signals */
for (i = 0; i < _points.size(); i++) { for (i = 0; i < _points.size(); i++) {
const MapData::Point *point = _points.at(i); const MapData::Point *point = _points.at(i);
if (point->type()>>16 == LIGHTS) if (point->type()>>16 == LIGHTS)
lightsMap.insert(point->pos(), point); lightsMap.insert(point->pos(), point);
else if (point->type()>>16 == FOGSIG)
signalsMap.insert(point->pos(), point);
else else
break; break;
} }
@ -315,10 +323,10 @@ void RasterTile::processPoints(QList<TextItem*> &textItems,
textItems.append(item); textItems.append(item);
if (rimg) if (rimg)
images.append(rimg); images.append(rimg);
const PointMap::const_iterator it = lightsMap.find(point->pos()); if (lightsMap.contains(point->pos()))
if (it != lightsMap.constEnd()) lights.append(new TextPointItem(pos, 0, 0, light(), 0, 0, 0, 0));
lights.append(new TextPointItem(pos, 0, 0, light(), 0, 0, 0, if (signalsMap.contains(point->pos()))
ICON_PADDING)); lights.append(new TextPointItem(pos, 0, 0, signal(), 0, 0, 0, 0));
} else { } else {
delete item; delete item;
delete rimg; delete rimg;

3
src/map/ENC/style.cpp
View File

@ -183,7 +183,6 @@ void Style::pointStyle()
_points[SUBTYPE(BUAARE, 0)].setTextFontSize(Small); _points[SUBTYPE(BUAARE, 0)].setTextFontSize(Small);
_points[TYPE(SOUNDG)].setTextFontSize(Small); _points[TYPE(SOUNDG)].setTextFontSize(Small);
_points[TYPE(SOUNDG)].setHaloColor(QColor()); _points[TYPE(SOUNDG)].setHaloColor(QColor());
_points[TYPE(LIGHTS)] = Point(QImage(":/marine/light-major.png"), Small);
_points[TYPE(BOYCAR)] = Point(QImage(":/marine/buoy.png"), Small); _points[TYPE(BOYCAR)] = Point(QImage(":/marine/buoy.png"), Small);
_points[TYPE(BOYINB)] = Point(QImage(":/marine/buoy.png"), Small); _points[TYPE(BOYINB)] = Point(QImage(":/marine/buoy.png"), Small);
_points[TYPE(BOYISD)] = Point(QImage(":/marine/buoy.png"), Small); _points[TYPE(BOYISD)] = Point(QImage(":/marine/buoy.png"), Small);
@ -270,6 +269,7 @@ void Style::pointStyle()
_points[SUBTYPE(SMCFAC, 20)] = Point(QImage(":/POI/telephone-11.png")); _points[SUBTYPE(SMCFAC, 20)] = Point(QImage(":/POI/telephone-11.png"));
_points[SUBTYPE(SMCFAC, 22)] = Point(QImage(":/POI/parking-11.png")); _points[SUBTYPE(SMCFAC, 22)] = Point(QImage(":/POI/parking-11.png"));
_points[SUBTYPE(SMCFAC, 25)] = Point(QImage(":/POI/campsite-11.png")); _points[SUBTYPE(SMCFAC, 25)] = Point(QImage(":/POI/campsite-11.png"));
_points[TYPE(BUISGL)] = Point(QImage(":/marine/building.png"));
_points[SUBTYPE(BUISGL, 2)] = Point(QImage(":/POI/harbor-11.png")); _points[SUBTYPE(BUISGL, 2)] = Point(QImage(":/POI/harbor-11.png"));
_points[SUBTYPE(BUISGL, 5)] = Point(QImage(":/POI/hospital-11.png")); _points[SUBTYPE(BUISGL, 5)] = Point(QImage(":/POI/hospital-11.png"));
_points[SUBTYPE(BUISGL, 6)] = Point(QImage(":/POI/post-11.png")); _points[SUBTYPE(BUISGL, 6)] = Point(QImage(":/POI/post-11.png"));
@ -280,6 +280,7 @@ void Style::pointStyle()
_points[SUBTYPE(BUISGL, 20)] = Point(QImage(":/POI/religious-christian-11.png")); _points[SUBTYPE(BUISGL, 20)] = Point(QImage(":/POI/religious-christian-11.png"));
_points[SUBTYPE(BUISGL, 22)] = Point(QImage(":/POI/religious-jewish-11.png")); _points[SUBTYPE(BUISGL, 22)] = Point(QImage(":/POI/religious-jewish-11.png"));
_points[SUBTYPE(BUISGL, 26)] = Point(QImage(":/POI/religious-muslim-11.png")); _points[SUBTYPE(BUISGL, 26)] = Point(QImage(":/POI/religious-muslim-11.png"));
_points[SUBTYPE(BUISGL, 33)] = Point(QImage(":/marine/pylon.png"));
_points[SUBTYPE(BUISGL, 42)] = Point(QImage(":/POI/bus-11.png")); _points[SUBTYPE(BUISGL, 42)] = Point(QImage(":/POI/bus-11.png"));
} }