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

Update timeline radar site selection logic

Browse source
This commit is contained in:
Dan Paulat 2023-05-26 10:45:55 -05:00
parent a41f4b802e
commit 6f1fb84397
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -705,19 +705,6 @@ void MainWindowImpl::ConnectAnimationSignals()
map->SelectTime(dateTime); map->SelectTime(dateTime);
} }
}); });
for (auto map : maps_)
{
connect(map,
&map::MapWidget::RadarSiteUpdated,
[this, map](std::shared_ptr<config::RadarSite> radarSite)
{
if (map == activeMap_)
{
timelineManager_->SetRadarSite(radarSite->id());
}
});
}
} }
void MainWindowImpl::ConnectOtherSignals() void MainWindowImpl::ConnectOtherSignals()
@ -927,11 +914,15 @@ void MainWindowImpl::UpdateRadarSite()
mainWindow_->ui->radarSiteValueLabel->setText(radarSite->id().c_str()); mainWindow_->ui->radarSiteValueLabel->setText(radarSite->id().c_str());
mainWindow_->ui->radarLocationLabel->setText( mainWindow_->ui->radarLocationLabel->setText(
radarSite->location_name().c_str()); radarSite->location_name().c_str());
timelineManager_->SetRadarSite(radarSite->id());
} }
else else
{ {
mainWindow_->ui->radarSiteValueLabel->setVisible(false); mainWindow_->ui->radarSiteValueLabel->setVisible(false);
mainWindow_->ui->radarLocationLabel->setVisible(false); mainWindow_->ui->radarLocationLabel->setVisible(false);
timelineManager_->SetRadarSite("?");
} }
} }

2
scwx-qt/source/scwx/qt/manager/timeline_manager.cpp
View file

@ -51,6 +51,8 @@ TimelineManager::~TimelineManager() = default;
void TimelineManager::SetRadarSite(const std::string& radarSite) void TimelineManager::SetRadarSite(const std::string& radarSite)
{ {
logger_->debug("SetRadarSite: {}", radarSite);
p->radarSite_ = radarSite; p->radarSite_ = radarSite;
if (p->viewType_ == types::MapTime::Live) if (p->viewType_ == types::MapTime::Live)