root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Do not outline soundings

Browse Source
This commit is contained in:
Martin Tůma 2022-11-05 17:43:32 +01:00
parent d215e881f6
commit 67209c4ad5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,12 +133,14 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
const QImage *img = style.img().isNull() ? 0 : &style.img(); const QImage *img = style.img().isNull() ? 0 : &style.img();
const QFont *fnt = font(style.textFontSize()); const QFont *fnt = font(style.textFontSize());
const QColor *color = &style.textColor(); const QColor *color = &style.textColor();
const QColor *hColor = Style::isSounding(point->type())
? 0 : &haloColor;
if ((!label || !fnt) && !img) if ((!label || !fnt) && !img)
continue; continue;
TextPointItem *item = new TextPointItem(ll2xy(point->pos()).toPoint(), 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)) if (item->isValid() && !item->collides(textItems))
textItems.append(item); textItems.append(item);
else else

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

@ -1,11 +1,7 @@
#include "objects.h"
#include "style.h" #include "style.h"
using namespace ENC; using namespace ENC;
#define TYPE(t) ((t)<<16)
#define SUBTYPE(t, s) (((t)<<16)|(s))
void Style::defaultPolygonStyle() void Style::defaultPolygonStyle()
{ {
_polygons[TYPE(M_COVR)] = Polygon(QBrush("#ffffff")); _polygons[TYPE(M_COVR)] = Polygon(QBrush("#ffffff"));

7
src/map/ENC/style.h
View File

@ -4,9 +4,13 @@
#include <QPen> #include <QPen>
#include <QBrush> #include <QBrush>
#include <QMap> #include <QMap>
#include "objects.h"
namespace ENC { namespace ENC {
#define TYPE(t) ((t)<<16)
#define SUBTYPE(t, s) (((t)<<16)|(s))
class Style class Style
{ {
public: public:
@ -83,6 +87,9 @@ public:
const Point &point(quint32 type) const; const Point &point(quint32 type) const;
const QVector<uint> &drawOrder() const {return _drawOrder;} const QVector<uint> &drawOrder() const {return _drawOrder;}
static bool isSounding(quint32 type)
{return type == TYPE(SOUNDG);}
private: private:
void defaultPolygonStyle(); void defaultPolygonStyle();
void defaultLineStyle(); void defaultLineStyle();