root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-03-14 02:57:45 +01:00
Code Issues Projects Releases Activity

Fixed broken sector lights rendering after recent code changes

Browse Source
This commit is contained in:
Martin Tůma 2025-03-08 04:27:40 +01:00
parent fdd5d46c03
commit a9572d05fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ static QRectF lightRect(const QPointF &pos, double range)
} }
void RasterTile::drawSectorLights(QPainter *painter, void RasterTile::drawSectorLights(QPainter *painter,
const QMap<Coordinates, SectorLight> &lights) const const QMultiMap<Coordinates, SectorLight> &lights) const
{ {
for (auto it = lights.cbegin(); it != lights.cend(); ++it) { for (auto it = lights.cbegin(); it != lights.cend(); ++it) {
const SectorLight &l = it.value(); const SectorLight &l = it.value();
@ -264,7 +264,7 @@ void RasterTile::drawSectorLights(QPainter *painter,
void RasterTile::processPoints(const QList<Data::Point> &points, void RasterTile::processPoints(const QList<Data::Point> &points,
QList<TextItem*> &textItems, QList<TextItem*> &lightItems, QList<TextItem*> &textItems, QList<TextItem*> &lightItems,
QMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const QMultiMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const
{ {
QMap<Coordinates, Style::Color> lights; QMap<Coordinates, Style::Color> lights;
QSet<Coordinates> sigs; QSet<Coordinates> sigs;
@ -356,7 +356,7 @@ void RasterTile::drawLevels(QPainter *painter, const QList<Level> &levels)
{ {
for (int i = levels.size() - 1; i >= 0; i--) { for (int i = levels.size() - 1; i >= 0; i--) {
QList<TextItem*> textItems, lightItems; QList<TextItem*> textItems, lightItems;
QMap<Coordinates, SectorLight> sectorLights; QMultiMap<Coordinates, SectorLight> sectorLights;
const Level &l = levels.at(i); const Level &l = levels.at(i);
processPoints(l.points, textItems, lightItems, sectorLights, l.overZoom); processPoints(l.points, textItems, lightItems, sectorLights, l.overZoom);

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

@ -69,7 +69,7 @@ private:
QPointF centroid(const QVector<Coordinates> &polygon) const; QPointF centroid(const QVector<Coordinates> &polygon) const;
void processPoints(const QList<Data::Point> &points, void processPoints(const QList<Data::Point> &points,
QList<TextItem*> &textItems, QList<TextItem*> &lightItems, QList<TextItem*> &textItems, QList<TextItem*> &lightItems,
QMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const; QMultiMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const;
void processLines(const QList<Data::Line> &lines, void processLines(const QList<Data::Line> &lines,
QList<TextItem*> &textItems) const; QList<TextItem*> &textItems) const;
void drawArrows(QPainter *painter, const QList<Data::Point> &points) const; void drawArrows(QPainter *painter, const QList<Data::Point> &points) const;
@ -77,7 +77,7 @@ private:
void drawLines(QPainter *painter, const QList<Data::Line> &lines) const; void drawLines(QPainter *painter, const QList<Data::Line> &lines) const;
void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems) const; void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems) const;
void drawSectorLights(QPainter *painter, void drawSectorLights(QPainter *painter,
const QMap<Coordinates, SectorLight> &lights) const; const QMultiMap<Coordinates, SectorLight> &lights) const;
bool showLabel(const QImage *img, int type) const; bool showLabel(const QImage *img, int type) const;
void drawLevels(QPainter *painter, const QList<Level> &levels); void drawLevels(QPainter *painter, const QList<Level> &levels);
QList<Level> fetchLevels(); QList<Level> fetchLevels();