m5/meshtastic-device-ui
0
0
Fork 0
mirror of https://github.com/m5stack/meshtastic-device-ui.git synced 2026-05-20 11:51:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix locations counter

Browse Source
This commit is contained in:
mverch67
2025-04-18 14:48:05 +02:00
parent 34c7bd43b0
commit 5c16bbd3c1
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics/map/MapPanel.h
+1 -1
View File
@@ -72,7 +72,7 @@ class MapPanel
void redraw(void);
void drawLocation(void);
void drawObjects(void);
void drawObject(MapObject &obj);
void drawObject(MapObject &obj, bool count = false);
bool needsRedraw = false;
bool redrawCompleted = true;
source/graphics/map/MapPanel.cpp
+10 -4
View File
@@ -122,11 +122,16 @@ void MapPanel::drawObjects(void)
{
objectsOnMap = 0;
for (auto &it : mapObjects) {
drawObject(*it.second);
drawObject(*it.second, true);
}
}
void MapPanel::drawObject(MapObject &obj)
/**
* draw a single object
* @param obj object to draw
* @param count if true, count the number of objects drawn
*/
void MapPanel::drawObject(MapObject &obj, bool count)
{
if (obj.draw) {
if (!obj.point.isFiltered) {
@@ -139,7 +144,8 @@ void MapPanel::drawObject(MapObject &obj)
MapTile &tile = *tileIt->second;
if (tile.getX() + obj.point.xPos >= 0 && tile.getX() + obj.point.xPos < widthPixel &&
tile.getY() + obj.point.yPos >= 0 && tile.getY() + obj.point.yPos < heightPixel) {
objectsOnMap++;
if (count)
objectsOnMap++;
obj.draw(obj.id, tile.getX() + obj.point.xPos, tile.getY() + obj.point.yPos, MapTileSettings::getZoomLevel());
return;
}
@@ -414,7 +420,7 @@ void MapPanel::add(uint32_t id, float lat, float lon, DrawCallback drawCB)
} else {
auto object = std::unique_ptr<MapObject>(
new MapObject({.id = id, .point = GeoPoint(lat, lon, MapTileSettings::getZoomLevel()), .draw = drawCB}));
drawObject(*object);
drawObject(*object, true);
mapObjects.emplace(id, std::move(object));
}
}