From dc72e9fbfc12b723ccab16d8bcf9f2535880cc83 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Fri, 14 Mar 2025 13:18:00 -0400 Subject: [PATCH] clang tidy/format fixes for update_tdwr_products --- scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp | 6 +++--- scwx-qt/source/scwx/qt/view/level3_radial_view.cpp | 8 +++----- wxdata/include/scwx/common/products.hpp | 2 +- wxdata/source/scwx/common/products.cpp | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp b/scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp index 18a90313..e6de32b2 100644 --- a/scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp @@ -186,7 +186,7 @@ public: std::shared_mutex awipsProductMutex_; common::Level3ProductCategoryMap categoryMap_; - std::shared_mutex categoryMapMutex_; + std::shared_mutex categoryMapMutex_; std::string currentAwipsId_ {}; QAction* currentProductTiltAction_ {nullptr}; @@ -327,7 +327,7 @@ void Level3ProductsWidgetImpl::SelectProductCategory( { UpdateCategorySelection(category); - std::shared_lock lock {categoryMapMutex_}; + const std::shared_lock lock {categoryMapMutex_}; Q_EMIT self_->RadarProductSelected( common::RadarProductGroup::Level3, @@ -342,7 +342,7 @@ void Level3ProductsWidget::UpdateAvailableProducts( // Save the category map { - std::unique_lock lock {p->categoryMapMutex_}; + const std::unique_lock lock {p->categoryMapMutex_}; p->categoryMap_ = updatedCategoryMap; } 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 29afba2d..18edefb3 100644 --- a/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp @@ -45,7 +45,7 @@ public: void ComputeCoordinates( const std::shared_ptr& radialData, - bool smoothingEnabled, + bool smoothingEnabled, float gateSize); [[nodiscard]] inline std::uint8_t @@ -357,9 +357,7 @@ void Level3RadialView::ComputeSweep() // Compute gate size (number of base gates per bin) const std::uint16_t gateSize = std::max( - 1, - dataMomentInterval / - static_cast(gateLength)); + 1, dataMomentInterval / static_cast(gateLength)); // Compute gate range [startGate, endGate) std::uint16_t startGate = 0; @@ -540,7 +538,7 @@ Level3RadialView::Impl::RemapDataMoment(std::uint8_t dataMoment) const void Level3RadialView::Impl::ComputeCoordinates( const std::shared_ptr& radialData, - bool smoothingEnabled, + bool smoothingEnabled, float gateSize) { logger_->debug("ComputeCoordinates()"); diff --git a/wxdata/include/scwx/common/products.hpp b/wxdata/include/scwx/common/products.hpp index f4891c6a..7451aa39 100644 --- a/wxdata/include/scwx/common/products.hpp +++ b/wxdata/include/scwx/common/products.hpp @@ -74,7 +74,7 @@ Level2Product GetLevel2Product(const std::string& name); const std::string& GetLevel3CategoryName(Level3ProductCategory category); const std::string& GetLevel3CategoryDescription(Level3ProductCategory category); std::string -GetLevel3CategoryDefaultProduct(Level3ProductCategory category, +GetLevel3CategoryDefaultProduct(Level3ProductCategory category, const Level3ProductCategoryMap& categoryMap); Level3ProductCategory GetLevel3Category(const std::string& categoryName); Level3ProductCategory diff --git a/wxdata/source/scwx/common/products.cpp b/wxdata/source/scwx/common/products.cpp index 3478b7dd..48969e13 100644 --- a/wxdata/source/scwx/common/products.cpp +++ b/wxdata/source/scwx/common/products.cpp @@ -309,7 +309,7 @@ GetLevel3CategoryDefaultProduct(Level3ProductCategory category, } const auto& productsSiteHas = productsIt->second; - const auto& productList = level3CategoryProductList_.at(category); + const auto& productList = level3CategoryProductList_.at(category); for (auto& product : productList) { const auto& tiltsIt = productsSiteHas.find(product);