blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 13:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/placefiles

Browse source
This commit is contained in:
Dan Paulat 2023-09-20 23:55:00 -05:00
commit b381ed3a33
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 5d8ee283b7dc34c433d8509c3cb85ca5e8cf0fbf Subproject commit 9b6c72f847193bc29d3ff183b206f26a9b5c007e

8
scwx-qt/scwx-qt.cmake
View file

@ -278,11 +278,11 @@ set(JSON_FILES res/config/radar_sites.json)
set(TS_FILES ts/scwx_en_US.ts) set(TS_FILES ts/scwx_en_US.ts)
set(COUNTY_DBF_FILES ${SCWX_DIR}/data/db/c_08mr23.dbf) set(COUNTY_DBF_FILES ${SCWX_DIR}/data/db/c_19se23.dbf)
set(ZONE_DBF_FILES ${SCWX_DIR}/data/db/fz08mr23.dbf set(ZONE_DBF_FILES ${SCWX_DIR}/data/db/fz19se23.dbf
${SCWX_DIR}/data/db/mz08mr23.dbf ${SCWX_DIR}/data/db/mz19se23.dbf
${SCWX_DIR}/data/db/oz08mr23.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(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) set(VERSIONS_INPUT ${scwx-qt_SOURCE_DIR}/source/scwx/qt/main/versions.hpp.in)

6
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -179,6 +179,8 @@ public:
std::vector<map::MapWidget*> maps_; std::vector<map::MapWidget*> maps_;
std::vector<float> elevationCuts_; std::vector<float> elevationCuts_;
std::chrono::system_clock::time_point volumeTime_ {};
bool elevationButtonsChanged_; bool elevationButtonsChanged_;
bool resizeElevationButtons_; bool resizeElevationButtons_;
@ -832,6 +834,7 @@ void MainWindowImpl::ConnectAnimationSignals()
{ {
for (auto map : maps_) for (auto map : maps_)
{ {
volumeTime_ = dateTime;
map->SelectTime(dateTime); map->SelectTime(dateTime);
} }
}); });
@ -1021,8 +1024,7 @@ void MainWindowImpl::SelectRadarProduct(map::MapWidget* mapWidget,
UpdateRadarProductSettings(); UpdateRadarProductSettings();
} }
mapWidget->SelectRadarProduct( mapWidget->SelectRadarProduct(group, productName, productCode, volumeTime_);
group, productName, productCode, mapWidget->GetSelectedTime());
} }
void MainWindowImpl::SetActiveMap(map::MapWidget* mapWidget) void MainWindowImpl::SetActiveMap(map::MapWidget* mapWidget)

7
wxdata/source/scwx/common/products.cpp
View file

@ -43,6 +43,7 @@ static const std::unordered_map<Level2Product, std::string> level2Palette_ {
{Level2Product::Unknown, "???"}}; {Level2Product::Unknown, "???"}};
static const std::unordered_map<int, std::string> level3ProductCodeMap_ { static const std::unordered_map<int, std::string> level3ProductCodeMap_ {
{37, "NCR"},
{56, "SRM"}, {56, "SRM"},
{94, "DR"}, {94, "DR"},
{99, "DV"}, {99, "DV"},
@ -62,6 +63,7 @@ static const std::unordered_map<std::string, std::string>
{"DV", "Digital Velocity"}, {"DV", "Digital Velocity"},
{"SDR", "Super-Resolution Reflectivity"}, {"SDR", "Super-Resolution Reflectivity"},
{"SDV", "Super-Resolution Velocity"}, {"SDV", "Super-Resolution Velocity"},
{"NCR", "Composite Reflectivity"},
{"DZD", "Digital Differential Reflectivity"}, {"DZD", "Digital Differential Reflectivity"},
{"DCC", "Digital Correlation Coefficient"}, {"DCC", "Digital Correlation Coefficient"},
{"DKD", "Digital Specific Differential Phase"}, {"DKD", "Digital Specific Differential Phase"},
@ -76,8 +78,9 @@ static const std::unordered_map<std::string, std::vector<std::string>>
level3AwipsProducts_ { level3AwipsProducts_ {
// Reflectivity // Reflectivity
{"SDR", {"NXB", "NYB", "NZB", "N0B", "NAB", "N1B", "NBB", "N2B", "N3B"}}, {"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"}}, {"TDR", {"TZ0", "TZ1", "TZ2"}},
{"NCR", {"NCR"}},
// Velocity // Velocity
{"SDV", {"NXG", "NYG", "NZG", "N0G", "NAG", "N1G"}}, {"SDV", {"NXG", "NYG", "NZG", "N0G", "NAG", "N1G"}},
@ -135,7 +138,7 @@ static const std::unordered_map<Level3ProductCategory, std::string>
static const std::unordered_map<Level3ProductCategory, std::vector<std::string>> static const std::unordered_map<Level3ProductCategory, std::vector<std::string>>
level3CategoryProductList_ { level3CategoryProductList_ {
{Level3ProductCategory::Reflectivity, {"SDR", "DR", "TDR"}}, {Level3ProductCategory::Reflectivity, {"SDR", "DR", "TDR", "NCR"}},
{Level3ProductCategory::Velocity, {"SDV", "DV", "TDV"}}, {Level3ProductCategory::Velocity, {"SDV", "DV", "TDV"}},
{Level3ProductCategory::StormRelativeVelocity, {"SRM"}}, {Level3ProductCategory::StormRelativeVelocity, {"SRM"}},
{Level3ProductCategory::SpectrumWidth, {"SW"}}, {Level3ProductCategory::SpectrumWidth, {"SW"}},