Skip to content

Several enhancements from dalework. See details in PR #262

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 4 commits into from
Nov 9, 2025
Merged

Several enhancements from dalework. See details in PR #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4287e32
Igramarea.cpp
githubdoe Nov 1, 2025
25a6206
merged with master
githubdoe Nov 2, 2025
577296f
Made auto invert resizable
githubdoe Nov 6, 2025
2f971fb
all comments from code review
atsju Nov 8, 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
3 changes: 3 additions & 0 deletions DFTFringe.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
simigramdlg.cpp \
simulationsview.cpp \
standastigwizard.cpp \
startestmoviedlg.cpp \
statsview.cpp \
subtractwavefronatsdlg.cpp \
surface3dcontrolsdlg.cpp \
Expand Down Expand Up @@ -352,6 +353,7 @@ HEADERS += bezier/bezier.h \
simigramdlg.h \
simulationsview.h \
standastigwizard.h \
startestmoviedlg.h \
statsview.h \
subtractwavefronatsdlg.h \
surface3dcontrolsdlg.h \
Expand Down Expand Up @@ -442,6 +444,7 @@ FORMS += arbitrarywavefronthelp.ui \
simigramdlg.ui \
simulationsview.ui \
standastigwizard.ui \
startestmoviedlg.ui \
statsview.ui \
subtractwavefronatsdlg.ui \
surface3dcontrolsdlg.ui \
Expand Down
3 changes: 3 additions & 0 deletions DFTFringe_Dale.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ SOURCES += main.cpp \
profileplot.cpp \
profileplotpicker.cpp \
settingsigramimportconfig.cpp \
startestmoviedlg.cpp \
surface3dcontrolsdlg.cpp \
surfacegraph.cpp \
surfacelightingproxy.cpp \
Expand Down Expand Up @@ -163,6 +164,7 @@ HEADERS += mainwindow.h \
profileplot.h \
profileplotpicker.h \
settingsigramimportconfig.h \
startestmoviedlg.h \
surface3dcontrolsdlg.h \
surfacegraph.h \
surfacelightingproxy.h \
Expand Down Expand Up @@ -276,6 +278,7 @@ FORMS += mainwindow.ui \
profileplot.ui \
contourtools.ui \
settingsigramimportconfig.ui \
startestmoviedlg.ui \
surface3dcontrolsdlg.ui \
surfaceanalysistools.ui \
metricsdisplay.ui \
Expand Down
3 changes: 3 additions & 0 deletions DFTFringe_QT5.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
simigramdlg.cpp \
simulationsview.cpp \
standastigwizard.cpp \
startestmoviedlg.cpp \
statsview.cpp \
subtractwavefronatsdlg.cpp \
surface3dcontrolsdlg.cpp \
Expand Down Expand Up @@ -351,6 +352,7 @@ HEADERS += bezier/bezier.h \
simigramdlg.h \
simulationsview.h \
standastigwizard.h \
startestmoviedlg.h \
statsview.h \
subtractwavefronatsdlg.h \
surface3dcontrolsdlg.h \
Expand Down Expand Up @@ -441,6 +443,7 @@ FORMS += arbitrarywavefronthelp.ui \
simigramdlg.ui \
simulationsview.ui \
standastigwizard.ui \
startestmoviedlg.ui \
statsview.ui \
subtractwavefronatsdlg.ui \
surface3dcontrolsdlg.ui \
Expand Down
4 changes: 2 additions & 2 deletions IgramArea.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,14 @@ class IgramArea : public QWidget
void writeOutlines(QString fileName);
QString makeOutlineName();
void shiftoutline(QPointF p);
void setZoomMode(zoomMode mode);

void showAliasDialog();
cv::Mat igramToGray(const cv::Mat &roi);
cv::Mat qImageToMat(QImage &roi);
private slots:
void aperatureChanged();
public slots:
void setZoomMode(zoomMode mode);
void gammaChanged(bool, double);
void generateSimIgram();
void clearImage();
Expand Down Expand Up @@ -270,7 +271,6 @@ public slots:
dftThumb *m_dftThumb;
QTimer *m_outlineTimer;
bool hasBeenCropped;
bool m_edgeMode;
int m_zoomBoxWidth;
int m_usingChannel;
zoomMode m_zoomMode;
Expand Down
29 changes: 16 additions & 13 deletions annulushelpdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,27 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>508</width>
<height>330</height>
</rect>
</property>
<property name="windowTitle">
<string>Annulus Help</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="textEdit">
<property name="html">
Expand All @@ -33,16 +46,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
1 change: 1 addition & 0 deletions autoinvertdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ autoInvertDlg::autoInvertDlg(QWidget *parent) :
ui(new Ui::autoInvertDlg)
{
ui->setupUi(this);
setSizeGripEnabled(true);
}

autoInvertDlg::~autoInvertDlg()
Expand Down
Loading
Loading