Merge pull request #227 from atsju/JST/moveZernike

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

Author: atsju

DFTFringe.pro

@@ -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 \
@@ -260,7 +261,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
     wavefrontloader.cpp \
     wftexaminer.cpp \
     wftstats.cpp \
-    zapm.cpp \
     zernikedlg.cpp \
     zernikeeditdlg.cpp \
     zernikepolar.cpp \
@@ -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 \

DFTFringe_Dale.pro

@@ -58,7 +58,6 @@ SOURCES += main.cpp \
     dftcolormap.cpp \
     surfaceanalysistools.cpp \
     surfacemanager.cpp \
-    zapm.cpp \
     zernikedlg.cpp \
     zernikepolar.cpp \
     zernikeprocess.cpp \
@@ -146,6 +145,7 @@ SOURCES += main.cpp \
     psitiltoptions.cpp \
     contourrulerparams.cpp \
     zernikesmoothingdlg.cpp \
+    zernike/zapm.cpp \
     SingleApplication/singleapplication.cpp \
     SingleApplication/singleapplication_p.cpp
 
@@ -272,10 +272,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 \

DFTFringe_QT5.pro

@@ -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 \
@@ -259,7 +260,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
     wavefrontloader.cpp \
     wftexaminer.cpp \
     wftstats.cpp \
-    zapm.cpp \
     zernikedlg.cpp \
     zernikeeditdlg.cpp \
     zernikepolar.cpp \
@@ -270,6 +270,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 \

dftarea.cpp

@@ -1271,7 +1271,9 @@ cv::Mat atan2Mat(cv::Mat y, cv::Mat x){
 }
 #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
+/*
 arma::mat zpmCxx(double rho, double theta, int maxorder) {
 
   int m, n, n0, mmax = maxorder/2;
@@ -1345,6 +1347,7 @@ arma::mat zpmCxx(double rho, double theta, int maxorder) {
   }
   return zm;
 }
+*/
 
 #include "outlinedialog.h"
 void DFTArea::doPSIstep4(cv::Mat images, QVector<double> phases){

mainwindow.cpp

@@ -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;
@@ -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();