Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 06:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Show scale on map (#1296)

Browse Source 
* Add scale to geomap

* Add scale to geomap
This commit is contained in:
Mark Thompson 2023-07-24 07:52:30 -05:00 committed by GitHub
parent e6ad5efbb7
commit 6ae164e59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/application/ui/ui_geomap.cpp
View File

@ -32,6 +32,7 @@ using namespace portapack;
#include "string_format.hpp" #include "string_format.hpp"
#include "complex.hpp" #include "complex.hpp"
#include "ui_styles.hpp" #include "ui_styles.hpp"
#include "ui_font_fixed_5x8.hpp"
namespace ui { namespace ui {
@ -243,6 +244,7 @@ void GeoMap::paint(Painter& painter) {
// Draw the other markers // Draw the other markers
draw_markers(painter); draw_markers(painter);
draw_scale(painter);
markerListUpdated = false; markerListUpdated = false;
set_clean(); set_clean();
} }
@ -283,6 +285,10 @@ void GeoMap::move(const float lon, const float lat) {
x_pos = map_width - map_rect.width(); x_pos = map_width - map_rect.width();
if (y_pos > (map_height + map_rect.height())) if (y_pos > (map_height + map_rect.height()))
y_pos = map_height - map_rect.height(); y_pos = map_height - map_rect.height();
// Scale calculation
float km_per_deg_lon = cos(lat * pi / 180) * 111.321; // 111.321 km/deg longitude at equator, and 0 km at poles
pixels_per_km = (map_rect.width() / 2) / km_per_deg_lon;
} }
bool GeoMap::init() { bool GeoMap::init() {
@ -318,6 +324,24 @@ bool GeoMap::manual_panning() {
return manual_panning_; return manual_panning_;
} }
void GeoMap::draw_scale(Painter& painter) {
uint16_t km = 100;
uint16_t scale_width = km * pixels_per_km * map_zoom;
while (scale_width > screen_width / 2) {
scale_width /= 2;
km /= 2;
}
std::string km_string = to_string_dec_uint(km) + " km";
display.fill_rectangle({{screen_width - 5 - scale_width, screen_height - 4}, {scale_width, 2}}, Color::black());
display.fill_rectangle({{screen_width - 5, screen_height - 8}, {2, 6}}, Color::black());
display.fill_rectangle({{screen_width - 5 - scale_width, screen_height - 8}, {2, 6}}, Color::black());
painter.draw_string({(uint16_t)(screen_width - 25 - scale_width - km_string.length() * 5 / 2), screen_height - 10}, ui::font::fixed_5x8, Color::black(), Color::white(), km_string);
}
void GeoMap::draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color) { void GeoMap::draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color) {
Point arrow_a, arrow_b, arrow_c; Point arrow_a, arrow_b, arrow_c;

2
firmware/application/ui/ui_geomap.hpp
View File

@ -179,6 +179,7 @@ class GeoMap : public Widget {
MapMarkerStored store_marker(GeoMarker& marker); MapMarkerStored store_marker(GeoMarker& marker);
private: private:
void draw_scale(Painter& painter);
void draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color); void draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color);
void draw_marker(Painter& painter, const ui::Point itemPoint, const uint16_t itemAngle, const std::string itemTag, const Color color = Color::red(), const Color fontColor = Color::white(), const Color backColor = Color::black()); void draw_marker(Painter& painter, const ui::Point itemPoint, const uint16_t itemAngle, const std::string itemTag, const Color color = Color::red(), const Color fontColor = Color::white(), const Color backColor = Color::black());
void draw_markers(Painter& painter); void draw_markers(Painter& painter);
@ -199,6 +200,7 @@ class GeoMap : public Widget {
int32_t prev_x_pos{0xFFFF}, prev_y_pos{0xFFFF}; int32_t prev_x_pos{0xFFFF}, prev_y_pos{0xFFFF};
float lat_{}; float lat_{};
float lon_{}; float lon_{};
float pixels_per_km{};
uint16_t angle_{}; uint16_t angle_{};
std::string tag_{}; std::string tag_{};