diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5794c2f..34347be2 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/conanfile.txt b/conanfile.txt
index 4228790c..95e79404 100644
--- a/conanfile.txt
+++ b/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]
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 03766a2c..641f9abb 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/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}
diff --git a/scwx-qt/ts/scwx_en_US.ts b/scwx-qt/ts/scwx_en_US.ts
index 202bf24b..98d6b783 100644
--- a/scwx-qt/ts/scwx_en_US.ts
+++ b/scwx-qt/ts/scwx_en_US.ts
@@ -2,11 +2,142 @@
- MainWindow
+ AboutDialog
- Toolbox
+ About Supercell Wx
+
+ Supercell Wx
+
+
+
+ Version X.Y.Z
+
+
+
+ Git Revision 0000000000
+
+
+
+ Copyright © 2021-YYYY Dan Paulat
+
+
+
+
+ AlertDialog
+
+ Dialog
+
+
+
+ First
+
+
+
+ ...
+
+
+
+ Previous
+
+
+
+ Next
+
+
+
+ Last
+
+
+
+ # of #
+
+
+
+
+ AlertDockWidget
+
+ Alerts
+
+
+
+ Filter
+
+
+
+ Settings
+
+
+
+ ...
+
+
+
+ &View
+
+
+
+ &Go
+
+
+
+ &Active Alerts
+
+
+
+
+ AlertModel
+
+ ETN
+
+
+
+ Office ID
+
+
+
+ Phenomenon
+
+
+
+ Significance
+
+
+
+ State
+
+
+
+ Counties / Areas
+
+
+
+ Start Time
+
+
+
+ End Time
+
+
+
+ Distance
+
+
+
+
+ ImGuiDebugDialog
+
+ ImGui Debug
+
+
+
+ Context
+
+
+
+
+ MainWindow
...
@@ -60,11 +191,199 @@
- &Open...
+ &Open
- Ctrl+O
+ &View
+
+
+
+ &Debug
+
+
+
+ Radar Toolbox
+
+
+
+ Resource Explorer
+
+
+
+ Expand All
+
+
+
+ Collapse All
+
+
+
+ &Resource Explorer
+
+
+
+ &NEXRAD Product...
+
+
+
+ Text &Event Product...
+
+
+
+ &Alerts
+
+
+
+ &ImGui Debug
+
+
+
+ &Settings
+
+
+
+ &User Manual
+
+
+
+ &Discord
+
+
+
+ &GitHub Repository
+
+
+
+ Dump Radar &Product Records
+
+
+
+
+ QObject
+
+ Product
+
+
+
+ %1 of %2
+
+
+
+ ...
+
+
+
+ Phenomenon
+
+
+
+ Active
+
+
+
+ Inactive
+
+
+
+
+ RadarSiteDialog
+
+ Select Radar Site
+
+
+
+ Filter
+
+
+
+
+ RadarSiteModel
+
+ Site ID
+
+
+
+ Place
+
+
+
+ State
+
+
+
+ Country
+
+
+
+ Latitude
+
+
+
+ Longitude
+
+
+
+ Type
+
+
+
+ Distance
+
+
+
+
+ SettingsDialog
+
+ Settings
+
+
+
+ General
+
+
+
+ Palettes
+
+
+
+ Default Radar Site
+
+
+
+ Grid Height
+
+
+
+ ...
+
+
+
+ Mapbox API Key
+
+
+
+ Font Sizes
+
+
+
+ Grid Width
+
+
+
+ Debug Enabled
+
+
+
+ Color Tables
+
+
+
+ Alerts
+
+
+
+ Reset
@@ -74,6 +393,33 @@
Unrecognized NEXRAD Product:
+
+ Radar &Toolbox
+
+
+
+ &Resource Explorer
+
+
+
+ &Alerts
+
+
+
+
+ scwx::qt::ui::AboutDialog
+
+ Version %1
+
+
+
+ Git Revision <a href="%1">%2</a>
+
+
+
+ Copyright © 2021-%1 Dan Paulat
+
+
scwx::qt::ui::Level2SettingsWidgetImpl
@@ -90,4 +436,11 @@
+
+ scwx::qt::ui::Level3ProductsWidgetImpl
+
+ Tilt %1
+
+
+
diff --git a/setup-debug.bat b/setup-debug.bat
index 2ed9af1a..dcc3f2ba 100644
--- a/setup-debug.bat
+++ b/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
diff --git a/setup-debug.sh b/setup-debug.sh
index 1f6552c8..bf55697e 100755
--- a/setup-debug.sh
+++ b/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 ..
diff --git a/setup-release.bat b/setup-release.bat
index eca4e02a..da10db7c 100644
--- a/setup-release.bat
+++ b/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
diff --git a/setup-release.sh b/setup-release.sh
index 6d8dedae..04c7c2d9 100755
--- a/setup-release.sh
+++ b/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 ..
diff --git a/test/source/scwx/provider/aws_level2_data_provider.test.cpp b/test/source/scwx/provider/aws_level2_data_provider.test.cpp
index 4f6bb9dd..66c3dbef 100644
--- a/test/source/scwx/provider/aws_level2_data_provider.test.cpp
+++ b/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(system_clock::now());
const auto yesterday = today - days {1};