Skip to content

Average profile #309

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 25 commits into from
Jan 4, 2026
Merged

Average profile #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9f092e8
Changed how profiles are selected and displayed. Added profile line …
githubdoe Dec 12, 2025
55041ba
change autoinvert default value to useConic. Improved profile menus.…
githubdoe Dec 12, 2025
6ac13da
corrected displaying percentage and inches. Fixed bug where first an…
githubdoe Dec 14, 2025
434b166
Corrected bug in average display of inches and mm.
githubdoe Dec 14, 2025
e9ef0a9
Modified code to shift the 16 diameters. Not perfect but good enough…
githubdoe Dec 22, 2025
d4e87ae
added make ronchi image of selected wave fronts. Restructed foucault…
githubdoe Dec 23, 2025
0145d7b
Merge branch 'master' into averageProfile
gr5 Dec 24, 2025
de7ec73
Dale added a new call to CreateSurfaceFromPhaseMap() and coincidentally
gr5 Dec 24, 2025
80178b0
Update mainwindow.cpp
gr5 Dec 24, 2025
90db809
fix qt6 compilation issue (due to different qwt version ?)
atsju Dec 25, 2025
5194e62
added ronchi comparison of two files. Corrected black buttons
githubdoe Dec 26, 2025
1f027b3
Merge branch 'master' into averageProfile
githubdoe Dec 26, 2025
3df6d01
Merge branch 'averageProfile' of https://github.com/githubdoe/DFTFrin…
githubdoe Dec 27, 2025
cfa0e9a
Dale edited one project file but not the other two. Fixed now. Hope…
gr5 Dec 27, 2025
cc7f73f
Update surfacemanager.cpp
gr5 Dec 27, 2025
4a5293b
Update plotcolor.cpp
gr5 Dec 27, 2025
a492bcf
fix some ompile warnings and bitwise operators
atsju Dec 31, 2025
e1dbc17
revert changes that should not have been pushed for merge
atsju Dec 31, 2025
cb82a26
fix 3 more small warnings
atsju Jan 1, 2026
ed69f2b
Merge pull request #311 from githubdoe/JST/averageProfileFixes
atsju Jan 1, 2026
cdc9785
corrected 550 issue
githubdoe Jan 3, 2026
1c4001a
Merge branch 'averageProfile' of https://github.com/githubdoe/DFTFrin…
githubdoe Jan 3, 2026
0f5f25f
Update surfacemanager.h
atsju Jan 3, 2026
f30557c
Update surfacemanager.h
atsju Jan 3, 2026
f7de6f0
Update foucaultview.cpp
atsju Jan 3, 2026
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
4 changes: 4 additions & 0 deletions DFTFringe.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
plotcolor.cpp \
profileplot.cpp \
profileplotpicker.cpp \
ronchicomparedialog.cpp \
psfplot.cpp \
psi_dlg.cpp \
psiphasedisplay.cpp \
Expand Down Expand Up @@ -243,6 +244,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
surfacegraph.cpp \
surfacelightingproxy.cpp \
surfacemanager.cpp \
wavefrontloaderworker.cpp \
transformwavefrontdlg.cpp \
unwraperrorsview.cpp \
usercolormapdlg.cpp \
Expand Down Expand Up @@ -330,6 +332,7 @@ HEADERS += bezier/bezier.h \
plotcolor.h \
profileplot.h \
profileplotpicker.h \
ronchicomparedialog.h \
psfplot.h \
psi_dlg.h \
psiphasedisplay.h \
Expand Down Expand Up @@ -361,6 +364,7 @@ HEADERS += bezier/bezier.h \
surfacegraph.h \
surfacelightingproxy.h \
surfacemanager.h \
wavefrontloaderworker.h \
transformwavefrontdlg.h \
unwraperrorsview.h \
usercolormapdlg.h \
Expand Down
4 changes: 4 additions & 0 deletions DFTFringe_Dale.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ SOURCES += main.cpp \
percentcorrectiondlg.cpp \
profileplot.cpp \
profileplotpicker.cpp \
ronchicomparedialog.cpp \
settingsigramimportconfig.cpp \
startestmoviedlg.cpp \
surface3dcontrolsdlg.cpp \
Expand All @@ -59,6 +60,7 @@ SOURCES += main.cpp \
dftcolormap.cpp \
surfaceanalysistools.cpp \
surfacemanager.cpp \
wavefrontloaderworker.cpp \
zernikedlg.cpp \
zernikepolar.cpp \
zernikeprocess.cpp \
Expand Down Expand Up @@ -163,6 +165,7 @@ HEADERS += mainwindow.h \
percentcorrectiondlg.h \
profileplot.h \
profileplotpicker.h \
ronchicomparedialog.h \
settingsigramimportconfig.h \
startestmoviedlg.h \
surface3dcontrolsdlg.h \
Expand All @@ -175,6 +178,7 @@ HEADERS += mainwindow.h \
dftcolormap.h \
surfaceanalysistools.h \
surfacemanager.h \
wavefrontloaderworker.h \
zernikedlg.h \
zernikepolar.h \
zernikeprocess.h \
Expand Down
4 changes: 4 additions & 0 deletions DFTFringe_QT5.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
plotcolor.cpp \
profileplot.cpp \
profileplotpicker.cpp \
ronchicomparedialog.cpp \
psfplot.cpp \
psi_dlg.cpp \
psiphasedisplay.cpp \
Expand Down Expand Up @@ -242,6 +243,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
surfacegraph.cpp \
surfacelightingproxy.cpp \
surfacemanager.cpp \
wavefrontloaderworker.cpp \
transformwavefrontdlg.cpp \
unwraperrorsview.cpp \
usercolormapdlg.cpp \
Expand Down Expand Up @@ -329,6 +331,7 @@ HEADERS += bezier/bezier.h \
plotcolor.h \
profileplot.h \
profileplotpicker.h \
ronchicomparedialog.h \
psfplot.h \
psi_dlg.h \
psiphasedisplay.h \
Expand Down Expand Up @@ -360,6 +363,7 @@ HEADERS += bezier/bezier.h \
surfacegraph.h \
surfacelightingproxy.h \
surfacemanager.h \
wavefrontloaderworker.h \
transformwavefrontdlg.h \
unwraperrorsview.h \
usercolormapdlg.h \
Expand Down
6 changes: 6 additions & 0 deletions autoinvertdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,9 @@ void autoInvertDlg::setMainLabel(const QString & str) {
void autoInvertDlg::enableConic(bool b) {
ui->btnUseConic->setEnabled(b);
}

void autoInvertDlg::on_InvertWithoutAskingRb_clicked(bool checked)
{
Q_UNUSED(checked);
}

2 changes: 2 additions & 0 deletions autoinvertdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ private slots:

void on_btnOutside_clicked();

void on_InvertWithoutAskingRb_clicked(bool checked);

private:
Ui::autoInvertDlg *ui;
};
Expand Down
Loading
Loading