diff --git a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp index ef1de516..396158f7 100644 --- a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp @@ -65,7 +65,9 @@ void RadarSiteLayer::Render( auto mapDistance = util::maplibre::GetMapDistance(params); auto threshold = units::length::nautical_miles( settings::GeneralSettings::Instance().radar_site_threshold().GetValue()); - if (threshold.value() != 0.0 && mapDistance > threshold) + + if (!(threshold.value() == 0.0 || mapDistance <= threshold || + (threshold.value() < 0 && mapDistance >= -threshold))) { return; } diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp index 64da33a1..bc07926b 100644 --- a/scwx-qt/source/scwx/qt/settings/general_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/general_settings.cpp @@ -96,8 +96,8 @@ public: loopTime_.SetMaximum(1440); nmeaBaudRate_.SetMinimum(1); nmeaBaudRate_.SetMaximum(999999999); - radarSiteThreshold_.SetMinimum(0); - radarSiteThreshold_.SetMaximum(999); + radarSiteThreshold_.SetMinimum(-10000); + radarSiteThreshold_.SetMaximum( 10000); customStyleDrawLayer_.SetTransform([](const std::string& value) { return boost::trim_copy(value); }); diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp index 9bf589bf..1d895ffa 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp @@ -753,8 +753,7 @@ void SettingsDialogImpl::SetupGeneralTab() radarSiteThreshold_.SetSettingsVariable( generalSettings.radar_site_threshold()); - radarSiteThreshold_.SetEditWidget( - self_->ui->radarSiteThresholdSpinBox); + radarSiteThreshold_.SetEditWidget(self_->ui->radarSiteThresholdSpinBox); radarSiteThreshold_.SetResetButton(self_->ui->resetRadarSiteThresholdButton); antiAliasingEnabled_.SetSettingsVariable( diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui index 5423c523..bf33a80d 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui @@ -135,7 +135,7 @@ 0 - -302 + -303 511 733 @@ -575,8 +575,11 @@ 0 + + -10000.000000000000000 + - 999.000000000000000 + 10000.000000000000000 QAbstractSpinBox::StepType::DefaultStepType diff --git a/test/data b/test/data index 0eb47590..4b4d9c54 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 0eb475909f9e64ce81e7b8b39420d980b81b3baa +Subproject commit 4b4d9c54b8218aa2297dbd457e3747091570f0d2