Skip to content

Update 'h' shortcut for hide outline. Add annulus and wavefront inspector help texts #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gr5 merged 3 commits into from
Nov 22, 2025
Merged

Update 'h' shortcut for hide outline. Add annulus and wavefront inspector help texts #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44fa9ab
issue #258 improve annulus help text
gr5 Nov 18, 2025
50fa66a
issue 259 add some explanatory text to wavefront inspector
gr5 Nov 18, 2025
87c7501
issue 223 when hitting "h" key, "hide outlines" checkbox should toggl…
gr5 Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions annulushelpdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>508</width>
<height>330</height>
<width>1015</width>
<height>485</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -33,13 +33,20 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
hr { height: 1px; border-width: 0; }
li.unchecked::marker { content: &quot;\2610&quot;; }
li.checked::marker { content: &quot;\2612&quot;; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Annulus Help.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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. &lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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%.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
Expand Down
1 change: 1 addition & 0 deletions igramarea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,6 +2510,7 @@ void IgramArea::save(){
}
void IgramArea::toggleHideOutline(){
m_hideOutlines = !m_hideOutlines;
MainWindow::me->setHiddenCheckbox(m_hideOutlines);
drawBoundary();
}

Expand Down
6 changes: 6 additions & 0 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class MainWindow : public QMainWindow
wavefront *getCurrentWavefront();
void openWaveFrontonInit(QStringList args);
QStringList SelectWaveFrontFiles();
void setHiddenCheckbox(bool checked);


public slots:
Expand Down
9 changes: 8 additions & 1 deletion wftexaminer.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,20 @@
<x>0</x>
<y>0</y>
<width>210</width>
<height>96</height>
<height>136</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Horizontal Row (0 is at top)</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox">
<property name="maximum">
Expand Down
Loading