Merge pull request #38 from dpaulat/feature/qt6.5

Feature/qt6.5

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ concurrency:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: win64_msvc2022
@@ -26,9 +27,9 @@ jobs:
             env_cxx: ''
             compiler: msvc
             msvc_arch: x64
-            msvc_toolset: 14.34
+            msvc_toolset: 14.35
             msvc_version: 2022
-            qt_version: 6.4.2
+            qt_version: 6.5.0
             qt_arch: win64_msvc2019_64
             qt_tools: ''
             conan_arch: x86_64
@@ -43,7 +44,7 @@ jobs:
             env_cc: gcc-11
             env_cxx: g++-11
             compiler: gcc
-            qt_version: 6.4.2
+            qt_version: 6.5.0
             qt_arch: gcc_64
             qt_tools: ''
             conan_arch: x86_64

conanfile.txt

@@ -8,7 +8,7 @@ glm/cci.20220420
 gtest/cci.20210126
 libcurl/7.86.0
 libxml2/2.10.3
-openssl/1.1.1t
+openssl/3.1.0
 spdlog/1.11.0
 sqlite3/3.40.1
 vulkan-loader/1.3.236.0
@@ -21,6 +21,7 @@ cmake_paths
 
 [options]
 libiconv:shared=True
+openssl:no_module=True
 openssl:shared=True
 
 [imports]

scwx-qt/scwx-qt.cmake

@@ -384,6 +384,10 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
 target_link_libraries(supercell-wx PRIVATE scwx-qt
                                            wxdata)
 
+# Set DT_RUNPATH for Linux targets
+set_target_properties(qmaplibregl  PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+
 install(TARGETS supercell-wx
                 qmaplibregl
         RUNTIME_DEPENDENCIES
@@ -396,12 +400,16 @@ install(TARGETS supercell-wx
           COMPONENT supercell-wx
           OPTIONAL)
 
+# NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1)
+# https://bugreports.qt.io/browse/QTBUG-112204
 qt_generate_deploy_app_script(TARGET qmaplibregl
-                              FILENAME_VARIABLE deploy_script_qmaplibregl
+                              OUTPUT_SCRIPT deploy_script_qmaplibregl
+                              NO_TRANSLATIONS
                               NO_UNSUPPORTED_PLATFORM_ERROR)
 
 qt_generate_deploy_app_script(TARGET supercell-wx
-                              FILENAME_VARIABLE deploy_script_scwx
+                              OUTPUT_SCRIPT deploy_script_scwx
+                              NO_TRANSLATIONS
                               NO_UNSUPPORTED_PLATFORM_ERROR)
 
 install(SCRIPT ${deploy_script_qmaplibregl}

scwx-qt/ts/scwx_en_US.ts

@@ -2,11 +2,142 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US" sourcelanguage="en_US">
 <context>
-    <name>MainWindow</name>
+    <name>AboutDialog</name>
     <message>
-        <source>Toolbox</source>
+        <source>About Supercell Wx</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Supercell Wx</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version X.Y.Z</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Git Revision 0000000000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copyright © 2021-YYYY Dan Paulat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AlertDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source># of #</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AlertDockWidget</name>
+    <message>
+        <source>Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Active Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AlertModel</name>
+    <message>
+        <source>ETN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phenomenon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Significance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Counties / Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImGuiDebugDialog</name>
+    <message>
+        <source>ImGui Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
@@ -60,11 +191,199 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Open...</source>
+        <source>&amp;Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+O</source>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radar Toolbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resource Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expand All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collapse All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Resource Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;NEXRAD Product...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text &amp;Event Product...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;ImGui Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;User Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;GitHub Repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dump Radar &amp;Product Records</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Product</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 of %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phenomenon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RadarSiteDialog</name>
+    <message>
+        <source>Select Radar Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RadarSiteModel</name>
+    <message>
+        <source>Site ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Place</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palettes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Radar Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Grid Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mapbox API Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Grid Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color Tables</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -74,6 +393,33 @@
         <source>Unrecognized NEXRAD Product:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Radar &amp;Toolbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Resource Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>scwx::qt::ui::AboutDialog</name>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Git Revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copyright © 2021-%1 Dan Paulat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>scwx::qt::ui::Level2SettingsWidgetImpl</name>
@@ -90,4 +436,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>scwx::qt::ui::Level3ProductsWidgetImpl</name>
+    <message>
+        <source>Tilt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

setup-debug.bat

@@ -1,5 +1,5 @@
 call tools\setup-common.bat
 mkdir build-debug
 cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
 pause

setup-debug.sh

@@ -2,4 +2,4 @@
 ./tools/setup-common.sh
 mkdir -p build-debug
 cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..

setup-release.bat

@@ -1,5 +1,5 @@
 call tools\setup-common.bat
 mkdir build-release
 cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
 pause

setup-release.sh

@@ -2,4 +2,4 @@
 ./tools/setup-common.sh
 mkdir -p build-release
 cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..

test/source/scwx/provider/aws_level2_data_provider.test.cpp

@@ -48,7 +48,7 @@ TEST(AwsLevel2DataProvider, Prune)
 {
    using namespace std::chrono;
 
-   AwsLevel2DataProvider provider("KLSX");
+   AwsLevel2DataProvider provider("KEAX");
 
    const auto today     = floor<days>(system_clock::now());
    const auto yesterday = today - days {1};