Merge pull request #103 from dpaulat/feature/alert-tones

Alert Tones
dpaulat · Dec 8, 2023 · 7b3d78e · 7b3d78e
2 parents 1633c46 + 2f62319
commit 7b3d78e
Show file tree

Hide file tree

Showing 47 changed files with 2,238 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
             msvc_version: 2022
             qt_version: 6.6.1
             qt_arch: win64_msvc2019_64
-            qt_modules: qtimageformats qtpositioning
+            qt_modules: qtimageformats qtmultimedia qtpositioning
             qt_tools: ''
             conan_arch: x86_64
             conan_compiler: Visual Studio
@@ -46,7 +46,7 @@ jobs:
             compiler: gcc
             qt_version: 6.6.1
             qt_arch: gcc_64
-            qt_modules: qtimageformats qtpositioning
+            qt_modules: qtimageformats qtmultimedia qtpositioning
             qt_tools: ''
             conan_arch: x86_64
             conan_compiler: gcc

diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
@@ -22,6 +22,7 @@ Supercell Wx uses code from the following dependencies:
 | [FreeType](https://freetype.org/) | [Freetype Project License](https://spdx.org/licenses/FTL.html) |
 | [FreeType GL](https://github.com/rougier/freetype-gl) | [BSD 2-Clause with views sentence](https://spdx.org/licenses/BSD-2-Clause-Views.html) |
 | [GeographicLib](https://geographiclib.sourceforge.io/) | [MIT License](https://spdx.org/licenses/MIT.html) |
+| [geos](https://libgeos.org/) | [GNU Lesser General Public License v2.1 or later](https://spdx.org/licenses/LGPL-2.1-or-later.html) |
 | [GLEW](https://www.opengl.org/sdk/libs/GLEW/) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [GLM](https://github.com/g-truc/glm) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [GoogleTest](https://google.github.io/googletest/) | [BSD 3-Clause "New" or "Revised" License](https://spdx.org/licenses/BSD-3-Clause.html) |
@@ -33,7 +34,7 @@ Supercell Wx uses code from the following dependencies:
 | [MapLibre Native](https://maplibre.org/projects/maplibre-native/) | [BSD 2-Clause "Simplified" License](https://spdx.org/licenses/BSD-2-Clause.html) |
 | [nunicode](https://bitbucket.org/alekseyt/nunicode/src/master/) | [MIT License](https://spdx.org/licenses/MIT.html) | Modified for MapLibre Native |
 | [OpenSSL](https://www.openssl.org/) | [OpenSSL License](https://spdx.org/licenses/OpenSSL.html) |
-| [Qt](https://www.qt.io/) | [GNU Lesser General Public License v3.0 only](https://spdx.org/licenses/LGPL-3.0-only.html) | Qt Core, Qt GUI, Qt Network, Qt OpenGL, Qt SQL, Qt SVG, Qt Widgets<br/>Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html |
+| [Qt](https://www.qt.io/) | [GNU Lesser General Public License v3.0 only](https://spdx.org/licenses/LGPL-3.0-only.html) | Qt Core, Qt GUI, Qt Multimedia, Qt Network, Qt OpenGL, Qt Positioning, Qt SQL, Qt SVG, Qt Widgets<br/>Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html |
 | [spdlog](https://github.com/gabime/spdlog) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [SQLite](https://www.sqlite.org/) | Public Domain |
 | [stb](https://github.com/nothings/stb) | Public Domain |
@@ -59,6 +60,7 @@ Supercell Wx uses assets from the following sources:
 | Source | License | Notes |
 | ------ | ------- | ----- |
 | Alte DIN 1451 Mittelschrift | SIL Open Font License |
+| [EAS Attention Signal](https://en.wikipedia.org/wiki/File:Emergency_Alert_System_Attention_Signal_20s.ogg) | Public Domain |
 | [Font Awesome Free](https://fontawesome.com/) | CC BY 4.0 License |
 | [Inconsolata](https://fonts.google.com/specimen/Inconsolata) | SIL Open Font License |
 | [NOAA's Weather and Climate Toolkit](https://www.ncdc.noaa.gov/wct/) | Public Domain | Default Color Tables |

diff --git a/conanfile.py b/conanfile.py
@@ -6,6 +6,7 @@ class SupercellWxConan(ConanFile):
                   "cpr/1.10.5",
                   "fontconfig/2.14.2",
                   "geographiclib/2.3",
+                  "geos/3.12.0",
                   "glew/2.2.0",
                   "glm/cci.20230113",
                   "gtest/1.14.0",
@@ -19,7 +20,8 @@ class SupercellWxConan(ConanFile):
     generators = ("cmake",
                   "cmake_find_package",
                   "cmake_paths")
-    default_options = {"libiconv:shared"  : True,
+    default_options = {"geos:shared"      : True,
+                       "libiconv:shared"  : True,
                        "openssl:no_module": True,
                        "openssl:shared"   : True}
 

diff --git a/data b/data
diff --git a/scwx-qt/res/audio/wikimedia/Emergency_Alert_System_Attention_Signal_20s.ogg b/scwx-qt/res/audio/wikimedia/Emergency_Alert_System_Attention_Signal_20s.ogg
diff --git a/scwx-qt/res/icons/font-awesome-6/stop-solid.svg b/scwx-qt/res/icons/font-awesome-6/stop-solid.svg
diff --git a/scwx-qt/res/icons/font-awesome-6/volume-high-solid.svg b/scwx-qt/res/icons/font-awesome-6/volume-high-solid.svg
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
@@ -14,6 +14,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(Boost)
 find_package(Fontconfig)
 find_package(geographiclib)
+find_package(geos)
 find_package(GLEW)
 find_package(glm)
 find_package(Python COMPONENTS Interpreter)
@@ -22,6 +23,7 @@ find_package(SQLite3)
 find_package(QT NAMES Qt6
              COMPONENTS Gui
                         LinguistTools
+                        Multimedia
                         Network
                         OpenGL
                         OpenGLWidgets
@@ -31,6 +33,7 @@ find_package(QT NAMES Qt6
 find_package(Qt${QT_VERSION_MAJOR}
              COMPONENTS Gui
                         LinguistTools
+                        Multimedia
                         Network
                         OpenGL
                         OpenGLWidgets
@@ -76,7 +79,9 @@ set(SRC_GL_DRAW source/scwx/qt/gl/draw/draw_item.cpp
                 source/scwx/qt/gl/draw/placefile_text.cpp
                 source/scwx/qt/gl/draw/placefile_triangles.cpp
                 source/scwx/qt/gl/draw/rectangle.cpp)
-set(HDR_MANAGER source/scwx/qt/manager/font_manager.hpp
+set(HDR_MANAGER source/scwx/qt/manager/alert_manager.hpp
+                source/scwx/qt/manager/font_manager.hpp
+                source/scwx/qt/manager/media_manager.hpp
                 source/scwx/qt/manager/placefile_manager.hpp
                 source/scwx/qt/manager/position_manager.hpp
                 source/scwx/qt/manager/radar_product_manager.hpp
@@ -86,7 +91,9 @@ set(HDR_MANAGER source/scwx/qt/manager/font_manager.hpp
                 source/scwx/qt/manager/text_event_manager.hpp
                 source/scwx/qt/manager/timeline_manager.hpp
                 source/scwx/qt/manager/update_manager.hpp)
-set(SRC_MANAGER source/scwx/qt/manager/font_manager.cpp
+set(SRC_MANAGER source/scwx/qt/manager/alert_manager.cpp
+                source/scwx/qt/manager/font_manager.cpp
+                source/scwx/qt/manager/media_manager.cpp
                 source/scwx/qt/manager/placefile_manager.cpp
                 source/scwx/qt/manager/position_manager.cpp
                 source/scwx/qt/manager/radar_product_manager.cpp
@@ -141,18 +148,21 @@ set(SRC_MODEL source/scwx/qt/model/alert_model.cpp
               source/scwx/qt/model/tree_model.cpp)
 set(HDR_REQUEST source/scwx/qt/request/nexrad_file_request.hpp)
 set(SRC_REQUEST source/scwx/qt/request/nexrad_file_request.cpp)
-set(HDR_SETTINGS source/scwx/qt/settings/general_settings.hpp
+set(HDR_SETTINGS source/scwx/qt/settings/audio_settings.hpp
+                 source/scwx/qt/settings/general_settings.hpp
                  source/scwx/qt/settings/map_settings.hpp
                  source/scwx/qt/settings/palette_settings.hpp
                  source/scwx/qt/settings/settings_category.hpp
                  source/scwx/qt/settings/settings_container.hpp
+                 source/scwx/qt/settings/settings_definitions.hpp
                  source/scwx/qt/settings/settings_interface.hpp
                  source/scwx/qt/settings/settings_interface_base.hpp
                  source/scwx/qt/settings/settings_variable.hpp
                  source/scwx/qt/settings/settings_variable_base.hpp
                  source/scwx/qt/settings/text_settings.hpp
                  source/scwx/qt/settings/ui_settings.hpp)
-set(SRC_SETTINGS source/scwx/qt/settings/general_settings.cpp
+set(SRC_SETTINGS source/scwx/qt/settings/audio_settings.cpp
+                 source/scwx/qt/settings/general_settings.cpp
                  source/scwx/qt/settings/map_settings.cpp
                  source/scwx/qt/settings/palette_settings.cpp
                  source/scwx/qt/settings/settings_category.cpp
@@ -168,7 +178,9 @@ set(HDR_TYPES source/scwx/qt/types/alert_types.hpp
               source/scwx/qt/types/github_types.hpp
               source/scwx/qt/types/imgui_font.hpp
               source/scwx/qt/types/layer_types.hpp
+              source/scwx/qt/types/location_types.hpp
               source/scwx/qt/types/map_types.hpp
+              source/scwx/qt/types/media_types.hpp
               source/scwx/qt/types/qt_types.hpp
               source/scwx/qt/types/radar_product_record.hpp
               source/scwx/qt/types/text_event_key.hpp
@@ -178,7 +190,9 @@ set(SRC_TYPES source/scwx/qt/types/alert_types.cpp
               source/scwx/qt/types/github_types.cpp
               source/scwx/qt/types/imgui_font.cpp
               source/scwx/qt/types/layer_types.cpp
+              source/scwx/qt/types/location_types.cpp
               source/scwx/qt/types/map_types.cpp
+              source/scwx/qt/types/media_types.cpp
               source/scwx/qt/types/qt_types.cpp
               source/scwx/qt/types/radar_product_record.cpp
               source/scwx/qt/types/text_event_key.cpp
@@ -189,6 +203,7 @@ set(HDR_UI source/scwx/qt/ui/about_dialog.hpp
            source/scwx/qt/ui/alert_dock_widget.hpp
            source/scwx/qt/ui/animation_dock_widget.hpp
            source/scwx/qt/ui/collapsible_group.hpp
+           source/scwx/qt/ui/county_dialog.hpp
            source/scwx/qt/ui/flow_layout.hpp
            source/scwx/qt/ui/imgui_debug_dialog.hpp
            source/scwx/qt/ui/imgui_debug_widget.hpp
@@ -208,6 +223,7 @@ set(SRC_UI source/scwx/qt/ui/about_dialog.cpp
            source/scwx/qt/ui/alert_dock_widget.cpp
            source/scwx/qt/ui/animation_dock_widget.cpp
            source/scwx/qt/ui/collapsible_group.cpp
+           source/scwx/qt/ui/county_dialog.cpp
            source/scwx/qt/ui/flow_layout.cpp
            source/scwx/qt/ui/imgui_debug_dialog.cpp
            source/scwx/qt/ui/imgui_debug_widget.cpp
@@ -227,6 +243,7 @@ set(UI_UI  source/scwx/qt/ui/about_dialog.ui
            source/scwx/qt/ui/alert_dock_widget.ui
            source/scwx/qt/ui/animation_dock_widget.ui
            source/scwx/qt/ui/collapsible_group.ui
+           source/scwx/qt/ui/county_dialog.ui
            source/scwx/qt/ui/imgui_debug_dialog.ui
            source/scwx/qt/ui/layer_dialog.ui
            source/scwx/qt/ui/open_url_dialog.ui
@@ -235,12 +252,14 @@ set(UI_UI  source/scwx/qt/ui/about_dialog.ui
            source/scwx/qt/ui/radar_site_dialog.ui
            source/scwx/qt/ui/settings_dialog.ui
            source/scwx/qt/ui/update_dialog.ui)
-set(HDR_UI_SETUP source/scwx/qt/ui/setup/finish_page.hpp
+set(HDR_UI_SETUP source/scwx/qt/ui/setup/audio_codec_page.hpp
+                 source/scwx/qt/ui/setup/finish_page.hpp
                  source/scwx/qt/ui/setup/map_layout_page.hpp
                  source/scwx/qt/ui/setup/map_provider_page.hpp
                  source/scwx/qt/ui/setup/setup_wizard.hpp
                  source/scwx/qt/ui/setup/welcome_page.hpp)
-set(SRC_UI_SETUP source/scwx/qt/ui/setup/finish_page.cpp
+set(SRC_UI_SETUP source/scwx/qt/ui/setup/audio_codec_page.cpp
+                 source/scwx/qt/ui/setup/finish_page.cpp
                  source/scwx/qt/ui/setup/map_layout_page.cpp
                  source/scwx/qt/ui/setup/map_provider_page.cpp
                  source/scwx/qt/ui/setup/setup_wizard.cpp
@@ -309,6 +328,7 @@ set(ZONE_DBF_FILES   ${SCWX_DIR}/data/db/fz19se23.dbf
                      ${SCWX_DIR}/data/db/mz19se23.dbf
                      ${SCWX_DIR}/data/db/oz08mr23.dbf
                      ${SCWX_DIR}/data/db/z_19se23.dbf)
+set(STATE_DBF_FILES  ${SCWX_DIR}/data/db/s_08mr23.dbf)
 set(COUNTIES_SQLITE_DB ${scwx-qt_BINARY_DIR}/res/db/counties.db)
 
 set(VERSIONS_INPUT  ${scwx-qt_SOURCE_DIR}/source/scwx/qt/main/versions.hpp.in)
@@ -397,8 +417,12 @@ add_custom_command(OUTPUT  ${COUNTIES_SQLITE_DB}
                            ${scwx-qt_SOURCE_DIR}/tools/generate_counties_db.py
                            -c ${COUNTY_DBF_FILES}
                            -z ${ZONE_DBF_FILES}
+                           -s ${STATE_DBF_FILES}
                            -o ${COUNTIES_SQLITE_DB}
-                   DEPENDS ${COUNTY_DB_FILES} ${ZONE_DBF_FILES})
+                   DEPENDS ${scwx-qt_SOURCE_DIR}/tools/generate_counties_db.py
+                           ${COUNTY_DB_FILES}
+                           ${STATE_DBF_FILES}
+                           ${ZONE_DBF_FILES})
 
 add_custom_target(scwx-qt_generate_counties_db ALL
                   DEPENDS ${COUNTIES_SQLITE_DB})
@@ -512,13 +536,16 @@ endif()
 
 target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                      Qt${QT_VERSION_MAJOR}::OpenGLWidgets
+                                     Qt${QT_VERSION_MAJOR}::Multimedia
                                      Qt${QT_VERSION_MAJOR}::Positioning
                                      Boost::json
                                      Boost::timer
                                      qmaplibregl
                                      $<$<CXX_COMPILER_ID:MSVC>:opengl32>
                                      Fontconfig::Fontconfig
                                      GeographicLib::GeographicLib
+                                     GEOS::geos
+                                     GEOS::geos_cxx_flags
                                      GLEW::GLEW
                                      glm::glm
                                      imgui

diff --git a/scwx-qt/scwx-qt.qrc b/scwx-qt/scwx-qt.qrc
@@ -12,6 +12,7 @@
         <file>gl/texture2d.frag</file>
         <file>gl/texture2d_array.frag</file>
         <file>gl/threshold.geom</file>
+        <file>res/audio/wikimedia/Emergency_Alert_System_Attention_Signal_20s.ogg</file>
         <file>res/config/radar_sites.json</file>
         <file>res/fonts/din1451alt.ttf</file>
         <file>res/fonts/din1451alt_g.ttf</file>
@@ -43,6 +44,8 @@
         <file>res/icons/font-awesome-6/square-caret-right-regular.svg</file>
         <file>res/icons/font-awesome-6/square-minus-regular.svg</file>
         <file>res/icons/font-awesome-6/square-plus-regular.svg</file>
+        <file>res/icons/font-awesome-6/stop-solid.svg</file>
+        <file>res/icons/font-awesome-6/volume-high-solid.svg</file>
         <file>res/palettes/wct/CC.pal</file>
         <file>res/palettes/wct/Default16.pal</file>
         <file>res/palettes/wct/DOD_DSD.pal</file>