From 44fa9ab813e1adc3602877faef217c70ac7dac9b Mon Sep 17 00:00:00 2001 From: gr5 Date: Tue, 18 Nov 2025 13:57:00 -0500 Subject: [PATCH 1/3] issue #258 improve annulus help text --- annulushelpdlg.ui | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/annulushelpdlg.ui b/annulushelpdlg.ui index 5dad6662..7ca63024 100644 --- a/annulushelpdlg.ui +++ b/annulushelpdlg.ui @@ -6,8 +6,8 @@ 0 0 - 508 - 330 + 1015 + 485 @@ -33,13 +33,20 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:700;">Annulus Help.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">An interferogram of a mirror with a central hole needs to use annular zernike values if the hole has a diameter that is larger than 25% of the mirror's diameter.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">An interferogram of a mirror with a central hole needs to use annular zernike values if the hole has a diameter that is larger than 25% of the mirror's diameter. Otherwise accuracies go down drastically particularly the S.A. and defocus terms are not properly removed and can cause significant errors in mirror analysis.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can set that percentage of that hole size compared to the mirror diameter in the annulus values either by percentage of mirror diameter or by actual size. You should then add and edit the central outline by selecting the center outline button. That tells DFTFringe what part of the interferogram to ignore. </p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Make the percentage on the small side so you have room to tweak the inner outline. In other words if the central hole is exactly 30% of the mirror diameter try using 29% or 28%.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Note that the Null gets larger as the annulus percentage grows and when averaging, it's less confusing (but not mandatory) if the annulus percentage is the same for all the wavefronts to be averaged. It's expected that the inner outline may change from one wavefront to the next but best to keep the annulus percentage in mirror configuration the same.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> From 50fa66a34b55465acea2e1dffda94b8b5c361d85 Mon Sep 17 00:00:00 2001 From: gr5 Date: Tue, 18 Nov 2025 13:57:42 -0500 Subject: [PATCH 2/3] issue 259 add some explanatory text to wavefront inspector --- wftexaminer.ui | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wftexaminer.ui b/wftexaminer.ui index 2b3d1054..b51f3a9f 100644 --- a/wftexaminer.ui +++ b/wftexaminer.ui @@ -7,13 +7,20 @@ 0 0 210 - 96 + 136 Dialog + + + + Horizontal Row (0 is at top) + + + From 87c750126f63fea57662a09c53909cd5abe05ab9 Mon Sep 17 00:00:00 2001 From: gr5 Date: Tue, 18 Nov 2025 13:58:36 -0500 Subject: [PATCH 3/3] issue 223 when hitting "h" key, "hide outlines" checkbox should toggle along with the outlines toggling --- igramarea.cpp | 1 + mainwindow.cpp | 6 ++++++ mainwindow.h | 1 + 3 files changed, 8 insertions(+) diff --git a/igramarea.cpp b/igramarea.cpp index 0c4de0d5..9f05a970 100644 --- a/igramarea.cpp +++ b/igramarea.cpp @@ -2510,6 +2510,7 @@ void IgramArea::save(){ } void IgramArea::toggleHideOutline(){ m_hideOutlines = !m_hideOutlines; + MainWindow::me->setHiddenCheckbox(m_hideOutlines); drawBoundary(); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 5a4c5365..208528ab 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1052,6 +1052,12 @@ void MainWindow::on_pushButton_clicked(bool checked) m_igramArea->hideOutline(checked); } +void MainWindow::setHiddenCheckbox(bool checked) +{ + ui->checkBox->setChecked(checked); +} + + void MainWindow::on_checkBox_clicked(bool checked) { m_igramArea->hideOutline(checked); diff --git a/mainwindow.h b/mainwindow.h index f5521f84..9a4cd8cf 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -77,6 +77,7 @@ class MainWindow : public QMainWindow wavefront *getCurrentWavefront(); void openWaveFrontonInit(QStringList args); QStringList SelectWaveFrontFiles(); + void setHiddenCheckbox(bool checked); public slots: