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

Don't update a radar product view when the timeline manager will issue a subsequent update

Browse source
This commit is contained in:
Dan Paulat 2023-06-19 22:58:08 -05:00
parent bce4c1bfb2
commit 16e3d1533f
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -793,6 +793,8 @@ void MainWindowImpl::ConnectOtherSignals()
{ {
map->SetMapLocation(latitude, longitude, true); map->SetMapLocation(latitude, longitude, true);
} }
UpdateRadarSite();
}, },
Qt::QueuedConnection); Qt::QueuedConnection);
connect(mainWindow_, connect(mainWindow_,
@ -810,6 +812,8 @@ void MainWindowImpl::ConnectOtherSignals()
{ {
map->SelectRadarSite(selectedRadarSite); map->SelectRadarSite(selectedRadarSite);
} }
UpdateRadarSite();
}); });
connect(updateManager_.get(), connect(updateManager_.get(),
&manager::UpdateManager::UpdateAvailable, &manager::UpdateManager::UpdateAvailable,

8
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -359,7 +359,8 @@ void MapWidget::SelectElevation(float elevation)
void MapWidget::SelectRadarProduct(common::RadarProductGroup group, void MapWidget::SelectRadarProduct(common::RadarProductGroup group,
const std::string& product, const std::string& product,
std::int16_t productCode, std::int16_t productCode,
std::chrono::system_clock::time_point time) std::chrono::system_clock::time_point time,
bool update)
{ {
bool radarProductViewCreated = false; bool radarProductViewCreated = false;
@ -420,7 +421,7 @@ void MapWidget::SelectRadarProduct(common::RadarProductGroup group,
common::GetLevel3Palette(productCode); common::GetLevel3Palette(productCode);
p->InitializeNewRadarProductView(palette); p->InitializeNewRadarProductView(palette);
} }
else else if (update)
{ {
radarProductView->Update(); radarProductView->Update();
} }
@ -487,7 +488,8 @@ void MapWidget::SelectRadarSite(std::shared_ptr<config::RadarSite> radarSite,
SelectRadarProduct(radarProductView->GetRadarProductGroup(), SelectRadarProduct(radarProductView->GetRadarProductGroup(),
radarProductView->GetRadarProductName(), radarProductView->GetRadarProductName(),
0, 0,
radarProductView->selected_time()); radarProductView->selected_time(),
false);
} }
AddLayers(); AddLayers();

6
scwx-qt/source/scwx/qt/map/map_widget.hpp
View file

@ -54,12 +54,14 @@ public:
* @param [in] group Radar product group * @param [in] group Radar product group
* @param [in] product Radar product name * @param [in] product Radar product name
* @param [in] productCode Radar product code (optional) * @param [in] productCode Radar product code (optional)
* @paran [in] time Product time. Default is the latest available. * @param [in] time Product time. Default is the latest available.
* @param [in] update Whether to update the radar product view on selection
*/ */
void SelectRadarProduct(common::RadarProductGroup group, void SelectRadarProduct(common::RadarProductGroup group,
const std::string& product, const std::string& product,
std::int16_t productCode = 0, std::int16_t productCode = 0,
std::chrono::system_clock::time_point time = {}); std::chrono::system_clock::time_point time = {},
bool update = true);
void SelectRadarProduct(std::shared_ptr<types::RadarProductRecord> record); void SelectRadarProduct(std::shared_ptr<types::RadarProductRecord> record);