Radar site threshold

scwx-qt/source/scwx/qt/map/radar_site_layer.cpp

@@ -1,5 +1,6 @@
 #include <scwx/qt/map/radar_site_layer.hpp>
 #include <scwx/qt/config/radar_site.hpp>
+#include <scwx/qt/settings/general_settings.hpp>
 #include <scwx/qt/settings/text_settings.hpp>
 #include <scwx/qt/util/maplibre.hpp>
 #include <scwx/qt/util/tooltip.hpp>
@@ -59,6 +60,18 @@ void RadarSiteLayer::Initialize()
 void RadarSiteLayer::Render(
    const QMapLibre::CustomLayerRenderParameters& params)
 {
+   p->hoverText_.clear();
+
+   auto mapDistance = util::maplibre::GetMapDistance(params);
+   auto threshold   = units::length::kilometers<double>(
+      settings::GeneralSettings::Instance().radar_site_threshold().GetValue());
+
+   if (!(threshold.value() == 0.0 || mapDistance <= threshold ||
+         (threshold.value() < 0 && mapDistance >= -threshold)))
+   {
+      return;
+   }
+
    gl::OpenGLFunctions& gl = context()->gl();
 
    context()->set_render_parameters(params);
@@ -73,8 +86,6 @@ void RadarSiteLayer::Render(
    p->halfWidth_     = params.width * 0.5f;
    p->halfHeight_    = params.height * 0.5f;
 
-   p->hoverText_.clear();
-
    // Radar site ImGui windows shouldn't have padding
    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2 {0.0f, 0.0f});
 

scwx-qt/source/scwx/qt/settings/general_settings.cpp

@@ -78,6 +78,7 @@ class GeneralSettings::Impl
       updateNotificationsEnabled_.SetDefault(true);
       warningsProvider_.SetDefault(defaultWarningsProviderValue);
       cursorIconAlwaysOn_.SetDefault(false);
+      radarSiteThreshold_.SetDefault(0.0);
 
       fontSizes_.SetElementMinimum(1);
       fontSizes_.SetElementMaximum(72);
@@ -95,6 +96,8 @@ class GeneralSettings::Impl
       loopTime_.SetMaximum(1440);
       nmeaBaudRate_.SetMinimum(1);
       nmeaBaudRate_.SetMaximum(999999999);
+      radarSiteThreshold_.SetMinimum(-10000);
+      radarSiteThreshold_.SetMaximum(10000);
 
       customStyleDrawLayer_.SetTransform([](const std::string& value)
                                          { return boost::trim_copy(value); });
@@ -168,6 +171,7 @@ class GeneralSettings::Impl
    SettingsVariable<bool> updateNotificationsEnabled_ {"update_notifications"};
    SettingsVariable<std::string> warningsProvider_ {"warnings_provider"};
    SettingsVariable<bool>        cursorIconAlwaysOn_ {"cursor_icon_always_on"};
+   SettingsVariable<double>      radarSiteThreshold_ {"radar_site_threshold"};
 };
 
 GeneralSettings::GeneralSettings() :
@@ -201,7 +205,8 @@ GeneralSettings::GeneralSettings() :
                       &p->trackLocation_,
                       &p->updateNotificationsEnabled_,
                       &p->warningsProvider_,
-                      &p->cursorIconAlwaysOn_});
+                      &p->cursorIconAlwaysOn_,
+                      &p->radarSiteThreshold_});
    SetDefaults();
 }
 GeneralSettings::~GeneralSettings() = default;
@@ -356,6 +361,11 @@ SettingsVariable<bool>& GeneralSettings::cursor_icon_always_on() const
    return p->cursorIconAlwaysOn_;
 }
 
+SettingsVariable<double>& GeneralSettings::radar_site_threshold() const
+{
+   return p->radarSiteThreshold_;
+}
+
 bool GeneralSettings::Shutdown()
 {
    bool dataChanged = false;
@@ -406,7 +416,8 @@ bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
            lhs.p->updateNotificationsEnabled_ ==
               rhs.p->updateNotificationsEnabled_ &&
            lhs.p->warningsProvider_ == rhs.p->warningsProvider_ &&
-           lhs.p->cursorIconAlwaysOn_ == rhs.p->cursorIconAlwaysOn_);
+           lhs.p->cursorIconAlwaysOn_ == rhs.p->cursorIconAlwaysOn_ &&
+           lhs.p->radarSiteThreshold_ == rhs.p->radarSiteThreshold_);
 }
 
 } // namespace settings

scwx-qt/source/scwx/qt/settings/general_settings.hpp

@@ -54,6 +54,7 @@ class GeneralSettings : public SettingsCategory
    SettingsVariable<bool>&        update_notifications_enabled() const;
    SettingsVariable<std::string>& warnings_provider() const;
    SettingsVariable<bool>&        cursor_icon_always_on() const;
+   SettingsVariable<double>&      radar_site_threshold() const;
 
    static GeneralSettings& Instance();
 

scwx-qt/source/scwx/qt/ui/settings_dialog.cpp

@@ -133,6 +133,7 @@ class SettingsDialogImpl
           &nmeaBaudRate_,
           &nmeaSource_,
           &warningsProvider_,
+          &radarSiteThreshold_,
           &antiAliasingEnabled_,
           &showMapAttribution_,
           &showMapCenter_,
@@ -249,6 +250,7 @@ class SettingsDialogImpl
    settings::SettingsInterface<std::string>  theme_ {};
    settings::SettingsInterface<std::string>  themeFile_ {};
    settings::SettingsInterface<std::string>  warningsProvider_ {};
+   settings::SettingsInterface<double>       radarSiteThreshold_ {};
    settings::SettingsInterface<bool>         antiAliasingEnabled_ {};
    settings::SettingsInterface<bool>         showMapAttribution_ {};
    settings::SettingsInterface<bool>         showMapCenter_ {};
@@ -749,6 +751,27 @@ void SettingsDialogImpl::SetupGeneralTab()
    warningsProvider_.SetResetButton(self_->ui->resetWarningsProviderButton);
    warningsProvider_.EnableTrimming();
 
+   radarSiteThreshold_.SetSettingsVariable(
+      generalSettings.radar_site_threshold());
+   radarSiteThreshold_.SetEditWidget(self_->ui->radarSiteThresholdSpinBox);
+   radarSiteThreshold_.SetResetButton(self_->ui->resetRadarSiteThresholdButton);
+   radarSiteThreshold_.SetUnitLabel(self_->ui->radarSiteThresholdUnitLabel);
+   auto radarSiteThresholdUpdateUnits = [this](const std::string& newValue)
+   {
+      const types::DistanceUnits radiusUnits =
+         types::GetDistanceUnitsFromName(newValue);
+      const double      radiusScale = types::GetDistanceUnitsScale(radiusUnits);
+      const std::string abbreviation =
+         types::GetDistanceUnitsAbbreviation(radiusUnits);
+
+      radarSiteThreshold_.SetUnit(radiusScale, abbreviation);
+   };
+   settings::UnitSettings::Instance()
+      .distance_units()
+      .RegisterValueStagedCallback(radarSiteThresholdUpdateUnits);
+   radarSiteThresholdUpdateUnits(
+      settings::UnitSettings::Instance().distance_units().GetValue());
+
    antiAliasingEnabled_.SetSettingsVariable(
       generalSettings.anti_aliasing_enabled());
    antiAliasingEnabled_.SetEditWidget(self_->ui->antiAliasingEnabledCheckBox);
@@ -1059,10 +1082,10 @@ void SettingsDialogImpl::SetupAudioTab()
    alertAudioRadius_.SetUnitLabel(self_->ui->alertAudioRadiusUnitsLabel);
    auto alertAudioRadiusUpdateUnits = [this](const std::string& newValue)
    {
-      types::DistanceUnits radiusUnits =
+      const types::DistanceUnits radiusUnits =
          types::GetDistanceUnitsFromName(newValue);
-      double      radiusScale = types::GetDistanceUnitsScale(radiusUnits);
-      std::string abbreviation =
+      const double      radiusScale = types::GetDistanceUnitsScale(radiusUnits);
+      const std::string abbreviation =
          types::GetDistanceUnitsAbbreviation(radiusUnits);
 
       alertAudioRadius_.SetUnit(radiusScale, abbreviation);