From 6f1fb843973704347c93f7fae0358489aa765225 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 26 May 2023 10:45:55 -0500 Subject: [PATCH] Update timeline radar site selection logic --- scwx-qt/source/scwx/qt/main/main_window.cpp | 17 ++++------------- .../source/scwx/qt/manager/timeline_manager.cpp | 2 ++ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 31d0d537..1791e15e 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -705,19 +705,6 @@ void MainWindowImpl::ConnectAnimationSignals() map->SelectTime(dateTime); } }); - - for (auto map : maps_) - { - connect(map, - &map::MapWidget::RadarSiteUpdated, - [this, map](std::shared_ptr radarSite) - { - if (map == activeMap_) - { - timelineManager_->SetRadarSite(radarSite->id()); - } - }); - } } void MainWindowImpl::ConnectOtherSignals() @@ -927,11 +914,15 @@ void MainWindowImpl::UpdateRadarSite() mainWindow_->ui->radarSiteValueLabel->setText(radarSite->id().c_str()); mainWindow_->ui->radarLocationLabel->setText( radarSite->location_name().c_str()); + + timelineManager_->SetRadarSite(radarSite->id()); } else { mainWindow_->ui->radarSiteValueLabel->setVisible(false); mainWindow_->ui->radarLocationLabel->setVisible(false); + + timelineManager_->SetRadarSite("?"); } } diff --git a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp index b4fee799..7269aee1 100644 --- a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp @@ -51,6 +51,8 @@ TimelineManager::~TimelineManager() = default; void TimelineManager::SetRadarSite(const std::string& radarSite) { + logger_->debug("SetRadarSite: {}", radarSite); + p->radarSite_ = radarSite; if (p->viewType_ == types::MapTime::Live)