Add anti-aliasing to settings

dpaulat · Oct 10, 2023 · c5a5668 · c5a5668
1 parent 3a754c0
commit c5a5668
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 6 deletions.
diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -201,9 +201,12 @@ public slots:
 MapWidget::MapWidget(const QMapLibreGL::Settings& settings) :
     p(std::make_unique<MapWidgetImpl>(this, settings))
 {
-   QSurfaceFormat surfaceFormat = QSurfaceFormat::defaultFormat();
-   surfaceFormat.setSamples(4);
-   setFormat(surfaceFormat);
+   if (settings::GeneralSettings::Instance().anti_aliasing_enabled().GetValue())
+   {
+      QSurfaceFormat surfaceFormat = QSurfaceFormat::defaultFormat();
+      surfaceFormat.setSamples(4);
+      setFormat(surfaceFormat);
+   }
 
    setFocusPolicy(Qt::StrongFocus);
 

diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
@@ -29,6 +29,7 @@ class GeneralSettings::Impl
       boost::to_lower(defaultDefaultAlertActionValue);
       boost::to_lower(defaultMapProviderValue);
 
+      antiAliasingEnabled_.SetDefault(true);
       debugEnabled_.SetDefault(false);
       defaultAlertAction_.SetDefault(defaultDefaultAlertActionValue);
       defaultRadarSite_.SetDefault("KLSX");
@@ -104,6 +105,7 @@ class GeneralSettings::Impl
 
    ~Impl() {}
 
+   SettingsVariable<bool>        antiAliasingEnabled_ {"anti_aliasing_enabled"};
    SettingsVariable<bool>        debugEnabled_ {"debug_enabled"};
    SettingsVariable<std::string> defaultAlertAction_ {"default_alert_action"};
    SettingsVariable<std::string> defaultRadarSite_ {"default_radar_site"};
@@ -122,7 +124,8 @@ class GeneralSettings::Impl
 GeneralSettings::GeneralSettings() :
     SettingsCategory("general"), p(std::make_unique<Impl>())
 {
-   RegisterVariables({&p->debugEnabled_,
+   RegisterVariables({&p->antiAliasingEnabled_,
+                      &p->debugEnabled_,
                       &p->defaultAlertAction_,
                       &p->defaultRadarSite_,
                       &p->fontSizes_,
@@ -143,6 +146,11 @@ GeneralSettings::GeneralSettings(GeneralSettings&&) noexcept = default;
 GeneralSettings&
 GeneralSettings::operator=(GeneralSettings&&) noexcept = default;
 
+SettingsVariable<bool>& GeneralSettings::anti_aliasing_enabled() const
+{
+   return p->antiAliasingEnabled_;
+}
+
 SettingsVariable<bool>& GeneralSettings::debug_enabled() const
 {
    return p->debugEnabled_;
@@ -229,7 +237,8 @@ GeneralSettings& GeneralSettings::Instance()
 
 bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
 {
-   return (lhs.p->debugEnabled_ == rhs.p->debugEnabled_ &&
+   return (lhs.p->antiAliasingEnabled_ == rhs.p->antiAliasingEnabled_ &&
+           lhs.p->debugEnabled_ == rhs.p->debugEnabled_ &&
            lhs.p->defaultAlertAction_ == rhs.p->defaultAlertAction_ &&
            lhs.p->defaultRadarSite_ == rhs.p->defaultRadarSite_ &&
            lhs.p->fontSizes_ == rhs.p->fontSizes_ &&

diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.hpp b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
@@ -25,6 +25,7 @@ class GeneralSettings : public SettingsCategory
    GeneralSettings(GeneralSettings&&) noexcept;
    GeneralSettings& operator=(GeneralSettings&&) noexcept;
 
+   SettingsVariable<bool>&                       anti_aliasing_enabled() const;
    SettingsVariable<bool>&                       debug_enabled() const;
    SettingsVariable<std::string>&                default_alert_action() const;
    SettingsVariable<std::string>&                default_radar_site() const;

diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -99,6 +99,7 @@ class SettingsDialogImpl
           &mapboxApiKey_,
           &mapTilerApiKey_,
           &defaultAlertAction_,
+          &antiAliasingEnabled_,
           &updateNotificationsEnabled_,
           &debugEnabled_,
           &hoverTextWrap_,
@@ -176,6 +177,7 @@ class SettingsDialogImpl
    settings::SettingsInterface<std::string>  mapboxApiKey_ {};
    settings::SettingsInterface<std::string>  mapTilerApiKey_ {};
    settings::SettingsInterface<std::string>  defaultAlertAction_ {};
+   settings::SettingsInterface<bool>         antiAliasingEnabled_ {};
    settings::SettingsInterface<bool>         updateNotificationsEnabled_ {};
    settings::SettingsInterface<bool>         debugEnabled_ {};
 
@@ -511,6 +513,10 @@ void SettingsDialogImpl::SetupGeneralTab()
    defaultAlertAction_.SetEditWidget(self_->ui->defaultAlertActionComboBox);
    defaultAlertAction_.SetResetButton(self_->ui->resetDefaultAlertActionButton);
 
+   antiAliasingEnabled_.SetSettingsVariable(
+      generalSettings.anti_aliasing_enabled());
+   antiAliasingEnabled_.SetEditWidget(self_->ui->antiAliasingEnabledCheckBox);
+
    updateNotificationsEnabled_.SetSettingsVariable(
       generalSettings.update_notifications_enabled());
    updateNotificationsEnabled_.SetEditWidget(

diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
@@ -292,6 +292,13 @@
             </layout>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="antiAliasingEnabledCheckBox">
+            <property name="text">
+             <string>Anti-Aliasing Enabled</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QCheckBox" name="enableUpdateNotificationsCheckBox">
             <property name="text">

diff --git a/test/data b/test/data
+1 −0		json/settings/settings-bad-maps.json
+1 −0		json/settings/settings-bad-maximum.json
+1 −0		json/settings/settings-bad-minimum.json
+1 −0		json/settings/settings-bad-types.json
+1 −0		json/settings/settings-bad-types2.json
+1 −0		json/settings/settings-default.json
+1 −0		json/settings/settings-empty-arrays.json
+1 −0		json/settings/settings-keax.json
+1 −0		json/settings/settings-maps.json
+1 −0		json/settings/settings-maximum.json
+1 −0		json/settings/settings-minimum.json