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

filter location pins according node filtering (#111)

Browse Source
This commit is contained in:
Manuel
2025-03-30 17:08:33 +02:00
committed by GitHub
parent f5128a477d
commit de6b19f916
4 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/map/MapPanel.cpp
+38 -12
View File
@@ -122,24 +122,30 @@ void MapPanel::drawObjects(void)
{
objectsOnMap = 0;
for (auto &it : mapObjects) {
// check if object's tile is visible
MapObject &obj = *it.second;
obj.point.setZoom(MapTileSettings::getZoomLevel());
drawObject(obj);
drawObject(*it.second);
}
}
void MapPanel::drawObject(const MapObject &obj)
void MapPanel::drawObject(MapObject &obj)
{
if (obj.draw) {
auto tileIt = tiles.find(obj.point.xTile << 16 | obj.point.yTile);
if (tileIt != tiles.end()) {
MapTile &tile = *tileIt->second;
objectsOnMap++; // FIXME: counts also objects that are clipped away
obj.draw(obj.id, tile.getX() + obj.point.xPos, tile.getY() + obj.point.yPos, MapTileSettings::getZoomLevel());
} else {
obj.draw(obj.id, 0, 0, 0); // hide object
if (!obj.point.isFiltered) {
if (obj.point.zoomLevel != MapTileSettings::getZoomLevel()) {
obj.point.setZoom(MapTileSettings::getZoomLevel());
}
// check if object is in the visible tile area
auto tileIt = tiles.find(obj.point.xTile << 16 | obj.point.yTile);
if (tileIt != tiles.end()) {
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++;
obj.draw(obj.id, tile.getX() + obj.point.xPos, tile.getY() + obj.point.yPos, MapTileSettings::getZoomLevel());
return;
}
}
}
obj.draw(obj.id, 0, 0, 0); // hide object
}
}
@@ -422,6 +428,16 @@ void MapPanel::update(uint32_t id, float lat, float lon)
drawObject(*it->second);
}
void MapPanel::update(uint32_t id, bool filtered)
{
auto it = mapObjects.find(id);
if (it != mapObjects.end() && it->second->point.isFiltered != filtered) {
// only update if filter state changed
it->second->point.isFiltered = filtered;
drawObject(*it->second);
}
}
void MapPanel::remove(uint32_t id)
{
mapObjects.erase(id);
@@ -443,6 +459,16 @@ void MapPanel::setNoTileImage(const lv_image_dsc_t *img_src)
noTileImage = img_src;
}
void MapPanel::forceRedraw(bool onlyObjects)
{
if (onlyObjects) {
drawObjects();
drawLocation();
} else {
needsRedraw = true;
}
}
void MapPanel::task_handler(void)
{
redraw();