Merge branch 'master' into dalework

Author: githubdoe

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

@@ -9,14 +9,16 @@ on:
 
 jobs:
   build-linux-clazy:
+    # This build is only done on one Linux version as it is here only to get the warnings from clazy.
+    # For other versions see build-linux.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4 
+      - uses: actions/checkout@v4
       - run: sudo apt update
-      - run: sudo apt install -y clazy apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10
+      - run: sudo apt install -y clazy apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev
       - run: qmake -spec linux-clang QMAKE_CXX="clazy"
       #- uses: ammaraskar/gcc-problem-matcher@master  #TODO 2023/08/05 re-enable problem matcher when all warnings are fixed
       # ignore noisy dirs from QT files itself
       # all level 1 checks but ignore clazy-no-connect-by-name
       # no parallel make with clazy to not mess log
-      - run: export CLAZY_IGNORE_DIRS=.*usr.* && export CLAZY_CHECKS="level1,no-connect-by-name" && make     
+      - run: export CLAZY_IGNORE_DIRS=.*usr.* && export CLAZY_CHECKS="level1,no-connect-by-name" && make

.github/workflows/build-linux.yml

@@ -9,14 +9,18 @@ on:
 
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, ubuntu-22.04]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt update
-      - run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10
+      - run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev
       - run: qmake
       - uses: ammaraskar/gcc-problem-matcher@master
       - run: echo "::add-matcher::.github/matcher/uic_matcher.json"
       - run: make -j4
       - run: echo "::remove-matcher owner=uic-problem-matcher::"
-      
+

.github/workflows/build-windows.yml

@@ -8,7 +8,7 @@ on:
   workflow_call:
 
 env:
-  armadillo_version: 12.6.7
+  armadillo_version: 14.4.0
   QWT_version: 6.1.6
   openCV_version: 4.6.0
   QT_version: 5.15.2
@@ -228,7 +228,7 @@ jobs:
       - uses: actions/checkout@v4
       #  with:
       #    path: 'DFTFringe'
-      
+
       # copy all files for problem matcher to work
       - name: copy files into build folder (problem matcher workaround)
         run: |
@@ -303,7 +303,7 @@ jobs:
         # suffix will be commit sha 5108ce7c3ac60bec1e0867bb10c4497db67e3606
         run: |
           echo "WORKFLOW_VERSION=${{github.sha}}" >> $env:GITHUB_ENV
-       
+
       - name: Find and Replace MY_AUTOMATED_VERSION_STRING
         run: |
           echo "${{env.WORKFLOW_VERSION}}"
@@ -318,7 +318,7 @@ jobs:
         run: |
           echo "${{env.NOW}}"
           (Get-Content DFTFringe/DFTFringeInstaller/packages/com.githubdoe.DFTFringe/meta/package.xml).replace('MY_AUTOMATED_DATE_STRING', '${{env.NOW}}') | Set-Content DFTFringe/DFTFringeInstaller/packages/com.githubdoe.DFTFringe/meta/package.xml
-          
+
       - run: cd DFTFringe ; ..\${{env.QT_version}}\mingw81_64\bin\qmake.exe
       - run: echo "::add-matcher::.github/matcher/uic_matcher.json"
       - run: cd DFTFringe ; mingw32-make -j4
@@ -359,4 +359,4 @@ jobs:
           path: |
             DFTFringeInstaller_${{env.WORKFLOW_VERSION}}.exe
             DFTFringe.exe.debug
-      
+

README.md

@@ -35,7 +35,7 @@ Additional information and help is availlable at https://groups.io/g/Interferome
 
 ```
 sudo apt update
-sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10
+sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev
 qmake
 make -j4
 ```
@@ -170,11 +170,11 @@ cmake --build ./build_lapack -j4
 
 #### Build Armadillo
 
-Get [Armadillo](https://arma.sourceforge.net/) source code version 12.6.7 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-12.6.7`.
+Get [Armadillo](https://arma.sourceforge.net/) source code version 14.4.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-14.4.0`.
 
 Then from within `C:\buildingDFTFringe` do the following:  
 ```
-cmake -D CMAKE_PREFIX_PATH=C:/buildingDFTFringe/build_lapack -G "MinGW Makefiles" -S armadillo-12.6.7 -B build_armadillo
+cmake -D CMAKE_PREFIX_PATH=C:/buildingDFTFringe/build_lapack -G "MinGW Makefiles" -S armadillo-14.4.0 -B build_armadillo
 cmake --build ./build_armadillo -j4
 ```
 
@@ -196,10 +196,10 @@ No additional modification required here.
 
 #### Build Armadillo
 
-Get [Armadillo](https://arma.sourceforge.net/) source code version 12.6.7 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-12.6.7`.
+Get [Armadillo](https://arma.sourceforge.net/) source code version 14.4.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\armadillo-14.4.0`.
 
 Then follow the information in `DFTFringe.pro` to create appropriate folders for header files and DLLs.  
-Copy content from `armadillo-12.6.7\include` to `build_armadillo\tmp\include`. 
+Copy content from `armadillo-14.4.0\include` to `build_armadillo\tmp\include`. 
 
 #### Copy all the DLLs