diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 80ce1d1c..839ada1f 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -133,12 +133,14 @@ void RasterTile::processPoints(QList &textItems) const QImage *img = style.img().isNull() ? 0 : &style.img(); const QFont *fnt = font(style.textFontSize()); const QColor *color = &style.textColor(); + const QColor *hColor = Style::isSounding(point->type()) + ? 0 : &haloColor; if ((!label || !fnt) && !img) continue; TextPointItem *item = new TextPointItem(ll2xy(point->pos()).toPoint(), - label, fnt, img, color, &haloColor, 0, ICON_PADDING); + label, fnt, img, color, hColor, 0, ICON_PADDING); if (item->isValid() && !item->collides(textItems)) textItems.append(item); else diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index ef139bd7..d5101302 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -1,11 +1,7 @@ -#include "objects.h" #include "style.h" using namespace ENC; -#define TYPE(t) ((t)<<16) -#define SUBTYPE(t, s) (((t)<<16)|(s)) - void Style::defaultPolygonStyle() { _polygons[TYPE(M_COVR)] = Polygon(QBrush("#ffffff")); diff --git a/src/map/ENC/style.h b/src/map/ENC/style.h index ebf97a14..41538d8f 100644 --- a/src/map/ENC/style.h +++ b/src/map/ENC/style.h @@ -4,9 +4,13 @@ #include #include #include +#include "objects.h" namespace ENC { +#define TYPE(t) ((t)<<16) +#define SUBTYPE(t, s) (((t)<<16)|(s)) + class Style { public: @@ -83,6 +87,9 @@ public: const Point &point(quint32 type) const; const QVector &drawOrder() const {return _drawOrder;} + static bool isSounding(quint32 type) + {return type == TYPE(SOUNDG);} + private: void defaultPolygonStyle(); void defaultLineStyle();