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

Split volume time and selected time

Browse source 
- Volume time to be used for radar product view
- Selected time to be used for animated alerts
This commit is contained in:
Dan Paulat 2023-05-26 01:25:16 -05:00
parent ca88d60a5d
commit a41f4b802e
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -697,7 +697,7 @@ void MainWindowImpl::ConnectAnimationSignals()
&manager::TimelineManager::AnimationStepEnd); &manager::TimelineManager::AnimationStepEnd);
connect(timelineManager_.get(), connect(timelineManager_.get(),
&manager::TimelineManager::TimeUpdated, &manager::TimelineManager::VolumeTimeUpdated,
[this](std::chrono::system_clock::time_point dateTime) [this](std::chrono::system_clock::time_point dateTime)
{ {
for (auto map : maps_) for (auto map : maps_)

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

@ -159,7 +159,8 @@ void TimelineManager::Impl::SelectTime(
logger_->debug("Time updated: Live"); logger_->debug("Time updated: Live");
emit self_->TimeUpdated(selectedTime); emit self_->VolumeTimeUpdated(selectedTime);
emit self_->SelectedTimeUpdated(selectedTime);
return; return;
} }
@ -182,7 +183,6 @@ void TimelineManager::Impl::SelectTime(
if (elementPtr != nullptr) if (elementPtr != nullptr)
{ {
selectedTime_ = selectedTime;
// If the adjusted time changed, or if a new radar site has been // If the adjusted time changed, or if a new radar site has been
// selected // selected
@ -192,17 +192,25 @@ void TimelineManager::Impl::SelectTime(
// If the time was found, select it // If the time was found, select it
adjustedTime_ = *elementPtr; adjustedTime_ = *elementPtr;
logger_->debug("Time updated: {}", adjustedTime_); logger_->debug("Volume time updated: {}",
scwx::util::TimeString(adjustedTime_));
emit self_->TimeUpdated(adjustedTime_); emit self_->VolumeTimeUpdated(adjustedTime_);
} }
} }
else else
{ {
// No volume time was found // No volume time was found
logger_->info("No volume scan found for {}", selectedTime); logger_->info("No volume scan found for {}",
scwx::util::TimeString(selectedTime));
} }
logger_->trace("Selected time updated: {}",
scwx::util::TimeString(selectedTime));
selectedTime_ = selectedTime;
emit self_->SelectedTimeUpdated(selectedTime);
previousRadarSite_ = radarSite_; previousRadarSite_ = radarSite_;
}); });
} }

4
scwx-qt/source/scwx/qt/manager/timeline_manager.hpp
View file

@ -41,7 +41,9 @@ public slots:
void AnimationStepEnd(); void AnimationStepEnd();
signals: signals:
void TimeUpdated(std::chrono::system_clock::time_point dateTime); void SelectedTimeUpdated(std::chrono::system_clock::time_point dateTime);
void VolumeTimeUpdated(std::chrono::system_clock::time_point dateTime);
void ViewTypeUpdated(types::MapTime viewType); void ViewTypeUpdated(types::MapTime viewType);
private: private: