Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jst/call stack #27

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ jobs:

- name: copy needed dlls not found by windeployqt
run: |
Copy-Item ".\DFTFringe\Release\DFTFringe.exe.debug" -Destination ".\"
mkdir ".\DFTFringe\DFTFringeInstaller\packages\com.githubdoe.DFTFringe\data"
Copy-Item ".\DFTFringe\Release\DFTFringe.exe" -Destination ".\DFTFringe\DFTFringeInstaller\packages\com.githubdoe.DFTFringe\data"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_calib3d460.dll" -Destination ".\DFTFringe\DFTFringeInstaller\packages\com.githubdoe.DFTFringe\data"
Expand Down Expand Up @@ -388,3 +389,5 @@ jobs:
name: DFTFringe-windows-build-artifact
path: |
DFTFringeInstaller_${{env.WORKFLOW_VERSION}}.exe
DFTFringe.exe.debug

1 change: 1 addition & 0 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ jobs:
generate_release_notes: true
files: |
DFTFringeInstaller_${{github.ref_name}}.exe
DFTFringe.exe.debug
6 changes: 4 additions & 2 deletions DFTFringe.pro
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ win32 {
LIBS += ..\qwt-6.1.6\lib\qwtd.dll # debug
} else {
LIBS += ..\qwt-6.1.6\lib\qwt.dll # release
CONFIG+=force_debug_info # keep debug infos (even in release build) to be able to link stacktrace address to actual function
CONFIG+=separate_debug_info # separate debug infos into a .exe.debug to not grow the .exe
}

# NOTE: RC_FILE is Windows only, breaks Mac (and Linux?) builds if it in their scope.
Expand Down Expand Up @@ -130,9 +132,9 @@ RESOURCES += DFTResources.qrc

TRANSLATIONS += dftfringe_fr.ts

SOURCES += arbitrarywavefronthelp.cpp arbitrarywavwidget.cpp astigscatterplot.cpp astigstatsdlg.cpp astigzoomer.cpp averagewavefrontfilesdlg.cpp batchigramwizard.cpp bathastigdlg.cpp Boundary.cpp camcalibrationreviewdlg.cpp cameracalibwizard.cpp camwizardpage1.cpp ccswappeddlg.cpp circlefit.cpp circleoutline.cpp colorchannel.cpp colorchanneldisplay.cpp colormapviewerdlg.cpp contourplot.cpp contourrulerparams.cpp contourtools.cpp contourview.cpp counterrotationdlg.cpp cpoint.cpp defocusdlg.cpp dftarea.cpp dftcolormap.cpp dftthumb.cpp dfttools.cpp edgeplot.cpp filteroutlinesdlg.cpp foucaultview.cpp generatetargetdlg.cpp gplus.cpp graphicsutilities.cpp helpdlg.cpp igramarea.cpp igramintensity.cpp imagehisto.cpp intensityplot.cpp jitteroutlinedlg.cpp lensdialog.cpp lensetablemodel.cpp main.cpp mainwindow.cpp messagereceiver.cpp metricsdisplay.cpp mikespsirinterface.cpp mirrordlg.cpp myplotpicker.cpp myutils.cpp nullmarginhelpdlg.cpp nullvariationdlg.cpp oglrendered.cpp oglview.cpp outlinedialog.cpp outlinehelpdocwidget.cpp outlineplots.cpp outlinestatsdlg.cpp pdfcalibrationdlg.cpp pixelstats.cpp plotcolor.cpp prefsdlg.cpp profileplot.cpp psfplot.cpp psi_dlg.cpp psiphasedisplay.cpp psiresizeimagesdlg.cpp psitiltoptions.cpp punwrap.cpp regionedittools.cpp rejectedwavefrontsdlg.cpp renamewavefrontdlg.cpp reportdlg.cpp reviewwindow.cpp rmsplot.cpp rotationdlg.cpp savewavedlg.cpp settings2.cpp settingsdebug.cpp settingsdft.cpp settingsGeneral2.cpp settingsigram.cpp settingsprofile.cpp showaliasdlg.cpp showallcontoursdlg.cpp simigramdlg.cpp simulationsview.cpp singleapplication.cpp squareimage.cpp standastigwizard.cpp statsview.cpp subtractwavefronatsdlg.cpp surface3dcontrolsdlg.cpp surfaceanalysistools.cpp surfacegraph.cpp surfacelightingproxy.cpp surfacemanager.cpp surfacepropertiesdlg.cpp transformwavefrontdlg.cpp unwraperrorsview.cpp usercolormapdlg.cpp userdrawnprofiledlg.cpp utilil.cpp videosetupdlg.cpp vortexdebug.cpp wavefront.cpp wavefrontaveragefilterdlg.cpp wavefrontfilterdlg.cpp wavefrontloader.cpp wftexaminer.cpp wftstats.cpp zernikedlg.cpp zernikeeditdlg.cpp zernikeprocess.cpp zernikes.cpp zernikesmoothingdlg.cpp
SOURCES += arbitrarywavefronthelp.cpp arbitrarywavwidget.cpp astigscatterplot.cpp astigstatsdlg.cpp astigzoomer.cpp averagewavefrontfilesdlg.cpp batchigramwizard.cpp bathastigdlg.cpp Boundary.cpp camcalibrationreviewdlg.cpp cameracalibwizard.cpp camwizardpage1.cpp ccswappeddlg.cpp circlefit.cpp circleoutline.cpp colorchannel.cpp colorchanneldisplay.cpp colormapviewerdlg.cpp contourplot.cpp contourrulerparams.cpp contourtools.cpp contourview.cpp counterrotationdlg.cpp cpoint.cpp defocusdlg.cpp dftarea.cpp dftcolormap.cpp dftthumb.cpp dfttools.cpp edgeplot.cpp filteroutlinesdlg.cpp foucaultview.cpp generatetargetdlg.cpp gplus.cpp graphicsutilities.cpp helpdlg.cpp igramarea.cpp igramintensity.cpp imagehisto.cpp intensityplot.cpp jitteroutlinedlg.cpp lensdialog.cpp lensetablemodel.cpp main.cpp mainwindow.cpp messagereceiver.cpp metricsdisplay.cpp mirrordlg.cpp myplotpicker.cpp myutils.cpp nullmarginhelpdlg.cpp nullvariationdlg.cpp oglrendered.cpp oglview.cpp outlinedialog.cpp outlinehelpdocwidget.cpp outlineplots.cpp outlinestatsdlg.cpp pdfcalibrationdlg.cpp pixelstats.cpp plotcolor.cpp prefsdlg.cpp profileplot.cpp psfplot.cpp psi_dlg.cpp psiphasedisplay.cpp psiresizeimagesdlg.cpp psitiltoptions.cpp punwrap.cpp regionedittools.cpp rejectedwavefrontsdlg.cpp renamewavefrontdlg.cpp reportdlg.cpp reviewwindow.cpp rmsplot.cpp rotationdlg.cpp savewavedlg.cpp settings2.cpp settingsdebug.cpp settingsdft.cpp settingsGeneral2.cpp settingsigram.cpp settingsprofile.cpp showaliasdlg.cpp showallcontoursdlg.cpp simigramdlg.cpp simulationsview.cpp singleapplication.cpp squareimage.cpp standastigwizard.cpp statsview.cpp subtractwavefronatsdlg.cpp surface3dcontrolsdlg.cpp surfaceanalysistools.cpp surfacegraph.cpp surfacelightingproxy.cpp surfacemanager.cpp surfacepropertiesdlg.cpp transformwavefrontdlg.cpp unwraperrorsview.cpp usercolormapdlg.cpp userdrawnprofiledlg.cpp utilil.cpp videosetupdlg.cpp vortexdebug.cpp wavefront.cpp wavefrontaveragefilterdlg.cpp wavefrontfilterdlg.cpp wavefrontloader.cpp wftexaminer.cpp wftstats.cpp zernikedlg.cpp zernikeeditdlg.cpp zernikeprocess.cpp zernikes.cpp zernikesmoothingdlg.cpp

HEADERS += arbitrarywavefronthelp.h arbitrarywavwidget.h astigscatterplot.h astigstatsdlg.h astigzoomer.h averagewavefrontfilesdlg.h batchigramwizard.h bathastigdlg.h bezier.h boundary.h camcalibrationreviewdlg.h cameracalibwizard.h camwizardpage1.h ccswappeddlg.h circle.h circleoutline.h circleutils.h colorchannel.h colorchanneldisplay.h colormapviewerdlg.h contourplot.h contourrulerparams.h contourtools.h contourview.h counterrotationdlg.h cpoint.h defocusdlg.h dftarea.h dftcolormap.h dftthumb.h dfttools.h edgeplot.h filteroutlinesdlg.h foucaultview.h generatetargetdlg.h gplus.h graphicsutilities.h helpdlg.h IgramArea.h igramintensity.h imagehisto.h intensityplot.h jitteroutlinedlg.h lensdialog.h lensetablemodel.h mainwindow.h messagereceiver.h metricsdisplay.h mikespsiinterface.h mirrordlg.h myplotpicker.h myutils.h nullmarginhelpdlg.h nullvariationdlg.h oglrendered.h oglview.h outlinedialog.h outlinehelpdocwidget.h outlineplots.h outlinestatsdlg.h pdfcalibrationdlg.h pixelstats.h plotcolor.h prefsdlg.h profileplot.h psfplot.h psi_dlg.h psiphasedisplay.h psiresizeimagesdlg.h psitiltoptions.h punwrap.h regionedittools.h rejectedwavefrontsdlg.h renamewavefrontdlg.h reportdlg.h reviewwindow.h rmsplot.h rotationdlg.h savewavedlg.h settings2.h settingsdebug.h settingsdft.h settingsGeneral2.h settingsigram.h settingsprofile.h showaliasdlg.h showallcontoursdlg.h simigramdlg.h simulationsview.h singleapplication_p.h singleapplication.h spline.h squareimage.h standastigwizard.h statsview.h subtractwavefronatsdlg.h surface3dcontrolsdlg.h surfaceanalysistools.h surfacegraph.h surfacelightingproxy.h surfacemanager.h surfacepropertiesdlg.h transformwavefrontdlg.h unwraperrorsview.h usercolormapdlg.h userdrawnprofiledlg.h utils.h videosetupdlg.h vortex.h vortexdebug.h wavefront.h wavefrontaveragefilterdlg.h wavefrontfilterdlg.h wavefrontloader.h wavefrontstats.h wftexaminer.h wftstats.h zernikedlg.h zernikeeditdlg.h zernikeprocess.h zernikes.h zernikesmoothingdlg.h
HEADERS += arbitrarywavefronthelp.h arbitrarywavwidget.h astigscatterplot.h astigstatsdlg.h astigzoomer.h averagewavefrontfilesdlg.h batchigramwizard.h bathastigdlg.h bezier.h boundary.h camcalibrationreviewdlg.h cameracalibwizard.h camwizardpage1.h ccswappeddlg.h circle.h circleoutline.h circleutils.h colorchannel.h colorchanneldisplay.h colormapviewerdlg.h contourplot.h contourrulerparams.h contourtools.h contourview.h counterrotationdlg.h cpoint.h defocusdlg.h dftarea.h dftcolormap.h dftthumb.h dfttools.h edgeplot.h filteroutlinesdlg.h foucaultview.h generatetargetdlg.h gplus.h graphicsutilities.h helpdlg.h IgramArea.h igramintensity.h imagehisto.h intensityplot.h jitteroutlinedlg.h lensdialog.h lensetablemodel.h mainwindow.h messagereceiver.h metricsdisplay.h mirrordlg.h myplotpicker.h myutils.h nullmarginhelpdlg.h nullvariationdlg.h oglrendered.h oglview.h outlinedialog.h outlinehelpdocwidget.h outlineplots.h outlinestatsdlg.h pdfcalibrationdlg.h pixelstats.h plotcolor.h prefsdlg.h profileplot.h psfplot.h psi_dlg.h psiphasedisplay.h psiresizeimagesdlg.h psitiltoptions.h punwrap.h regionedittools.h rejectedwavefrontsdlg.h renamewavefrontdlg.h reportdlg.h reviewwindow.h rmsplot.h rotationdlg.h savewavedlg.h settings2.h settingsdebug.h settingsdft.h settingsGeneral2.h settingsigram.h settingsprofile.h showaliasdlg.h showallcontoursdlg.h simigramdlg.h simulationsview.h singleapplication_p.h singleapplication.h spline.h squareimage.h standastigwizard.h statsview.h subtractwavefronatsdlg.h surface3dcontrolsdlg.h surfaceanalysistools.h surfacegraph.h surfacelightingproxy.h surfacemanager.h surfacepropertiesdlg.h transformwavefrontdlg.h unwraperrorsview.h usercolormapdlg.h userdrawnprofiledlg.h utils.h videosetupdlg.h vortex.h vortexdebug.h wavefront.h wavefrontaveragefilterdlg.h wavefrontfilterdlg.h wavefrontloader.h wavefrontstats.h wftexaminer.h wftstats.h zernikedlg.h zernikeeditdlg.h zernikeprocess.h zernikes.h zernikesmoothingdlg.h

FORMS += arbitrarywavefronthelp.ui astigstatsdlg.ui averagewavefrontfilesdlg.ui batchigramwizard.ui bathastigdlg.ui camcalibrationreviewdlg.ui cameracalibwizard.ui camwizardpage1.ui ccswappeddlg.ui colorchanneldisplay.ui colormapviewerdlg.ui contourrulerparams.ui contourtools.ui contourview.ui counterrotationdlg.ui defocusdlg.ui dftarea.ui dftthumb.ui dfttools.ui edgeplot.ui filteroutlinesdlg.ui foucaultview.ui generatetargetdlg.ui helpdlg.ui igramintensity.ui jitteroutlinedlg.ui lensdialog.ui mainwindow.ui metricsdisplay.ui mirrordlg.ui nullmarginhelpdlg.ui nullvariationdlg.ui oglrendered.ui outlinedialog.ui outlinehelpdocwidget.ui outlineplots.ui outlinestatsdlg.ui pdfcalibrationdlg.ui pixelstats.ui prefsdlg.ui profilearea.ui profileplot.ui psfplot.ui psi_dlg.ui psiphasedisplay.ui psiresizeimagesdlg.ui psitiltoptions.ui regionedittools.ui rejectedwavefrontsdlg.ui renamewavefrontdlg.ui reportdlg.ui reviewwindow.ui rotationdlg.ui savewavedlg.ui settings2.ui settingsdebug.ui settingsdft.ui settingsGeneral2.ui settingsigram.ui settingsprofile.ui showaliasdlg.ui showallcontoursdlg.ui simigramdlg.ui simulationsview.ui standastigwizard.ui statsview.ui subtractwavefronatsdlg.ui surface3dcontrolsdlg.ui surfaceanalysistools.ui surfacepropertiesdlg.ui transformwavefrontdlg.ui unwraperrorsview.ui usercolormapdlg.ui userdrawnprofiledlg.ui videosetupdlg.ui vortexdebug.ui wavefrontaveragefilterdlg.ui wavefrontfilterdlg.ui wavefrontnulldlg.ui wftexaminer.ui zernikedlg.ui zernikeeditdlg.ui zernikesmoothingdlg.ui

Expand Down
2 changes: 0 additions & 2 deletions DFTFringe_Dale.pro
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ SOURCES += main.cpp\
graphicsutilities.cpp \
dfttools.cpp \
dftarea.cpp \
mikespsirinterface.cpp \
oglrendered.cpp \
pdfcalibrationdlg.cpp \
profileplot.cpp \
Expand Down Expand Up @@ -263,7 +262,6 @@ HEADERS += mainwindow.h \
psi_dlg.h \
psiphasedisplay.h \
outlinedialog.h \
mikespsiinterface.h \
psitiltoptions.h \
contourrulerparams.h \
zernikesmoothingdlg.h
Expand Down
23 changes: 23 additions & 0 deletions boost/LICENSE_1_0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
18 changes: 18 additions & 0 deletions boost/aligned_storage.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//-----------------------------------------------------------------------------
// boost aligned_storage.hpp header file
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002-2003
// Eric Friedman, Itay Maman
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#ifndef BOOST_ALIGNED_STORAGE_HPP
#define BOOST_ALIGNED_STORAGE_HPP

#include <boost/type_traits/aligned_storage.hpp>

#endif // BOOST_ALIGNED_STORAGE_HPP
Loading
Loading