root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-22 18:20:49 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' into android-latest

Browse Source
This commit is contained in:
Martin Tůma 2025-02-21 00:56:25 +01:00
commit 636aff6f31
5 changed files with 104 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GUI/mapview.cpp
View File

@ -1254,7 +1254,7 @@ void MapView::drawHillShading(bool draw)
setMap(_map); setMap(_map);
} }
void MapView::selectLayers(Layers layers) void MapView::selectLayers(MapView::Layers layers)
{ {
_layers = layers; _layers = layers;

2
src/GUI/mapview.h
View File

@ -136,7 +136,7 @@ public slots:
void showMotionInfo(bool show); void showMotionInfo(bool show);
void useStyles(bool use); void useStyles(bool use);
void drawHillShading(bool draw); void drawHillShading(bool draw);
void selectLayers(Layers layers); void selectLayers(MapView::Layers layers);
private slots: private slots:
void updatePOI(); void updatePOI();

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

@ -14,6 +14,7 @@ using namespace ENC;
#define TEXT_EXTENT 160 #define TEXT_EXTENT 160
#define TSSLPT_SIZE 24 #define TSSLPT_SIZE 24
#define RANGE_FACTOR 4 #define RANGE_FACTOR 4
#define MAJOR_RANGE 10
static const float C1 = 0.866025f; /* sqrt(3)/2 */ static const float C1 = 0.866025f; /* sqrt(3)/2 */
static const QColor tsslptPen = QColor(0xeb, 0x49, 0xeb); static const QColor tsslptPen = QColor(0xeb, 0x49, 0xeb);
@ -215,8 +216,8 @@ void RasterTile::drawTextItems(QPainter *painter,
static QRectF lightRect(const QPointF &pos, double range) static QRectF lightRect(const QPointF &pos, double range)
{ {
return QRectF(pos.x() - range * RANGE_FACTOR, pos.y() - range * RANGE_FACTOR, double r = qMin(range * RANGE_FACTOR, (double)TEXT_EXTENT);
2*range * RANGE_FACTOR, 2*range * RANGE_FACTOR); return QRect(pos.x() - r, pos.y() - r, 2 * r, 2 * r);
} }
void RasterTile::drawSectorLights(QPainter *painter, void RasterTile::drawSectorLights(QPainter *painter,
@ -277,7 +278,7 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
double range = attr.value(VALNMR).toDouble(); double range = attr.value(VALNMR).toDouble();
if (attr.contains(SECTR1) if (attr.contains(SECTR1)
|| (range > 6 && !(point.type() & 0xFFFF))) { || (range >= MAJOR_RANGE && !(point.type() & 0xFFFF))) {
sectorLights.append(SectorLight(point.pos(), color, sectorLights.append(SectorLight(point.pos(), color,
attr.value(LITVIS).toUInt(), range, attr.value(LITVIS).toUInt(), range,
attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble())); attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble()));

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

@ -19,7 +19,7 @@ using namespace IMG;
#define TEXT_EXTENT 160 #define TEXT_EXTENT 160
#define ICON_PADDING 2 #define ICON_PADDING 2
#define RANGE_FACTOR 4 #define RANGE_FACTOR 4
#define RANGE_MIN 6 #define MAJOR_RANGE 10
#define ROAD 0 #define ROAD 0
#define WATER 1 #define WATER 1
@ -234,11 +234,12 @@ static QRect lightRect(const QPoint &pos, quint32 range)
} }
void RasterTile::drawSectorLights(QPainter *painter, void RasterTile::drawSectorLights(QPainter *painter,
const QList<const MapData::Point *> &lights) const const QList<const MapData::Point*> &lights) const
{ {
for (int i = 0; i < lights.size(); i++) { for (int i = 0; i < lights.size(); i++) {
const MapData::Point *p = lights.at(i); const MapData::Point *p = lights.at(i);
QPoint pos(p->coordinates.lon(), p->coordinates.lat()); QPoint pos(p->coordinates.lon(), p->coordinates.lat());
QMap<Sector, quint32> rangeMap;
for (int j = 0; j < p->lights.size(); j++) { for (int j = 0; j < p->lights.size(); j++) {
const Light &l = p->lights.at(j); const Light &l = p->lights.at(j);
@ -248,8 +249,16 @@ void RasterTile::drawSectorLights(QPainter *painter,
const Light::Sector &start = l.sectors().at(k); const Light::Sector &start = l.sectors().at(k);
const Light::Sector &end = (k == l.sectors().size() - 1) const Light::Sector &end = (k == l.sectors().size() - 1)
? l.sectors().at(0) : l.sectors().at(k+1); ? l.sectors().at(0) : l.sectors().at(k+1);
quint32 angle = end.angle() - start.angle();
if (start.color() && (angle || start.range() >= MAJOR_RANGE)) {
quint32 range = start.range() ? start.range() : 6;
Sector s(start.color(), start.angle(), end.angle());
if (rangeMap.value(s) >= range)
continue;
else
rangeMap.insert(s, range);
if (start.color()) {
double a1 = -(end.angle() / 10.0 + 90.0); double a1 = -(end.angle() / 10.0 + 90.0);
double a2 = -(start.angle() / 10.0 + 90.0); double a2 = -(start.angle() / 10.0 + 90.0);
if (a1 > a2) if (a1 > a2)
@ -258,9 +267,7 @@ void RasterTile::drawSectorLights(QPainter *painter,
if (as == 0) if (as == 0)
as = 360; as = 360;
QRect rect(lightRect(pos, start.range() QRect rect(lightRect(pos, range));
? start.range() : RANGE_MIN));
painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, painter->setPen(QPen(Qt::black, 6, Qt::SolidLine,
Qt::FlatCap)); Qt::FlatCap));
painter->drawArc(rect, a1 * 16, as * 16); painter->drawArc(rect, a1 * 16, as * 16);
@ -268,7 +275,7 @@ void RasterTile::drawSectorLights(QPainter *painter,
Qt::SolidLine, Qt::FlatCap)); Qt::SolidLine, Qt::FlatCap));
painter->drawArc(rect, a1 * 16, as * 16); painter->drawArc(rect, a1 * 16, as * 16);
if (a2 - a1 != 0) { if (angle) {
QLineF ln(pos, QPointF(pos.x() + rect.width(), QLineF ln(pos, QPointF(pos.x() + rect.width(),
pos.y())); pos.y()));
ln.setAngle(a1); ln.setAngle(a1);
@ -279,9 +286,14 @@ void RasterTile::drawSectorLights(QPainter *painter,
} }
} }
} }
} else if (l.range() > RANGE_MIN) { } else if (l.color() && l.range() >= MAJOR_RANGE) {
QRect rect(lightRect(pos, l.range())); Sector s(l.color(), 0, 3600);
if (rangeMap.value(s) >= l.range())
continue;
else
rangeMap.insert(s, l.range());
QRect rect(lightRect(pos, l.range()));
painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, Qt::FlatCap)); painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, Qt::FlatCap));
painter->drawArc(rect, 0, 360 * 16); painter->drawArc(rect, 0, 360 * 16);
painter->setPen(QPen(Style::color(l.color()), 4, Qt::SolidLine, painter->setPen(QPen(Style::color(l.color()), 4, Qt::SolidLine,
@ -292,7 +304,7 @@ void RasterTile::drawSectorLights(QPainter *painter,
} }
} }
static void removeDuplicitLabel(QList<TextItem *> &labels, const QString &text, static void removeDuplicitLabel(QList<TextItem*> &labels, const QString &text,
const QRectF &tileRect) const QRectF &tileRect)
{ {
for (int i = 0; i < labels.size(); i++) { for (int i = 0; i < labels.size(); i++) {
@ -463,19 +475,47 @@ void RasterTile::processShields(const QList<MapData::Poly> &lines,
} }
} }
static bool showAsSector(const QVector<Light> &lights) static bool sectorLight(const QVector<Light> &lights)
{ {
for (int i = 0; i < lights.size(); i++) { for (int i = 0; i < lights.size(); i++) {
const Light &l = lights.at(i); const Light &l = lights.at(i);
if ((l.color() && l.range() > RANGE_MIN) || !l.sectors().isEmpty()) if (l.color() && l.range() >= MAJOR_RANGE)
return true; return true;
for (int j = 0; j < l.sectors().size(); j++) {
const Light::Sector &start = l.sectors().at(j);
const Light::Sector &end = (j == l.sectors().size() - 1)
? l.sectors().at(0) : l.sectors().at(j+1);
quint32 angle = end.angle() - start.angle();
if (start.color() && (angle || start.range() >= MAJOR_RANGE))
return true;
}
} }
return false; return false;
} }
static Light::Color ordinaryLight(const QVector<Light> &lights)
{
for (int i = 0; i < lights.size(); i++) {
const Light &l = lights.at(i);
if (l.color() && l.range() < MAJOR_RANGE)
return l.color();
for (int j = 0; j < l.sectors().size(); j++) {
const Light::Sector &start = l.sectors().at(j);
const Light::Sector &end = (j == l.sectors().size() - 1)
? l.sectors().at(0) : l.sectors().at(j+1);
quint32 angle = end.angle() - start.angle();
if (start.color() && !angle && start.range() < MAJOR_RANGE)
return start.color();
}
}
return Light::None;
}
void RasterTile::processPoints(QList<MapData::Point> &points, void RasterTile::processPoints(QList<MapData::Point> &points,
QList<TextItem*> &textItems, QList<const MapData::Point*> &lights) QList<TextItem*> &textItems, QList<TextItem*> &lights,
QList<const MapData::Point*> &sectorLights)
{ {
std::sort(points.begin(), points.end()); std::sort(points.begin(), points.end());
@ -484,10 +524,10 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
const Style *style = _data->style(); const Style *style = _data->style();
const Style::Point &ps = style->point(point.type); const Style::Point &ps = style->point(point.type);
bool poi = Style::isPOI(point.type); bool poi = Style::isPOI(point.type);
bool sl = showAsSector(point.lights); bool sl = sectorLight(point.lights);
if (sl) if (sl)
lights.append(&point); sectorLights.append(&point);
const QString *label = point.label.text().isEmpty() const QString *label = point.label.text().isEmpty()
? 0 : &(point.label.text()); ? 0 : &(point.label.text());
@ -511,17 +551,15 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
color, hcolor, 0, ICON_PADDING); color, hcolor, 0, ICON_PADDING);
if (item->isValid() && (sl || !item->collides(textItems))) { if (item->isValid() && (sl || !item->collides(textItems))) {
textItems.append(item); textItems.append(item);
for (int j = 0; j < point.lights.size(); j++) { Light::Color color = ordinaryLight(point.lights);
const Light &l = point.lights.at(j); if (color)
if (l.color() && l.range() <= RANGE_MIN) { lights.append(new TextPointItem(pos + style->lightOffset(),
textItems.append(new TextPointItem(pos + style->lightOffset(), 0, 0, style->light(color), 0, 0, 0, 0));
0, 0, style->light(l.color()), 0, 0, 0, 0));
break;
}
}
} else } else
delete item; delete item;
} }
} }
void RasterTile::fetchData(QList<MapData::Poly> &polygons, void RasterTile::fetchData(QList<MapData::Poly> &polygons,
@ -606,8 +644,8 @@ void RasterTile::render()
QList<MapData::Poly> polygons; QList<MapData::Poly> polygons;
QList<MapData::Poly> lines; QList<MapData::Poly> lines;
QList<MapData::Point> points; QList<MapData::Point> points;
QList<TextItem*> textItems; QList<TextItem*> textItems, lights;
QList<const MapData::Point*> lights; QList<const MapData::Point*> sectorLights;
QImage arrows[2]; QImage arrows[2];
arrows[ROAD] = Util::svg2img(":/symbols/oneway.svg", _ratio); arrows[ROAD] = Util::svg2img(":/symbols/oneway.svg", _ratio);
@ -618,7 +656,7 @@ void RasterTile::render()
ll2xy(lines); ll2xy(lines);
ll2xy(points); ll2xy(points);
processPoints(points, textItems, lights); processPoints(points, textItems, lights, sectorLights);
processPolygons(polygons, textItems); processPolygons(polygons, textItems);
processLines(lines, textItems, arrows); processLines(lines, textItems, arrows);
@ -633,9 +671,11 @@ void RasterTile::render()
drawPolygons(&painter, polygons); drawPolygons(&painter, polygons);
drawHillShading(&painter); drawHillShading(&painter);
drawLines(&painter, lines); drawLines(&painter, lines);
drawSectorLights(&painter, lights); drawTextItems(&painter, lights);
drawSectorLights(&painter, sectorLights);
drawTextItems(&painter, textItems); drawTextItems(&painter, textItems);
qDeleteAll(lights);
qDeleteAll(textItems); qDeleteAll(textItems);
//painter.setPen(Qt::red); //painter.setPen(Qt::red);

52
src/map/IMG/rastertile.h
View File

@ -9,7 +9,6 @@
#include "style.h" #include "style.h"
class QPainter; class QPainter;
class IMGMap;
class TextItem; class TextItem;
namespace IMG { namespace IMG {
@ -32,23 +31,30 @@ public:
void render(); void render();
private: private:
typedef RTree<const MapData::Elevation*, double, 2> DEMTRee; struct Sector
struct ElevationCTX
{ {
ElevationCTX(const DEMTRee &tree, const Coordinates &c, double &ele) Sector(Light::Color color, quint32 start, quint32 end)
: tree(tree), c(c), ele(ele) {} : color(color), start(start), end(end) {}
const DEMTRee &tree; bool operator==(const Sector &other) const
const Coordinates &c; {
double &ele; return (color == other.color && start == other.start
}; && end == other.end);
struct EdgeCTX }
{ bool operator<(const Sector &other) const
EdgeCTX(const Coordinates &c, double &ele) : c(c), ele(ele) {} {
if (color == other.color) {
if (start == other.start)
return end < other.end;
else
return start < other.start;
} else
return color < other.color;
}
const Coordinates &c; Light::Color color;
double &ele; quint32 start;
quint32 end;
}; };
void fetchData(QList<MapData::Poly> &polygons, QList<MapData::Poly> &lines, void fetchData(QList<MapData::Poly> &polygons, QList<MapData::Poly> &lines,
@ -60,18 +66,22 @@ private:
void ll2xy(QList<MapData::Poly> &polys) const; void ll2xy(QList<MapData::Poly> &polys) const;
void ll2xy(QList<MapData::Point> &points) const; void ll2xy(QList<MapData::Point> &points) const;
void drawPolygons(QPainter *painter, const QList<MapData::Poly> &polygons) const; void drawPolygons(QPainter *painter,
const QList<MapData::Poly> &polygons) const;
void drawLines(QPainter *painter, const QList<MapData::Poly> &lines) const; void drawLines(QPainter *painter, const QList<MapData::Poly> &lines) const;
void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems) const; void drawTextItems(QPainter *painter,
const QList<TextItem*> &textItems) const;
void drawHillShading(QPainter *painter) const; void drawHillShading(QPainter *painter) const;
void drawSectorLights(QPainter *painter, const QList<const MapData::Point*> &lights) const; void drawSectorLights(QPainter *painter,
const QList<const MapData::Point*> &lights) const;
void processPolygons(const QList<MapData::Poly> &polygons, void processPolygons(const QList<MapData::Poly> &polygons,
QList<TextItem *> &textItems); QList<TextItem*> &textItems);
void processLines(QList<MapData::Poly> &lines, QList<TextItem*> &textItems, void processLines(QList<MapData::Poly> &lines, QList<TextItem*> &textItems,
const QImage (&arrows)[2]); const QImage (&arrows)[2]);
void processPoints(QList<MapData::Point> &points, QList<TextItem*> &textItems, void processPoints(QList<MapData::Point> &points,
QList<const MapData::Point *> &lights); QList<TextItem*> &textItems, QList<TextItem*> &lights,
QList<const MapData::Point*> &sectorLights);
void processShields(const QList<MapData::Poly> &lines, void processShields(const QList<MapData::Poly> &lines,
QList<TextItem*> &textItems); QList<TextItem*> &textItems);
void processStreetNames(const QList<MapData::Poly> &lines, void processStreetNames(const QList<MapData::Poly> &lines,