diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index cebdab48..37b8b268 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -241,7 +241,7 @@ public: std::vector maps_; - std::chrono::system_clock::time_point volumeTime_ {}; + std::chrono::system_clock::time_point selectedTime_ {}; public slots: void UpdateMapParameters(double latitude, @@ -997,22 +997,15 @@ void MainWindowImpl::ConnectAnimationSignals() connect(timelineManager_.get(), &manager::TimelineManager::SelectedTimeUpdated, - [this]() - { - for (auto map : maps_) - { - QMetaObject::invokeMethod( - map, static_cast(&QWidget::update)); - } - }); - connect(timelineManager_.get(), - &manager::TimelineManager::VolumeTimeUpdated, [this](std::chrono::system_clock::time_point dateTime) { - volumeTime_ = dateTime; + selectedTime_ = dateTime; + for (auto map : maps_) { map->SelectTime(dateTime); + QMetaObject::invokeMethod( + map, static_cast(&QWidget::update)); } }); @@ -1400,7 +1393,8 @@ void MainWindowImpl::SelectRadarProduct(map::MapWidget* mapWidget, UpdateRadarProductSettings(); } - mapWidget->SelectRadarProduct(group, productName, productCode, volumeTime_); + mapWidget->SelectRadarProduct( + group, productName, productCode, selectedTime_); } void MainWindowImpl::SetActiveMap(map::MapWidget* mapWidget) diff --git a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp index 1d48ac9c..10e12135 100644 --- a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp @@ -470,16 +470,8 @@ void TimelineManager::Impl::PlaySync() auto selectTimeEnd = std::chrono::steady_clock::now(); auto elapsedTime = selectTimeEnd - selectTimeStart; - if (volumeTimeUpdated) - { - // Wait for radar sweeps to update - RadarSweepMonitorWait(radarSweepMonitorLock); - } - else - { - // Disable radar sweep monitor - RadarSweepMonitorDisable(); - } + // Wait for radar sweeps to update + RadarSweepMonitorWait(radarSweepMonitorLock); // Calculate the interval until the next update, prior to selecting std::chrono::milliseconds interval; diff --git a/scwx-qt/source/scwx/qt/view/level2_product_view.cpp b/scwx-qt/source/scwx/qt/view/level2_product_view.cpp index 61de7871..a5a26157 100644 --- a/scwx-qt/source/scwx/qt/view/level2_product_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level2_product_view.cpp @@ -497,7 +497,7 @@ void Level2ProductView::UpdateColorTableLut() void Level2ProductView::ComputeSweep() { - logger_->debug("ComputeSweep()"); + logger_->trace("ComputeSweep()"); boost::timer::cpu_timer timer; @@ -529,6 +529,8 @@ void Level2ProductView::ComputeSweep() return; } + logger_->debug("Computing Sweep"); + std::size_t radials = radarData->crbegin()->first + 1; std::size_t vertexRadials = radials; diff --git a/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp b/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp index 5611fdf5..5fa3531f 100644 --- a/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp @@ -117,7 +117,7 @@ std::tuple Level3RadialView::GetMomentData() const void Level3RadialView::ComputeSweep() { - logger_->debug("ComputeSweep()"); + logger_->trace("ComputeSweep()"); boost::timer::cpu_timer timer; @@ -185,6 +185,8 @@ void Level3RadialView::ComputeSweep() return; } + logger_->debug("Computing Sweep"); + // A message with radial data should either have a Digital Radial Data // Array Packet, or a Radial Data Array Packet std::shared_ptr diff --git a/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp b/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp index fefeb587..b51c2cd0 100644 --- a/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp @@ -101,7 +101,7 @@ std::tuple Level3RasterView::GetMomentData() const void Level3RasterView::ComputeSweep() { - logger_->debug("ComputeSweep()"); + logger_->trace("ComputeSweep()"); boost::timer::cpu_timer timer; @@ -169,6 +169,8 @@ void Level3RasterView::ComputeSweep() return; } + logger_->debug("Computing Sweep"); + // A message with raster data should have a Raster Data Packet std::shared_ptr rasterData = nullptr;