root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 19:49:15 +02:00
Code Issues Projects Releases Activity

Do not draw IMG contour lines that have no color defined

Browse Source
This commit is contained in:
Martin Tůma
2024-02-27 07:20:09 +01:00
parent af7696bfd7
commit 2026036015
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,8 @@ void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
const QFont *fnt = _data->style()->font(style.text().size(),
Style::Small);
const QColor *color = style.text().color().isValid()
? &style.text().color() : 0;
? &style.text().color() : Style::isContourLine(poly.type)
? 0 : &textColor;
const QColor *hColor = Style::isContourLine(poly.type) ? 0 : &haloColor;
const QImage *img = poly.oneway
? Style::isWaterLine(poly.type)
@ -305,7 +306,7 @@ void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
const QString *label = poly.label.text().isEmpty()
? 0 : &poly.label.text();
if (!img && (!label || !fnt))
if (!img && (!label || !fnt || !color))
continue;
TextPathItem *item = new TextPathItem(poly.points, label, _rect, fnt,

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

@ -1026,7 +1026,8 @@ bool Style::parseLine(SubFile *file, SubFile::Handle &hdl,
if (isContourLine(type)) {
Line &l = _lines[type];
l.setTextColor(l.foreground().color());
if (l.img().isNull())
l.setTextColor(l.foreground().color());
l.setTextFontSize(Small);
}