Linux fixup

DFTFringe.pro

@@ -353,33 +353,35 @@ win32 {
       INCLUDEPATH += D:\\qwt-6.1.5\\src
 
       #message("using win32")include
-}
-
 
-INCLUDEPATH += D:\armadillo\armadillo-9.200.6\include
+    INCLUDEPATH += D:\armadillo\armadillo-9.200.6\include
+    INCLUDEPATH += D:\opencv\opencv-3.4.12\build\install\include
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_core3412.dll
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_highgui3412.dll
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_imgcodecs3412.dll
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_imgproc3412.dll
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_features2d3412.dll
+    LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_calib3d3412.dll
 
-INCLUDEPATH += D:\opencv\opencv-3.4.12\build\install\include
 
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_core3412.dll
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_highgui3412.dll
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_imgcodecs3412.dll
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_imgproc3412.dll
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_features2d3412.dll
-LIBS += D:\opencv\opencv-3.4.12\build\bin\libopencv_calib3d3412.dll
+    LIBS += D:\armadillo\bin\libarmadillo.dll
+    LIBS += D:\lapack\build64\bin\liblapack.dll
+    LIBS += D:\lapack\build64\bin\libblas.dll
+}
 
 
-LIBS += D:\armadillo\bin\libarmadillo.dll
-LIBS += D:\lapack\build64\bin\liblapack.dll
-LIBS += D:\lapack\build64\bin\libblas.dll
 unix {
      INCLUDEPATH += /usr/include/qwt
-     iLIBS += -lqwt-qt5
+     INCLUDEPATH += /usr/include/opencv4/
+     LIBS += -lqwt-qt5
      LIBS += -lopencv_core
      LIBS += -lopencv_imgproc
      LIBS += -lopencv_highgui
      LIBS += -lGLU
      LIBS += -lopencv_calib3d
      LIBS += -lopencv_features2d
+     LIBS += -lopencv_imgcodecs
+     LIBS += -larmadillo
      message("using linux")
      contains(CONFIG,debug) { message("no extra debug libraries") }
 }

arbitrarywavwidget.h

@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QWidget>
 #include <QtGui>
-#include "CPoint.h"
+#include "cpoint.h"
 
 class ArbitraryWavWidget : public QWidget
 {

astigstatsdlg.cpp

@@ -503,7 +503,7 @@ void astigStatsDlg::on_bestFitCB_clicked(bool checked)
 {
     plot();
 }
-#include <Qlist>
+#include <QList>
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

averagewavefrontfilesdlg.cpp

@@ -3,7 +3,7 @@
 #include "surfacemanager.h"
 #include "mainwindow.h"
 #include "wavefrontaveragefilterdlg.h"
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 #include "rejectedwavefrontsdlg.h"
 #include <QFileInfo>
 #include "utils.h"

camcalibrationreviewdlg.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <vector>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 
 namespace Ui {
 class CamCalibrationReviewDlg;

camwizardpage1.cpp

@@ -1,10 +1,13 @@
 #include "camwizardpage1.h"
 #include "ui_camwizardpage1.h"
+#include <opencv2/core/core_c.h>
+#include <opencv2/calib3d/calib3d_c.h>
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/imgproc/types_c.h>
 #include <opencv2/highgui.hpp>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 #include <QImageReader>
 #include <QFileDialog>
 #include <vector>

camwizardpage1.h

@@ -8,7 +8,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/highgui/highgui.hpp>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 namespace Ui {
 class CamWizardPage1;
 }

circleoutline.cpp

@@ -15,7 +15,7 @@
 ** along with DFTFringe.  If not, see <http://www.gnu.org/licenses/>.
 
 ****************************************************************************/
-#include "Circleoutline.h"
+#include "circleoutline.h"
 #include <qmath.h>
 #include <QDebug>
 #include <qmath.h>

circleoutline.h

@@ -23,7 +23,7 @@
 #include "gplus.h"
 #include <QVector>
 #include <QPointF>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 void fillCircle(cv::Mat &m, double cx, double cy, double rad, void *color);
 class CircleOutline: public boundary
 {

colorchanneldisplay.cpp

@@ -17,7 +17,7 @@
 ****************************************************************************/
 #include "colorchanneldisplay.h"
 #include "ui_colorchanneldisplay.h"
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 
 ColorChannelDisplay::ColorChannelDisplay(QWidget *parent) :
     QDialog(parent),

contourplot.cpp

@@ -29,13 +29,13 @@
 #include <qwt_plot_renderer.h>
 #include <qwt_plot_grid.h>
 #include "contourplot.h"
-#include "opencv/cv.h"
+#include "opencv2/core.hpp"
 #include "wavefront.h"
 #include <QtGui/qevent.h>
 #include <qwt_plot_rescaler.h>
 #include <QtGui>
-#include <opencv/cv.h>
-#include "opencv/highgui.h"
+#include <opencv2/core.hpp>
+#include <opencv2/highgui.hpp>
 #include "dftcolormap.h"
 #include <QDebug>
 #include <math.h>

contourplot.h

@@ -20,7 +20,7 @@
 
 #include <qwt_plot.h>
 #include <qwt_plot_spectrogram.h>
-#include "opencv/cv.h"
+#include <opencv2/core.hpp>
 #include "wavefront.h"
 #include "contourtools.h"
 #include "usercolormapdlg.h"

dftarea.cpp

@@ -24,6 +24,8 @@
 #include "zernikeprocess.h"
 #include "settings2.h"
 #include "myutils.h"
+#include <opencv2/core/core_c.h>
+#include <opencv2/imgproc/types_c.h>
 #include "opencv2/imgproc/imgproc.hpp"
 #include "utils.h"
 #include "showaliasdlg.h"
@@ -565,12 +567,12 @@ void qg_path_follower_vortex (Size size, double *phase, double *qmap,
   while (1) {
 
     // Find the point of highest quality.
-    double m = -HUGE;
+    double m = -std::numeric_limits<double>::max();
     int mndx;
     for (int k=0; k < total; ++k)
       if (qmap[k] > m && ! flags[k])
     m = qmap[mndx = k];
-    if (m == -HUGE) break;
+    if (m == -std::numeric_limits<double>::max()) break;
 
     // Unwrap the first point.
     unwrap_and_insert (mndx, phase[mndx]);

dftarea.h

@@ -19,9 +19,8 @@
 #define DFTAREA_H
 
 #include <QWidget>
-#include "opencv/cv.h"
-#include "opencv/highgui.h"
-#include "IgramArea.h"
+#include <opencv2/core.hpp>
+#include "igramarea.h"
 #include "dfttools.h"
 #include <QImage>
 #include "vortexdebug.h"

foucaultview.cpp

@@ -1,8 +1,8 @@
 #include "foucaultview.h"
 #include "ui_foucaultview.h"
 #include "mirrordlg.h"
-#include "opencv/cv.h"
-#include "opencv/highgui.h"
+#include "opencv2/core.hpp"
+#include <opencv2/highgui.hpp>
 #include "simulationsview.h"
 #include <QVector>
 #include <QMenu>

graphicsutilities.h

@@ -19,7 +19,7 @@
 #define GRAPHICSUTILITIES_H
 
 #include <QtCore>
-#include "Circleoutline.h"
+#include "circleoutline.h"
 #include <iostream>
 #include <fstream>
 

igramarea.cpp

@@ -21,12 +21,15 @@
 #include <QPrintDialog>
 #endif
 
-#include "IgramArea.h"
-#include "Circleoutline.h"
+#include "igramarea.h"
+#include "circleoutline.h"
 #include <QtGlobal>
 #include <math.h>
 
-#include "opencv/cv.h"
+#include "opencv2/core.hpp"
+#include <opencv2/imgproc/types_c.h>
+#include <opencv2/highgui/highgui_c.h>
+#include <opencv2/calib3d.hpp>
 #include "opencv2/imgproc.hpp"
 #include "opencv2/features2d.hpp"
 #include "graphicsutilities.h"

igramarea.h

@@ -65,8 +65,8 @@
 #include <QtCore>
 #include <QtGui>
 #include <QLabel>
-#include <qscrollarea>
-#include "Circleoutline.h"
+#include <QScrollArea>
+#include "circleoutline.h"
 #include <list>
 
 #include <opencv2/core/core.hpp>

imagehisto.cpp

@@ -16,7 +16,7 @@
 
 ****************************************************************************/
 #include "imagehisto.h"
-
+#include <opencv2/imgproc/types_c.h>
 #include <iostream>
 
 using namespace cv;

imagehisto.h

@@ -19,7 +19,7 @@
 #define IMAGEHISTO_H
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv/cv.h"
+#include "opencv2/core.hpp"
 class imageHisto
 {
 public:

intensityplot.cpp

@@ -36,7 +36,7 @@
 #include <qwt_symbol.h>
 #include <qwt_math.h>
 #include <math.h>
-#include <opencv/highgui.h>
+#include <opencv2/highgui.hpp>
 #include <qevent.h>
 #include <qwt_scale_draw.h>
 #include "opencv2/opencv.hpp"

intensityplot.h

@@ -19,7 +19,7 @@
 #define INTENSITYPLOT_H
 #include <QWidget>
 #include <qwt_plot.h>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 
 class intensityPlot:  public QwtPlot
 {

mainwindow.cpp

@@ -33,12 +33,12 @@
 #include "simigramdlg.h"
 #include "usercolormapdlg.h"
 #include <qlayout.h>
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 #include "simulationsview.h"
 #include "outlinehelpdocwidget.h"
 #include "bathastigdlg.h"
 #include "settingsigram.h"
-#include "Circleoutline.h"
+#include "circleoutline.h"
 #include "cameracalibwizard.h"
 #include "astigstatsdlg.h"
 #include "astigscatterplot.h"
@@ -1089,12 +1089,12 @@ void MainWindow::batchProcess(QStringList fileList){
         }
 
         QApplication::processEvents();
-#ifdef Q_OS_WIN
+//#ifdef Q_OS_WIN
         Sleep(uint(1000));
-#else
-        struct timespec ts = { 1000 / 1000, (ms % 1000) * 1000 * 1000 };
-        nanosleep(&ts, NULL);
-#endif
+//#else
+//        struct timespec ts = { 1000 / 1000, (ms % 1000) * 1000 * 1000 };
+//        nanosleep(&ts, NULL);
+//#endif
         ui->SelectOutSideOutline->setChecked(true);
         if (!batchIgramWizard::autoCb->isChecked()){
             while (m_inBatch && !m_OutlineDoneInBatch && !m_skipItem) {
@@ -1111,12 +1111,12 @@ void MainWindow::batchProcess(QStringList fileList){
 
         m_igramArea->nextStep();
         QApplication::processEvents();
-#ifdef Q_OS_WIN
+//#ifdef Q_OS_WIN
         Sleep(uint(1000));
-#else
-        struct timespec ts = { 1000 / 1000, (ms % 1000) * 1000 * 1000 };
-        nanosleep(&ts, NULL);
-#endif
+//#else
+//        struct timespec ts = { 1000 / 1000, (ms % 1000) * 1000 * 1000 };
+//        nanosleep(&ts, NULL);
+//#endif
         m_batchMakeSurfaceReady = false;
         if (!batchIgramWizard::autoCb->isChecked() && !m_skipItem){
             while (m_inBatch && !m_batchMakeSurfaceReady && !m_skipItem) {
@@ -1154,8 +1154,10 @@ void MainWindow::batchProcess(QStringList fileList){
         if (batchWiz->introPage->shouldFilterWavefront(wf->std)){
 
             m_surfaceManager->deleteCurrent();
+#ifdef Q_OS_WIN
             if (shouldBeep)
                 Beep(300,250);
+#endif
         }
         else{
             QPointF astig(wf->InputZerns[4], wf->InputZerns[5]);

mainwindow.h

@@ -21,7 +21,7 @@
 #include <QMainWindow>
 #include <QtWidgets>
 #include <QtCore>
-#include "IgramArea.h"
+#include "igramarea.h"
 #include "dfttools.h"
 #include "dftarea.h"
 #include "profileplot.h"

nullvariationdlg.cpp

@@ -13,7 +13,7 @@
 #include "QLayout"
 #include "plotcolor.h"
 #include "qwt_legend.h"
-#include <opencv/cv.h>
+#include <opencv2/core.hpp>
 #include <random>
 
 nullVariationDlg::nullVariationDlg(QWidget *parent) :

outlinedialog.cpp

@@ -1,3 +1,4 @@
+#include <opencv2/imgproc/types_c.h>
 #include "outlinedialog.h"
 #include "ui_outlinedialog.h"
 #include <QSettings>

outlinedialog.h

@@ -3,8 +3,8 @@
 
 #include <QDialog>
 #include "opencv2/imgproc/imgproc.hpp"
-#include "opencv/cv.h"
-#include "opencv/highgui.h"
+#include "opencv2/core.hpp"
+#include <opencv2/highgui.hpp>
 namespace Ui {
 class outlineDialog;
 }

outlineplots.h

@@ -2,7 +2,7 @@
 #define OUTLINEPLOTS_H
 
 #include <QDockWidget>
-#include "Qwt_plot.h"
+#include "qwt_plot.h"
 namespace Ui {
 class outlinePlots;
 }

pixelstats.cpp

@@ -3,7 +3,7 @@
 #include <qwt_plot.h>
 #include <qwt_plot_histogram.h>
 #include <qwt_plot_marker.h>
-#include <qdebug>
+#include <QDebug>
 #include <QScreen>
 #include <QScrollBar>
 #include <QVBoxLayout>