blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 19:00:04 +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

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(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)

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

@ -179,6 +179,8 @@ public:
std::vector<map::MapWidget*> maps_;
std::vector<float> 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)