From a492bcfa07e3cb66479549fc27d2fb59d62992f5 Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Wed, 31 Dec 2025 12:12:40 +0100 Subject: [PATCH 1/3] fix some ompile warnings and bitwise operators --- foucaultview.cpp | 8 ++++---- foucaultview.h | 2 +- profileplot.cpp | 6 +++--- profileplot.h | 2 +- wavefrontloaderworker.cpp | 2 +- wavefrontloaderworker.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/foucaultview.cpp b/foucaultview.cpp index 0d6fda2e..f4042737 100644 --- a/foucaultview.cpp +++ b/foucaultview.cpp @@ -213,7 +213,7 @@ QImage foucaultView::generateOpticalTestImage(OpticalTestType type, wavefront* w double lpi_val = s.lpi * (s.useMM ? 25.4 : 1.0); int ppl = std::max(1, (int)((0.5 / lpi_val) / pixwidth)); int start = (size / 2) - (ppl / 2); - bool even = ((start / ppl) % 2 == 0) ^ s.clearCenter; + bool even = ((start / ppl) % 2 == 0) != s.clearCenter; int roffset_start = ppl - (start % ppl); for (int y = 0; y < size; ++y) { @@ -298,10 +298,10 @@ void foucaultView::on_makePb_clicked() QImage foucaultImg = generateOpticalTestImage(OpticalTestType::Foucault, m_wf, settings); // Store for potential saving/external access - m_foucultQimage = foucaultImg; + m_foucaultQimage = foucaultImg; // 3. UI Painting Helper (to avoid duplicating the Painter logic) - auto paintAndDisplay = [&](QLabel* label, QImage img, double offsetValue) { + auto paintAndDisplay = [&](QLabel* label, const QImage& img, double offsetValue) { if (img.isNull()) return; QSize s = label->size(); @@ -637,7 +637,7 @@ void foucaultView::on_scanPb_clicked() QString fvpng = QString("%1//%2.png").arg(imageDir).arg(cnt++, 6, 10, QLatin1Char('0')); qDebug() << "fn"<< fvpng; if (ui->saveOnlyFouccault->isChecked()){ - fv->m_foucultQimage.save(fvpng); + fv->m_foucaultQimage.save(fvpng); } else { fvImage.save(fvpng); diff --git a/foucaultview.h b/foucaultview.h index 8c57d703..83336188 100644 --- a/foucaultview.h +++ b/foucaultview.h @@ -92,7 +92,7 @@ private slots: Ui::foucaultView *ui; SurfaceManager *m_sm; QString imageDir; - QImage m_foucultQimage; + QImage m_foucaultQimage; QTimer m_guiTimer; int heightMultiply; double m_sag; diff --git a/profileplot.cpp b/profileplot.cpp index 482e5e15..ad6a5acd 100644 --- a/profileplot.cpp +++ b/profileplot.cpp @@ -224,7 +224,7 @@ ProfilePlot::~ProfilePlot(){ -void ProfilePlot::SetYoffset(QString name, double value){ +void ProfilePlot::SetYoffset(const QString& name, double value){ if (m_waveFrontyOffsets.contains(name)){ m_waveFrontyOffsets[name] += value; } @@ -560,7 +560,7 @@ struct RadialBin { */ std::vector compute_average_radial_profile( const cv::Mat& matrix, - const cv::Point& center, + cv::Point center, int radius) { // Check matrix validity @@ -721,7 +721,7 @@ qDebug() << "Populate"; } qDebug() << "offsets" << m_waveFrontyOffsets<< y_offset; // if show one angle - if (m_show_oneAngle or (!m_showAvg and !m_show_16_diameters & !m_show_oneAngle)){ + if (m_show_oneAngle or (!m_showAvg and !m_show_16_diameters and !m_show_oneAngle)){ cprofile->setSamples( createProfile( units,wf, true)); cprofile->attach( m_plot ); diff --git a/profileplot.h b/profileplot.h index 2071d999..e797b68a 100644 --- a/profileplot.h +++ b/profileplot.h @@ -96,7 +96,7 @@ public slots: void toggleShow16(); void toggleOneAngle(); void CreateWaveFrontFromAverage(); - void SetYoffset(QString name, double value); + void SetYoffset(const QString& name, double value); //QPolygonF createZernProfile(wavefront *wf); private: diff --git a/wavefrontloaderworker.cpp b/wavefrontloaderworker.cpp index f41a38fb..1ea459d0 100644 --- a/wavefrontloaderworker.cpp +++ b/wavefrontloaderworker.cpp @@ -9,7 +9,7 @@ WavefrontLoaderWorker::WavefrontLoaderWorker(QObject *parent) { } -void WavefrontLoaderWorker::process(QStringList args, SurfaceManager* manager) { +void WavefrontLoaderWorker::process(const QStringList& args, SurfaceManager* manager) { m_isCancelled = false; // Reset the flag for this run int cnt = 0; diff --git a/wavefrontloaderworker.h b/wavefrontloaderworker.h index ee579c75..5de08c7a 100644 --- a/wavefrontloaderworker.h +++ b/wavefrontloaderworker.h @@ -17,7 +17,7 @@ public slots: /** * @brief The main loop that processes the wavefront files. */ - void process(QStringList args, SurfaceManager* manager); + void process(const QStringList& args, SurfaceManager* manager); /** * @brief Slot to trigger a safe exit of the loop. From e1dbc17d3156d7282e5e2fe7d80f902ab102bb01 Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Wed, 31 Dec 2025 12:20:27 +0100 Subject: [PATCH 2/3] revert changes that should not have been pushed for merge --- autoinvertdlg.ui | 48 +++--------------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/autoinvertdlg.ui b/autoinvertdlg.ui index 66f818e8..2c4bfbcd 100644 --- a/autoinvertdlg.ui +++ b/autoinvertdlg.ui @@ -6,8 +6,8 @@ 0 0 - 1295 - 565 + 1078 + 464 @@ -25,7 +25,7 @@ true - + @@ -137,48 +137,6 @@ - - - - - - <html><head/><body><p><span style=" font-weight:700;">What to do if invertions may be detected</span></p></body></html> - - - true - - - - - - - - - Don't Ask but Invert - - - - - - - Ask but Don't Invert - - - true - - - - - - - Don't ask or invert - - - - - - - From cb82a2663080ec74f99844c8c1804dd9173e1722 Mon Sep 17 00:00:00 2001 From: Julien STAUB Date: Thu, 1 Jan 2026 09:57:27 +0100 Subject: [PATCH 3/3] fix 3 more small warnings --- autoinvertdlg.cpp | 2 +- ronchicomparedialog.cpp | 4 ++-- ronchicomparedialog.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoinvertdlg.cpp b/autoinvertdlg.cpp index ef36c479..25da2cba 100644 --- a/autoinvertdlg.cpp +++ b/autoinvertdlg.cpp @@ -56,6 +56,6 @@ void autoInvertDlg::enableConic(bool b) { void autoInvertDlg::on_InvertWithoutAskingRb_clicked(bool checked) { - + Q_UNUSED(checked); } diff --git a/ronchicomparedialog.cpp b/ronchicomparedialog.cpp index d515dc14..3a8ab367 100644 --- a/ronchicomparedialog.cpp +++ b/ronchicomparedialog.cpp @@ -6,8 +6,8 @@ #include #include #include -RonchiCompareDialog::RonchiCompareDialog(const QImage& img1, const QString name1, const QImage &img2, - const QString name2, QWidget* parent) +RonchiCompareDialog::RonchiCompareDialog(const QImage& img1, const QString& name1, const QImage &img2, + const QString& name2, QWidget* parent) : QDialog(parent), m_q1(img1), m_q2(img2) { setWindowTitle(tr("Ronchi Comparison Overlay")); diff --git a/ronchicomparedialog.h b/ronchicomparedialog.h index 4061c29c..c3041ae0 100644 --- a/ronchicomparedialog.h +++ b/ronchicomparedialog.h @@ -11,8 +11,8 @@ class RonchiCompareDialog : public QDialog { Q_OBJECT public: - explicit RonchiCompareDialog(const QImage& img1, const QString name1, const QImage &img2, - const QString name2, QWidget* parent); + explicit RonchiCompareDialog(const QImage& img1, const QString& name1, const QImage &img2, + const QString& name2, QWidget* parent); virtual ~RonchiCompareDialog(); private slots: