diff --git a/src-interface/viewer/image_handler.cpp b/src-interface/viewer/image_handler.cpp index 19c9a1a9e..616ce17f3 100644 --- a/src-interface/viewer/image_handler.cpp +++ b/src-interface/viewer/image_handler.cpp @@ -212,7 +212,7 @@ namespace satdump current_image, color, proj_func, - cities_size, + viewer_app->cities_size, viewer_app->cities_type, viewer_app->cities_scale_rank); } @@ -712,7 +712,7 @@ namespace satdump asyncUpdate(); ImGui::SameLine(); ImGui::ColorEdit3("##cities", (float *)&viewer_app->color_cities, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel); - ImGui::SliderInt("Cities Font Size", &cities_size, 10, 500); + ImGui::SliderInt("Cities Font Size", &viewer_app->cities_size, 10, 500); if (ImGui::IsItemDeactivatedAfterEdit()) asyncUpdate(); static const char *items[] = {"Capitals Only", "Capitals + Regional Capitals", "All (by Scale Rank)"}; diff --git a/src-interface/viewer/image_handler.h b/src-interface/viewer/image_handler.h index 6a0433e90..87e4efa9f 100644 --- a/src-interface/viewer/image_handler.h +++ b/src-interface/viewer/image_handler.h @@ -41,7 +41,6 @@ namespace satdump bool shores_overlay = false; bool cities_overlay = false; bool latlon_overlay = false; - int cities_size = 50; // GUI bool range_window = false; diff --git a/src-interface/viewer/scatterometer_handler.cpp b/src-interface/viewer/scatterometer_handler.cpp index baf0f2044..d26b6e848 100644 --- a/src-interface/viewer/scatterometer_handler.cpp +++ b/src-interface/viewer/scatterometer_handler.cpp @@ -101,7 +101,7 @@ namespace satdump current_img, color, proj_func, - cities_size, + viewer_app->cities_size, viewer_app->cities_type, viewer_app->cities_scale_rank); } @@ -224,7 +224,7 @@ namespace satdump asyncUpdate(); ImGui::SameLine(); ImGui::ColorEdit3("##cities", (float*)&viewer_app->color_cities, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel); - ImGui::SliderInt("Cities Font Size", &cities_size, 10, 500); + ImGui::SliderInt("Cities Font Size", &viewer_app->cities_size, 10, 500); if (ImGui::IsItemDeactivatedAfterEdit()) asyncUpdate(); static const char* items[] = { "Capitals Only", "Capitals + Regional Capitals", "All (by Scale Rank)" }; diff --git a/src-interface/viewer/scatterometer_handler.h b/src-interface/viewer/scatterometer_handler.h index ee73c3701..43197ac0d 100644 --- a/src-interface/viewer/scatterometer_handler.h +++ b/src-interface/viewer/scatterometer_handler.h @@ -47,7 +47,6 @@ namespace satdump bool shores_overlay = false; bool cities_overlay = false; bool latlon_overlay = false; - int cities_size = 50; void init(); diff --git a/src-interface/viewer/viewer.cpp b/src-interface/viewer/viewer.cpp index b7528c34f..9157a836f 100644 --- a/src-interface/viewer/viewer.cpp +++ b/src-interface/viewer/viewer.cpp @@ -56,6 +56,8 @@ namespace satdump color_latlon.z = color[2]; } + if (config::main_cfg["user"]["viewer_state"].contains("cities_size")) + cities_size = config::main_cfg["user"]["viewer_state"]["cities_size"].get(); if (config::main_cfg["user"]["viewer_state"].contains("cities_type")) cities_type = config::main_cfg["user"]["viewer_state"]["cities_type"].get(); if (config::main_cfg["user"]["viewer_state"].contains("cities_scale_rank")) @@ -99,6 +101,7 @@ namespace satdump { config::main_cfg["user"]["viewer_state"]["panel_ratio"] = panel_ratio; config::main_cfg["user"]["viewer_state"]["cities_type"] = cities_type; + config::main_cfg["user"]["viewer_state"]["cities_size"] = cities_size; config::main_cfg["user"]["viewer_state"]["cities_scale_rank"] = cities_scale_rank; config::main_cfg["user"]["viewer_state"]["borders_color"] = {color_borders.x, color_borders.y, color_borders.z}; config::main_cfg["user"]["viewer_state"]["shores_color"] = {color_shores.x, color_shores.y, color_shores.z}; diff --git a/src-interface/viewer/viewer.h b/src-interface/viewer/viewer.h index 8fce22fcf..c3b73495a 100644 --- a/src-interface/viewer/viewer.h +++ b/src-interface/viewer/viewer.h @@ -162,7 +162,7 @@ namespace satdump bool projections_draw_map_overlay = true; bool projections_draw_shores_overlay = true; bool projections_draw_cities_overlay = true; - int projections_cities_scale = 50; + int projections_cities_size = 50; bool projections_draw_latlon_overlay = false; int projections_current_selected_proj = 0; @@ -197,6 +197,7 @@ namespace satdump ImVec4 color_cities = {1, 0, 0, 1}; ImVec4 color_latlon = {0, 0, 1, 1}; int cities_type = 0; + int cities_size; int cities_scale_rank = 3; int projections_image_width = 2048; @@ -212,7 +213,7 @@ namespace satdump out["projections_draw_map_overlay"] = projections_draw_map_overlay; out["projections_draw_shores_overlay"] = projections_draw_shores_overlay; out["projections_draw_cities_overlay"] = projections_draw_cities_overlay; - out["projections_cities_scale"] = projections_cities_scale; + out["projections_cities_scale"] = projections_cities_size; out["projections_draw_latlon_overlay"] = projections_draw_latlon_overlay; out["projections_current_selected_proj"] = projections_current_selected_proj; @@ -245,7 +246,7 @@ namespace satdump setValueIfExists(in["projections_draw_map_overlay"], projections_draw_map_overlay); setValueIfExists(in["projections_draw_shores_overlay"], projections_draw_shores_overlay); setValueIfExists(in["projections_draw_cities_overlay"], projections_draw_cities_overlay); - setValueIfExists(in["projections_cities_scale"], projections_cities_scale); + setValueIfExists(in["projections_cities_scale"], projections_cities_size); setValueIfExists(in["projections_draw_latlon_overlay"], projections_draw_latlon_overlay); setValueIfExists(in["projections_current_selected_proj"], projections_current_selected_proj); diff --git a/src-interface/viewer/viewer_projection.cpp b/src-interface/viewer/viewer_projection.cpp index 9d62bf37f..94c186c17 100644 --- a/src-interface/viewer/viewer_projection.cpp +++ b/src-interface/viewer/viewer_projection.cpp @@ -409,7 +409,7 @@ namespace satdump ImGui::Checkbox("Cities Overlay##Projs", &projections_draw_cities_overlay); ImGui::SameLine(); ImGui::ColorEdit3("##cities", (float *)&color_cities, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel); - ImGui::SliderInt("Cities Font Size##Projs", &projections_cities_scale, 10, 500); + ImGui::SliderInt("Cities Font Size##Projs", &projections_cities_size, 10, 500); static const char *city_categories[] = {"Capitals Only", "Capitals + Regional Capitals", "All (by Scale Rank)"}; ImGui::Combo("Cities Type", &cities_type, city_categories, IM_ARRAYSIZE(city_categories)); if (cities_type == 2) @@ -556,7 +556,7 @@ namespace satdump projected_image_result, color, proj_func, - projections_cities_scale, + projections_cities_size, cities_type, cities_scale_rank); }