diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 9ef664bd..482aaad5 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -215,6 +215,15 @@ target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source) +target_compile_options(scwx-qt PRIVATE + $<$:/W4 /WX> + $<$>:-Wall -Wextra -Wpedantic -Werror> +) +target_compile_options(supercell-wx PRIVATE + $<$:/W4 /WX> + $<$>:-Wall -Wextra -Wpedantic -Werror> +) + target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::OpenGLWidgets Boost::json diff --git a/scwx-qt/source/scwx/qt/gl/text_shader.cpp b/scwx-qt/source/scwx/qt/gl/text_shader.cpp index 39120c94..2014da68 100644 --- a/scwx-qt/source/scwx/qt/gl/text_shader.cpp +++ b/scwx-qt/source/scwx/qt/gl/text_shader.cpp @@ -1,7 +1,9 @@ #include #include +#pragma warning(push, 0) #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 8bce5103..2cb43b51 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -154,7 +154,7 @@ MainWindow::MainWindow(QWidget* parent) : connect(qApp, &QApplication::focusChanged, this, - [=](QWidget* old, QWidget* now) { p->HandleFocusChange(now); }); + [=](QWidget* /*old*/, QWidget* now) { p->HandleFocusChange(now); }); connect(p->level2ProductsWidget_, &ui::Level2ProductsWidget::RadarProductSelected, this, @@ -277,7 +277,7 @@ void MainWindowImpl::ConfigureMapLayout() maps_.resize(mapCount); - auto MoveSplitter = [=](int pos, int index) + auto MoveSplitter = [=](int /*pos*/, int /*index*/) { QSplitter* s = dynamic_cast(sender()); diff --git a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp index 073cbb3c..c307c463 100644 --- a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp @@ -2,8 +2,10 @@ #include #include +#pragma warning(push, 0) #include #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/draw_layer.cpp b/scwx-qt/source/scwx/qt/map/draw_layer.cpp index 8a4e4bfb..16e1311d 100644 --- a/scwx-qt/source/scwx/qt/map/draw_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/draw_layer.cpp @@ -2,9 +2,11 @@ #include #include +#pragma warning(push, 0) #include #include #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index 03bce14b..09f51f75 100644 --- a/scwx-qt/source/scwx/qt/map/map_widget.cpp +++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp @@ -172,7 +172,7 @@ MapWidgetImpl::GetLevel2ProductOrDefault(const std::string& productName) const { if (context_->radarProductView_ != nullptr) { - common::Level2Product level2Product = common::GetLevel2Product( + level2Product = common::GetLevel2Product( context_->radarProductView_->GetRadarProductName()); } } diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp index 932c2e90..91ef54ef 100644 --- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp @@ -9,6 +9,7 @@ #include #include +#pragma warning(push, 0) #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp index 65f06225..2f47b777 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -4,12 +4,14 @@ #include +#pragma warning(push, 0) #include #include #include #include #include #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/types/radar_product_record.cpp b/scwx-qt/source/scwx/qt/types/radar_product_record.cpp index f16ec0e0..ce402342 100644 --- a/scwx-qt/source/scwx/qt/types/radar_product_record.cpp +++ b/scwx-qt/source/scwx/qt/types/radar_product_record.cpp @@ -44,7 +44,7 @@ RadarProductRecord::RadarProductRecord( std::shared_ptr level2File = level2_file(); std::shared_ptr level3File = level3_file(); - uint16_t julianDate = 0; + uint32_t julianDate = 0; uint32_t milliseconds = 0; if (level2File != nullptr) diff --git a/scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp b/scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp index f19a7fb8..ed582073 100644 --- a/scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp @@ -34,8 +34,8 @@ public: { layout_->setContentsMargins(0, 0, 0, 0); - elevationGroupBox_ = new QGroupBox(tr("Elevation"), self); - QLayout* elevationLayout = new ui::FlowLayout(elevationGroupBox_); + elevationGroupBox_ = new QGroupBox(tr("Elevation"), self); + new ui::FlowLayout(elevationGroupBox_); layout_->addWidget(elevationGroupBox_); settingsGroupBox_ = new QGroupBox(tr("Settings"), self); diff --git a/scwx-qt/source/scwx/qt/util/font.cpp b/scwx-qt/source/scwx/qt/util/font.cpp index 0078d016..f4e9965b 100644 --- a/scwx-qt/source/scwx/qt/util/font.cpp +++ b/scwx-qt/source/scwx/qt/util/font.cpp @@ -16,6 +16,7 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H +#pragma warning(push, 0) // #include (exclude opengl.h) #include #include @@ -23,6 +24,7 @@ #include #include #include +#pragma warning(pop) #ifdef WIN32 # include @@ -179,7 +181,7 @@ float Font::BufferText(std::shared_ptr buffer, return x; } -float Font::Kerning(char c1, char c2) const +float Font::Kerning(char /*c1*/, char /*c2*/) const { // TODO return 0.0f; diff --git a/scwx-qt/source/scwx/qt/view/level3_product_view.cpp b/scwx-qt/source/scwx/qt/view/level3_product_view.cpp index 0237fd6d..bec61ec7 100644 --- a/scwx-qt/source/scwx/qt/view/level3_product_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_product_view.cpp @@ -225,27 +225,27 @@ void Level3ProductView::UpdateColorTable() uint16_t th = descriptionBlock->data_level_threshold(i); if ((th & 0x8000u) == 0) { - float scale = 1.0f; + float scaleFactor = 1.0f; if (th & 0x4000u) { - scale *= 0.01f; + scaleFactor *= 0.01f; } if (th & 0x2000u) { - scale *= 0.05f; + scaleFactor *= 0.05f; } if (th & 0x1000u) { - scale *= 0.1f; + scaleFactor *= 0.1f; } if (th & 0x0100u) { - scale *= -1.0f; + scaleFactor *= -1.0f; } // If bit 0 is zero, then the LSB is numeric - f = static_cast(th & 0x00ffu) * scale; + f = static_cast(th & 0x00ffu) * scaleFactor; lut[lutIndex] = p->colorTable_->Color(f); } 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 900a8c89..a5c8fa02 100644 --- a/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_radial_view.cpp @@ -254,8 +254,6 @@ void Level3RadialView::ComputeSweep() dataMoments8.resize(radials * gates * VERTICES_PER_BIN); // Compute threshold at which to display an individual bin - const float scale = descriptionBlock->scale(); - const float offset = descriptionBlock->offset(); const uint16_t snrThreshold = descriptionBlock->threshold(); // Determine which radial to start at @@ -268,9 +266,7 @@ void Level3RadialView::ComputeSweep() const auto dataMomentsArray8 = radialData->level(radial); // Compute gate interval - const uint16_t dataMomentInterval = descriptionBlock->x_resolution_raw(); - const uint16_t dataMomentIntervalH = dataMomentInterval / 2; - const uint16_t dataMomentRange = dataMomentIntervalH; + const uint16_t dataMomentInterval = descriptionBlock->x_resolution_raw(); // Compute gate size (number of base gates per bin) const uint16_t gateSize = std::max( 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 46369d05..34b8a51c 100644 --- a/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp +++ b/scwx-qt/source/scwx/qt/view/level3_raster_view.cpp @@ -278,8 +278,6 @@ void Level3RasterView::ComputeSweep() dataMoments8.resize(rows * maxColumns * VERTICES_PER_BIN); // Compute threshold at which to display an individual bin - const float scale = descriptionBlock->scale(); - const float offset = descriptionBlock->offset(); const uint16_t snrThreshold = descriptionBlock->threshold(); for (size_t row = 0; row < rasterData->number_of_rows(); ++row) diff --git a/scwx-qt/source/scwx/qt/view/radar_product_view.cpp b/scwx-qt/source/scwx/qt/view/radar_product_view.cpp index 33771694..35e0fe3d 100644 --- a/scwx-qt/source/scwx/qt/view/radar_product_view.cpp +++ b/scwx-qt/source/scwx/qt/view/radar_product_view.cpp @@ -79,7 +79,7 @@ void RadarProductView::Initialize() p->initialized_ = true; } -void RadarProductView::SelectElevation(float elevation) {} +void RadarProductView::SelectElevation(float /*elevation*/) {} bool RadarProductView::IsInitialized() const {