1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00

Improved area labels placement

This commit is contained in:
Martin Tůma 2024-11-10 17:46:08 +01:00
parent c033de5a84
commit 7c1ed27781

View File

@ -197,9 +197,11 @@ void RasterTile::processAreaLabels(const QVector<PainterPath> &paths,
const QFont *font = p.ti ? &p.ti->font() : 0; const QFont *font = p.ti ? &p.ti->font() : 0;
const QColor *color = p.ti ? &p.ti->fillColor() : 0; const QColor *color = p.ti ? &p.ti->fillColor() : 0;
const QColor *hColor = p.ti ? haloColor(p.ti) : 0; const QColor *hColor = p.ti ? haloColor(p.ti) : 0;
QPointF pos = p.p->path->labelPos.isNull()
? centroid(p.p->pp) : ll2xy(p.p->path->labelPos);
QPainterPath rp;
rp.addRect(_rect.toRectF());
QPointF pos = p.p->path->labelPos.isNull()
? centroid(p.p->pp & rp) : ll2xy(p.p->path->labelPos);
if (p.ti && p.lbl && set.contains(*p.lbl)) if (p.ti && p.lbl && set.contains(*p.lbl))
continue; continue;