ham-ref/satdump
1
0
Fork 0
mirror of https://github.com/SatDump/SatDump synced 2026-08-13 17:47:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Honor saved border/city color everywhere in viewer

Browse source
This commit is contained in:
Jamie Vital 2023-10-14 13:06:21 -04:00
parent 83b26bb9f3
commit 45b860a28f
7 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src-interface/viewer/image_handler.cpp
View file

@ -184,7 +184,7 @@ namespace satdump
if (map_overlay)
{
logger->info("Drawing map overlay...");
unsigned short color[3] = {(unsigned short)(color_borders.x * 65535.0f), (unsigned short)(color_borders.y * 65535.0f), (unsigned short)(color_borders.z * 65535.0f)};
unsigned short color[3] = {(unsigned short)(viewer_color_borders.x * 65535.0f), (unsigned short)(viewer_color_borders.y * 65535.0f), (unsigned short)(viewer_color_borders.z * 65535.0f)};
map::drawProjectedMapShapefile({resources::getResourcePath("maps/ne_10m_admin_0_countries.shp")},
current_image,
color,
@ -194,7 +194,7 @@ namespace satdump
if (cities_overlay)
{
logger->info("Drawing cities overlay...");
unsigned short color[3] = {(unsigned short)(color_cities.x * 65535.0f), (unsigned short)(color_cities.y * 65535.0f), (unsigned short)(color_cities.z * 65535.0f)};
unsigned short color[3] = {(unsigned short)(viewer_color_cities.x * 65535.0f), (unsigned short)(viewer_color_cities.y * 65535.0f), (unsigned short)(viewer_color_cities.z * 65535.0f)};
map::drawProjectedCitiesGeoJson({resources::getResourcePath("maps/ne_10m_populated_places_simple.json")},
current_image,
color,
@ -674,11 +674,11 @@ namespace satdump
if (ImGui::Checkbox("Borders", &map_overlay))
asyncUpdate();
ImGui::SameLine();
ImGui::ColorEdit3("##borders", (float *)&color_borders, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
ImGui::ColorEdit3("##borders", (float *)&viewer_color_borders, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
if (ImGui::Checkbox("Cities", &cities_overlay))
asyncUpdate();
ImGui::SameLine();
ImGui::ColorEdit3("##cities", (float *)&color_cities, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
ImGui::ColorEdit3("##cities", (float *)&viewer_color_cities, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
ImGui::SliderInt("Cities Font Size", &cities_size, 10, 500);
static const char *items[] = {"Capitals Only", "Capitals + Regional Capitals", "All (by Scale Rank)"};
if (ImGui::Combo("Cities Type", &cities_type, items, IM_ARRAYSIZE(items)))