Merge pull request #341 from githubdoe/wfpro

gr5 · web-flow · commit abaa0785203c · 2026-02-08T10:57:18.000-05:00
Added ability to read wavefrontPro wavefront files
diff --git a/.github/workflows/build-linux-clazy.yml b/.github/workflows/build-linux-clazy.yml
@@ -37,6 +37,6 @@ jobs:
       # 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.*|.*bezier.*|.*boost.*|.*SingleApplication.*|.*spdlog.*|.*zernike.*" \
+          export CLAZY_IGNORE_DIRS=".*usr.*|.*bezier.*|.*boost.*|.*SingleApplication.*|.*spdlog.*|.*zernike.*|.*cnpy.*" \
           && export CLAZY_CHECKS="level1,no-connect-by-name,function-args-by-value,function-args-by-ref,incorrect-emit,old-style-connect" \
           && make
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -49,4 +49,4 @@ jobs:
           tidy-checks: '' # rely solely on .clang-tidy file
           tidy-review: true
           passive-reviews: true
-          ignore: 'bezier|boost|SingleApplication|spdlog|zernike|moc_*|ui_*|qwt*'
+          ignore: 'bezier|boost|SingleApplication|spdlog|zernike|cnpy|moc_*|ui_*|qwt*'
diff --git a/DFTFringe.pro b/DFTFringe.pro
@@ -56,6 +56,7 @@ win32 {
     LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_imgcodecs4120
     LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_imgproc4120
     LIBS += -ldbghelp # for SetUnhandledExceptionFilter
+    LIBS += -lz       # zip compression library needed for cnpy.cpp
 
 
     # This is for armadillo to not use wrapper. See https://gitlab.com/conradsnicta/armadillo-code#6-linux-and-macos-compiling-and-linking
@@ -81,6 +82,7 @@ unix: !mac {
     LIBS += -lopencv_imgcodecs
     LIBS += -lopencv_imgproc
     LIBS += -L/usr/local/qwt-6.3.0/lib -lqwt
+    LIBS += -lz       # zip compression library needed for cnpy.cpp
 }
 
 # MAC ##############
@@ -143,7 +145,7 @@ RESOURCES += DFTResources.qrc
 
 TRANSLATIONS += dftfringe_fr.ts
 
-INCLUDEPATH += ./bezier ./SingleApplication ./zernike
+INCLUDEPATH += ./bezier ./SingleApplication ./zernike ./cnpy
 
 SOURCES += SingleApplication/singleapplication.cpp \
     SingleApplication/singleapplication_p.cpp \
@@ -164,6 +166,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     ccswappeddlg.cpp \
     circlefit.cpp \
     circleoutline.cpp \
+    cnpy/cnpy.cpp \
     colorchannel.cpp \
     colorchanneldisplay.cpp \
     colormapviewerdlg.cpp \
@@ -285,6 +288,7 @@ HEADERS += bezier/bezier.h \
     circle.h \
     circleoutline.h \
     circleutils.h \
+    cnpy/cnpy.h \
     colorchannel.h \
     colorchanneldisplay.h \
     colormapviewerdlg.h \
diff --git a/DFTFringe_Dale.pro b/DFTFringe_Dale.pro
@@ -39,6 +39,7 @@ SOURCES += main.cpp \
     mainwindow.cpp \
     igramarea.cpp \
     circleoutline.cpp \
+    cnpy/cnpy.cpp \
     graphicsutilities.cpp \
     dfttools.cpp \
     dftarea.cpp \
@@ -156,6 +157,7 @@ HEADERS  += mainwindow.h \
     edgeplot.h \
     IgramArea.h \
     circleoutline.h \
+    cnpy/cnpy.h \
     graphicsutilities.h \
     dfttools.h \
     dftarea.h \
@@ -266,7 +268,7 @@ HEADERS  += mainwindow.h \
     SingleApplication/singleapplication.h \
     SingleApplication/singleapplication_p.h
 
-INCLUDEPATH += ./bezier ./SingleApplication ./zernike
+INCLUDEPATH += ./bezier ./SingleApplication ./zernike ./cnpy
 
 FORMS    += mainwindow.ui \
     annulushelpdlg.ui \
@@ -378,6 +380,7 @@ LIBS += D:\lapack\build64\bin\liblapack.dll
 LIBS += D:\lapack\build64\bin\libblas.dll
 
 LIBS += -ldbghelp # for SetUnhandledExceptionFilter
+LIBS += -lz       # zip compression library needed for cnpy.cpp
 }
 
 
diff --git a/DFTFringe_QT5.pro b/DFTFringe_QT5.pro
@@ -56,7 +56,7 @@ win32 {
     LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_imgcodecs460
     LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_imgproc460
     LIBS += -ldbghelp # for SetUnhandledExceptionFilter
-
+    LIBS += -lz       # zip compression library needed for cnpy.cpp
 
     # This is for armadillo to not use wrapper. See https://gitlab.com/conradsnicta/armadillo-code#6-linux-and-macos-compiling-and-linking
     DEFINES += ARMA_DONT_USE_WRAPPER
@@ -80,6 +80,8 @@ unix: !mac {
     LIBS += -lopencv_imgproc
     LIBS += -lopencv_imgproc
     LIBS += -lqwt-qt5
+    LIBS += -lz       # zip compression library needed for cnpy.cpp
+
 }
 
 # MAC ##############
@@ -142,7 +144,7 @@ RESOURCES += DFTResources.qrc
 
 TRANSLATIONS += dftfringe_fr.ts
 
-INCLUDEPATH += ./bezier ./SingleApplication ./zernike
+INCLUDEPATH += ./bezier ./SingleApplication ./zernike ./cnpy
 
 SOURCES += SingleApplication/singleapplication.cpp \
     SingleApplication/singleapplication_p.cpp \
@@ -163,6 +165,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     ccswappeddlg.cpp \
     circlefit.cpp \
     circleoutline.cpp \
+    cnpy/cnpy.cpp \
     colorchannel.cpp \
     colorchanneldisplay.cpp \
     colormapviewerdlg.cpp \
@@ -284,6 +287,7 @@ HEADERS += bezier/bezier.h \
     circle.h \
     circleoutline.h \
     circleutils.h \
+    cnpy/cnpy.h \
     colorchannel.h \
     colorchanneldisplay.h \
     colormapviewerdlg.h \
diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
@@ -15,6 +15,9 @@ Copyright (C) 2016 Gabi Melman.
 zernike (zapm.cpp)
 Copyright (C) 2022 Michael Peck
 
+cnpy (cnpy.h cnpy.cpp)
+Copyright (c) Carl Rogers, 2011
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/RevisionHistory.html b/RevisionHistory.html
@@ -10,6 +10,14 @@
     <h1>DFTFringe Version History</h1>
     <ul>
 
+        <li>Version 8.4.0</li>
+        <ul>
+            <li>Ronchi and Foucault displays have new circular grid feature to measure zones better (right click on ronchi)</li>
+            <li>Ronchi compare now has blink mode that switches between 2 ronchis (first select at least 2 ronchis, then right click on the ronchi view, then select "compare" button, then "blink" button)</li>
+            <li>Can read Wavefront Pro format wavefront files (.npz files)</li>
+            <li>Fixed bug in subtract wavefront feature introduced in version 7.4.0 where sometimes it subtracts the wrong wavefront (but correctly showed you what it did on the right side).  Bug happened on A-B if B is farther down in the wavefront list than A.</li>
+        </ul>
+
         <li>Version 8.3.2</li>
         <ul>
             <li>Fixed bug introduced in 8.3.1 in Ronchi Foucault where it was always doing autocollimate mode</li>
diff --git a/cnpy/LICENSE.txt b/cnpy/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) Carl Rogers, 2011
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/cnpy/cnpy.cpp b/cnpy/cnpy.cpp
diff --git a/cnpy/cnpy.h b/cnpy/cnpy.h
diff --git a/mainwindow.cpp b/mainwindow.cpp
diff --git a/surfacemanager.cpp b/surfacemanager.cpp
