Merge branch 'master' into JST/removeUnused

Author: atsju

.github/workflows/build-linux-clazy.yml

@@ -17,8 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt update  
-      - run: sudo apt install -y clazy apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libqt6core5compat6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev
+      - run: sudo apt update
+      - run: sudo apt install -y clazy apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev
       - run: wget -O qwt-${{env.QWT_version}}.zip https://sourceforge.net/projects/qwt/files/qwt/${{env.QWT_version}}/qwt-${{env.QWT_version}}.zip/download?use_mirror=pilotfiber
       - run: 7z x qwt-${{env.QWT_version}}.zip
       - run: cd qwt-${{env.QWT_version}} ; /usr/lib/qt6/bin/qmake

.github/workflows/build-linux.yml

@@ -19,8 +19,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt update  
-      - run: sudo apt install -y apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libqt6core5compat6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev
+      - run: sudo apt update
+      - run: sudo apt install -y apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev
       - run: wget -O qwt-${{env.QWT_version}}.zip https://sourceforge.net/projects/qwt/files/qwt/${{env.QWT_version}}/qwt-${{env.QWT_version}}.zip/download?use_mirror=pilotfiber
       - run: 7z x qwt-${{env.QWT_version}}.zip
       - run: cd qwt-${{env.QWT_version}} ; /usr/lib/qt6/bin/qmake

.github/workflows/build-windows.yml

@@ -92,7 +92,7 @@ jobs:
         run: pip install aqtinstall
       - name: install QT
         if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
-        run: aqt install-qt windows desktop ${{env.QT_version}} win64_mingw -m qtcharts qtdatavis3d qt5compat
+        run: aqt install-qt windows desktop ${{env.QT_version}} win64_mingw -m qtcharts qtdatavis3d
       - uses: actions/checkout@v4
         if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
         with:

DFTFringe.pro

@@ -14,7 +14,7 @@ DEFINES += QAPPLICATION_CLASS=QApplication
 
 TEMPLATE = app
 
-QT += charts concurrent core core5compat datavisualization gui network opengl widgets xml
+QT += charts concurrent core datavisualization gui network opengl widgets xml
 
 qtHaveModule(printsupport): QT += printsupport
 
@@ -154,6 +154,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     astigpolargraph.cpp \
     astigscatterplot.cpp \
     astigstatsdlg.cpp \
+	  autoinvertdlg.cpp \
     averagewavefrontfilesdlg.cpp \
     batchigramwizard.cpp \
     bathastigdlg.cpp \
@@ -269,6 +270,7 @@ HEADERS += bezier/bezier.h \
     arbitrarywavwidget.h \
     astigscatterplot.h \
     astigstatsdlg.h \
+	  autoinvertdlg.h \
     averagewavefrontfilesdlg.h \
     batchigramwizard.h \
     bathastigdlg.h \
@@ -379,6 +381,7 @@ FORMS += arbitrarywavefronthelp.ui \
     annulushelpdlg.ui \
     astigpolargraph.ui \
     astigstatsdlg.ui \
+	  autoinvertdlg.ui \
     averagewavefrontfilesdlg.ui \
     batchigramwizard.ui \
     bathastigdlg.ui \

DFTFringe_Dale.pro

@@ -31,6 +31,7 @@ SOURCES += main.cpp \
     arbitrarywavefronthelp.cpp \
     arbitrarywavwidget.cpp \
     astigpolargraph.cpp \
+	autoinvertdlg.cpp \
     cpoint.cpp \
     defocusdlg.cpp \
     edgeplot.cpp \
@@ -145,6 +146,7 @@ HEADERS  += mainwindow.h \
     arbitrarywavefronthelp.h \
     arbitrarywavwidget.h \
     astigpolargraph.h \
+	autoinvertdlg.h \
     cpoint.h \
     defocusdlg.h \
     edgeplot.h \
@@ -262,6 +264,7 @@ FORMS    += mainwindow.ui \
     annulushelpdlg.ui \
     arbitrarywavefronthelp.ui \
     astigpolargraph.ui \
+	autoinvertdlg.ui \
     defocusdlg.ui \
     dfttools.ui \
     dftarea.ui \
@@ -361,7 +364,6 @@ 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

DFTFringe_QT5.pro

@@ -153,6 +153,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     astigpolargraph.cpp \
     astigscatterplot.cpp \
     astigstatsdlg.cpp \
+    autoinvertdlg.cpp \
     averagewavefrontfilesdlg.cpp \
     batchigramwizard.cpp \
     bathastigdlg.cpp \
@@ -268,6 +269,7 @@ HEADERS += bezier/bezier.h \
     arbitrarywavwidget.h \
     astigscatterplot.h \
     astigstatsdlg.h \
+    autoinvertdlg.h \
     averagewavefrontfilesdlg.h \
     batchigramwizard.h \
     bathastigdlg.h \
@@ -378,6 +380,7 @@ FORMS += arbitrarywavefronthelp.ui \
     annulushelpdlg.ui \
     astigpolargraph.ui \
     astigstatsdlg.ui \
+    autoinvertdlg.ui \
     averagewavefrontfilesdlg.ui \
     batchigramwizard.ui \
     bathastigdlg.ui \