From 398ff764a92b05b08fb708ce348b8abcde966432 Mon Sep 17 00:00:00 2001 From: gr5 Date: Sun, 18 Jan 2026 14:36:06 -0500 Subject: [PATCH 1/3] Fixes clangd errors --- foucaultview.cpp | 14 ++++++++------ foucaultview.h | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/foucaultview.cpp b/foucaultview.cpp index 9cd5991a..502b4098 100644 --- a/foucaultview.cpp +++ b/foucaultview.cpp @@ -43,6 +43,9 @@ foucaultView::foucaultView(QWidget *parent, SurfaceManager *sm) : // Using name() and string check for robust color persistence m_gridColor = QColor(set.value("ronchiGrid/color", "#00FFFF").toString()); // Default Cyan m_textColor = QColor(set.value("ronchiGrid/textColor", "#FFFFFF").toString()); // Default White + + // Color storage (using local temps for the dialog session) + } @@ -118,17 +121,16 @@ void foucaultView::showGrid() { QCheckBox *textToggle = new QCheckBox("Show unit labels", &dlg); textToggle->setChecked(m_showUnitLabels); - // Color storage (using local temps for the dialog session) - struct State { QColor grid; QColor text; } colors = { m_gridColor, m_textColor }; - QPushButton *btnGridCol = new QPushButton("Grid Color"); QPushButton *btnTextCol = new QPushButton("Text Color"); - connect(btnGridCol, &QPushButton::clicked, [&]() { + colors = { m_gridColor, m_textColor }; // store current values + + connect(btnGridCol, &QPushButton::clicked, this,[this]() { QColor c = QColorDialog::getColor(colors.grid, this); if (c.isValid()) colors.grid = c; }); - connect(btnTextCol, &QPushButton::clicked, [&]() { + connect(btnTextCol, &QPushButton::clicked, this, [this]() { QColor c = QColorDialog::getColor(colors.text, this); if (c.isValid()) colors.text = c; }); @@ -146,7 +148,7 @@ void foucaultView::showGrid() { form.addRow(&buttonBox); // Reset Logic - connect(resetBtn, &QPushButton::clicked, [&]() { + connect(resetBtn, &QPushButton::clicked, this, [=]() { unitCombo->setCurrentIndex(0); // None spacingSpin->setValue(10.0); widthSpin->setValue(1); diff --git a/foucaultview.h b/foucaultview.h index 131f3aae..7becf5b3 100644 --- a/foucaultview.h +++ b/foucaultview.h @@ -109,6 +109,8 @@ private slots: bool m_showUnitLabels = true; QColor m_gridColor = Qt::cyan; QColor m_textColor = Qt::white; + struct State { QColor grid; QColor text; } colors; + void drawGridOverlay(QImage &img); explicit foucaultView(QWidget *parent = 0, SurfaceManager *sm = 0); From 7e9d4070ba769756218050b9cbd1785e90d34198 Mon Sep 17 00:00:00 2001 From: gr5 Date: Sun, 18 Jan 2026 14:56:20 -0500 Subject: [PATCH 2/3] Changed colors to m_temp_colors --- foucaultview.cpp | 18 +++++++++--------- foucaultview.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/foucaultview.cpp b/foucaultview.cpp index 502b4098..1d340959 100644 --- a/foucaultview.cpp +++ b/foucaultview.cpp @@ -124,15 +124,15 @@ void foucaultView::showGrid() { QPushButton *btnGridCol = new QPushButton("Grid Color"); QPushButton *btnTextCol = new QPushButton("Text Color"); - colors = { m_gridColor, m_textColor }; // store current values + m_temp_colors = { m_gridColor, m_textColor }; // store current values connect(btnGridCol, &QPushButton::clicked, this,[this]() { - QColor c = QColorDialog::getColor(colors.grid, this); - if (c.isValid()) colors.grid = c; + QColor c = QColorDialog::getColor(m_temp_colors.grid, this); + if (c.isValid()) m_temp_colors.grid = c; }); connect(btnTextCol, &QPushButton::clicked, this, [this]() { - QColor c = QColorDialog::getColor(colors.text, this); - if (c.isValid()) colors.text = c; + QColor c = QColorDialog::getColor(m_temp_colors.text, this); + if (c.isValid()) m_temp_colors.text = c; }); form.addRow("Grid Units:", unitCombo); @@ -153,8 +153,8 @@ void foucaultView::showGrid() { spacingSpin->setValue(10.0); widthSpin->setValue(1); textToggle->setChecked(true); - colors.grid = Qt::cyan; - colors.text = Qt::white; + m_temp_colors.grid = Qt::cyan; + m_temp_colors.text = Qt::white; }); connect(&buttonBox, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); @@ -165,8 +165,8 @@ void foucaultView::showGrid() { m_gridSpacing = spacingSpin->value(); m_gridLineWidth = widthSpin->value(); m_showUnitLabels = textToggle->isChecked(); - m_gridColor = colors.grid; - m_textColor = colors.text; + m_gridColor = m_temp_colors.grid; + m_textColor = m_temp_colors.text; // Save to QSettings with "ronchiGrid" prefix QSettings set; diff --git a/foucaultview.h b/foucaultview.h index 7becf5b3..dc9424a7 100644 --- a/foucaultview.h +++ b/foucaultview.h @@ -109,7 +109,7 @@ private slots: bool m_showUnitLabels = true; QColor m_gridColor = Qt::cyan; QColor m_textColor = Qt::white; - struct State { QColor grid; QColor text; } colors; + struct State { QColor grid; QColor text; } m_temp_colors; void drawGridOverlay(QImage &img); From 5ad7fb8a32550e0afe1477a7ee51d8b4aec820ea Mon Sep 17 00:00:00 2001 From: gr5 Date: Sun, 18 Jan 2026 14:59:17 -0500 Subject: [PATCH 3/3] removed comment that is no longer relevant --- foucaultview.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/foucaultview.cpp b/foucaultview.cpp index 1d340959..93c8f3c9 100644 --- a/foucaultview.cpp +++ b/foucaultview.cpp @@ -44,8 +44,6 @@ foucaultView::foucaultView(QWidget *parent, SurfaceManager *sm) : m_gridColor = QColor(set.value("ronchiGrid/color", "#00FFFF").toString()); // Default Cyan m_textColor = QColor(set.value("ronchiGrid/textColor", "#FFFFFF").toString()); // Default White - // Color storage (using local temps for the dialog session) - }