Skip to content

move zapm.cpp to dedicated folder as it's not our code #227

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
atsju merged 6 commits into from
Aug 20, 2025
Merged

move zapm.cpp to dedicated folder as it's not our code #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0794b51
move zapm.cpp to dedicated folder as it's not our code
atsju Aug 14, 2025
73ed28f
adding licence file to be extra clear about code origin
atsju Aug 17, 2025
5f03c27
remove unused files and code
atsju Aug 17, 2025
71df284
moved wild function declarations
atsju Aug 17, 2025
e068748
added comments to explain zapm file change
atsju Aug 17, 2025
bf6a323
fix typo
atsju Aug 17, 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
5 changes: 3 additions & 2 deletions DFTFringe.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,11 @@ RESOURCES += DFTResources.qrc

TRANSLATIONS += dftfringe_fr.ts

INCLUDEPATH += ./bezier ./SingleApplication
INCLUDEPATH += ./bezier ./SingleApplication ./zernike

SOURCES += SingleApplication/singleapplication.cpp \
SingleApplication/singleapplication_p.cpp \
zernike/zapm.cpp \
annulushelpdlg.cpp \
arbitrarywavefronthelp.cpp \
arbitrarywavwidget.cpp \
Expand Down Expand Up @@ -261,7 +262,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
wavefrontloader.cpp \
wftexaminer.cpp \
wftstats.cpp \
zapm.cpp \
zernikedlg.cpp \
zernikeeditdlg.cpp \
zernikepolar.cpp \
Expand All @@ -272,6 +272,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
HEADERS += bezier/bezier.h \
SingleApplication/singleapplication_p.h \
SingleApplication/singleapplication.h \
zernike/zapm_interface.h \
annulushelpdlg.h \
arbitrarywavefronthelp.h \
astigpolargraph.h \
Expand Down
5 changes: 3 additions & 2 deletions DFTFringe_Dale.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ SOURCES += main.cpp \
dftcolormap.cpp \
surfaceanalysistools.cpp \
surfacemanager.cpp \
zapm.cpp \
zernikedlg.cpp \
zernikepolar.cpp \
zernikeprocess.cpp \
Expand Down Expand Up @@ -147,6 +146,7 @@ SOURCES += main.cpp \
psitiltoptions.cpp \
contourrulerparams.cpp \
zernikesmoothingdlg.cpp \
zernike/zapm.cpp \
SingleApplication/singleapplication.cpp \
SingleApplication/singleapplication_p.cpp

Expand Down Expand Up @@ -275,10 +275,11 @@ HEADERS += mainwindow.h \
contourrulerparams.h \
zernikesmoothingdlg.h \
bezier/bezier.h \
zernike/zapm_interface.h \
SingleApplication/singleapplication.h \
SingleApplication/singleapplication_p.h

INCLUDEPATH += ./bezier ./SingleApplication
INCLUDEPATH += ./bezier ./SingleApplication ./zernike

FORMS += mainwindow.ui \
annulushelpdlg.ui \
Expand Down
5 changes: 3 additions & 2 deletions DFTFringe_QT5.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,11 @@ RESOURCES += DFTResources.qrc

TRANSLATIONS += dftfringe_fr.ts

INCLUDEPATH += ./bezier ./SingleApplication
INCLUDEPATH += ./bezier ./SingleApplication ./zernike

SOURCES += SingleApplication/singleapplication.cpp \
SingleApplication/singleapplication_p.cpp \
zernike/zapm.cpp \
annulushelpdlg.cpp \
arbitrarywavefronthelp.cpp \
arbitrarywavwidget.cpp \
Expand Down Expand Up @@ -260,7 +261,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
wavefrontloader.cpp \
wftexaminer.cpp \
wftstats.cpp \
zapm.cpp \
zernikedlg.cpp \
zernikeeditdlg.cpp \
zernikepolar.cpp \
Expand All @@ -271,6 +271,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
HEADERS += bezier/bezier.h \
SingleApplication/singleapplication_p.h \
SingleApplication/singleapplication.h \
zernike/zapm_interface.h \
annulushelpdlg.h \
arbitrarywavefronthelp.h \
astigpolargraph.h \
Expand Down
5 changes: 4 additions & 1 deletion dftarea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
QSettings set;
m_center_filter = set.value("DFT Center Filter", 10).toDouble();
qDebug() << "init center" << m_center_filter;
emit updateFilterSize(m_center_filter);

Check warning on line 143 in dftarea.cpp

View workflow job for this annotation

GitHub Actions / build-linux-clazy 

Emitting inside constructor probably has no effect [-Wclazy-incorrect-emit]

Check warning on line 143 in dftarea.cpp

View workflow job for this annotation

GitHub Actions / build-linux-clazy 

Emitting inside constructor probably has no effect [-Wclazy-incorrect-emit]
installEventFilter(this);

/*
Expand Down Expand Up @@ -1271,7 +1271,9 @@
}
#include <armadillo>


// zpmCxx commented out, not used, might be needed in doPSIstep4
// I (atsju) recommend deleting this part and add original or modified file from Mike when/if needed
/*
Comment on lines +1274 to +1276
Copy link
Collaborator Author

@atsju atsju Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you agree I should remove zpmCxx or I let it commented like this ?

arma::mat zpmCxx(double rho, double theta, int maxorder) {

int m, n, n0, mmax = maxorder/2;
Expand Down Expand Up @@ -1345,6 +1347,7 @@
}
return zm;
}
*/

#include "outlinedialog.h"
void DFTArea::doPSIstep4(cv::Mat images, QVector<double> phases){
Expand Down
8 changes: 3 additions & 5 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
#include "colorchannel.h"
#include "opencv2/opencv.hpp"
#include <QUrl>
#include "zapm_interface.h"
#include "zernikeprocess.h"

using namespace QtConcurrent;
std::vector<wavefront*> g_wavefronts;
Expand Down Expand Up @@ -1845,11 +1847,7 @@ void MainWindow::on_actionCreate_Movie_of_wavefronts_triggered()
this->setCursor(Qt::ArrowCursor);
QApplication::restoreOverrideCursor();
}
arma::mat zapm(const arma::vec& rho, const arma::vec& theta,
const double& eps, const int& maxorder=12) ;
#include "armadillo"
void dumpArma(arma::mat mm, QString title = "", QVector<QString> colHeading = QVector<QString>(0),
QVector<QString> RowLable = QVector<QString>(0));

void MainWindow::on_actionDebugStuff_triggered()
{
zernikeProcess *zp = zernikeProcess::get_Instance();
Expand Down
10 changes: 0 additions & 10 deletions mikespsiinterface.h_
View file
Open in desktop

This file was deleted.

260 changes: 0 additions & 260 deletions mikespsirinterface.cpp_
View file
Open in desktop

This file was deleted.

Loading
Loading