diff --git a/data b/data index 5d8ee283..9b6c72f8 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 5d8ee283b7dc34c433d8509c3cb85ca5e8cf0fbf +Subproject commit 9b6c72f847193bc29d3ff183b206f26a9b5c007e diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index aed73a47..b3d73964 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -278,11 +278,11 @@ set(JSON_FILES res/config/radar_sites.json) set(TS_FILES ts/scwx_en_US.ts) -set(COUNTY_DBF_FILES ${SCWX_DIR}/data/db/c_08mr23.dbf) -set(ZONE_DBF_FILES ${SCWX_DIR}/data/db/fz08mr23.dbf - ${SCWX_DIR}/data/db/mz08mr23.dbf +set(COUNTY_DBF_FILES ${SCWX_DIR}/data/db/c_19se23.dbf) +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_08mr23.dbf) + ${SCWX_DIR}/data/db/z_19se23.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) diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 2db1f2b0..4fff5ca0 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -179,6 +179,8 @@ public: std::vector maps_; std::vector elevationCuts_; + std::chrono::system_clock::time_point volumeTime_ {}; + bool elevationButtonsChanged_; bool resizeElevationButtons_; @@ -832,6 +834,7 @@ void MainWindowImpl::ConnectAnimationSignals() { for (auto map : maps_) { + volumeTime_ = dateTime; map->SelectTime(dateTime); } }); @@ -1021,8 +1024,7 @@ void MainWindowImpl::SelectRadarProduct(map::MapWidget* mapWidget, UpdateRadarProductSettings(); } - mapWidget->SelectRadarProduct( - group, productName, productCode, mapWidget->GetSelectedTime()); + mapWidget->SelectRadarProduct(group, productName, productCode, volumeTime_); } void MainWindowImpl::SetActiveMap(map::MapWidget* mapWidget) diff --git a/wxdata/source/scwx/common/products.cpp b/wxdata/source/scwx/common/products.cpp index 391754ea..7e47712f 100644 --- a/wxdata/source/scwx/common/products.cpp +++ b/wxdata/source/scwx/common/products.cpp @@ -43,6 +43,7 @@ static const std::unordered_map level2Palette_ { {Level2Product::Unknown, "???"}}; static const std::unordered_map level3ProductCodeMap_ { + {37, "NCR"}, {56, "SRM"}, {94, "DR"}, {99, "DV"}, @@ -62,6 +63,7 @@ static const std::unordered_map {"DV", "Digital Velocity"}, {"SDR", "Super-Resolution Reflectivity"}, {"SDV", "Super-Resolution Velocity"}, + {"NCR", "Composite Reflectivity"}, {"DZD", "Digital Differential Reflectivity"}, {"DCC", "Digital Correlation Coefficient"}, {"DKD", "Digital Specific Differential Phase"}, @@ -76,8 +78,9 @@ static const std::unordered_map> level3AwipsProducts_ { // Reflectivity {"SDR", {"NXB", "NYB", "NZB", "N0B", "NAB", "N1B", "NBB", "N2B", "N3B"}}, - {"DR", {"NXQ", "NY", "NZQ", "N0Q", "NAQ", "N1Q", "NBQ", "N2Q", "N3Q"}}, + {"DR", {"NXQ", "NYQ", "NZQ", "N0Q", "NAQ", "N1Q", "NBQ", "N2Q", "N3Q"}}, {"TDR", {"TZ0", "TZ1", "TZ2"}}, + {"NCR", {"NCR"}}, // Velocity {"SDV", {"NXG", "NYG", "NZG", "N0G", "NAG", "N1G"}}, @@ -135,7 +138,7 @@ static const std::unordered_map static const std::unordered_map> level3CategoryProductList_ { - {Level3ProductCategory::Reflectivity, {"SDR", "DR", "TDR"}}, + {Level3ProductCategory::Reflectivity, {"SDR", "DR", "TDR", "NCR"}}, {Level3ProductCategory::Velocity, {"SDV", "DV", "TDV"}}, {Level3ProductCategory::StormRelativeVelocity, {"SRM"}}, {Level3ProductCategory::SpectrumWidth, {"SW"}},