diff --git a/DFTFringe.pro b/DFTFringe.pro index ae8265c5..0cbbac1d 100644 --- a/DFTFringe.pro +++ b/DFTFringe.pro @@ -154,8 +154,7 @@ SOURCES += SingleApplication/singleapplication.cpp \ astigpolargraph.cpp \ astigscatterplot.cpp \ astigstatsdlg.cpp \ - astigzoomer.cpp \ - autoinvertdlg.cpp \ + autoinvertdlg.cpp \ averagewavefrontfilesdlg.cpp \ batchigramwizard.cpp \ bathastigdlg.cpp \ @@ -191,7 +190,6 @@ SOURCES += SingleApplication/singleapplication.cpp \ imagehisto.cpp \ intensityplot.cpp \ jitteroutlinedlg.cpp \ - lensdialog.cpp \ lensetablemodel.cpp \ main.cpp \ mainwindow.cpp \ @@ -217,17 +215,14 @@ SOURCES += SingleApplication/singleapplication.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 \ @@ -239,7 +234,6 @@ SOURCES += SingleApplication/singleapplication.cpp \ showallcontoursdlg.cpp \ simigramdlg.cpp \ simulationsview.cpp \ - squareimage.cpp \ standastigwizard.cpp \ statsview.cpp \ subtractwavefronatsdlg.cpp \ @@ -248,18 +242,15 @@ SOURCES += SingleApplication/singleapplication.cpp \ surfacegraph.cpp \ surfacelightingproxy.cpp \ surfacemanager.cpp \ - surfacepropertiesdlg.cpp \ transformwavefrontdlg.cpp \ unwraperrorsview.cpp \ usercolormapdlg.cpp \ userdrawnprofiledlg.cpp \ - utilil.cpp \ - videosetupdlg.cpp \ + utils.cpp \ vortexdebug.cpp \ wavefront.cpp \ wavefrontaveragefilterdlg.cpp \ wavefrontfilterdlg.cpp \ - wavefrontloader.cpp \ wftexaminer.cpp \ wftstats.cpp \ zernikedlg.cpp \ @@ -279,8 +270,7 @@ HEADERS += bezier/bezier.h \ arbitrarywavwidget.h \ astigscatterplot.h \ astigstatsdlg.h \ - astigzoomer.h \ - autoinvertdlg.h \ + autoinvertdlg.h \ averagewavefrontfilesdlg.h \ batchigramwizard.h \ bathastigdlg.h \ @@ -317,7 +307,6 @@ HEADERS += bezier/bezier.h \ imagehisto.h \ intensityplot.h \ jitteroutlinedlg.h \ - lensdialog.h \ lensetablemodel.h \ mainwindow.h \ messagereceiver.h \ @@ -343,17 +332,14 @@ HEADERS += bezier/bezier.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 \ @@ -365,7 +351,6 @@ HEADERS += bezier/bezier.h \ showallcontoursdlg.h \ simigramdlg.h \ simulationsview.h \ - squareimage.h \ standastigwizard.h \ statsview.h \ subtractwavefronatsdlg.h \ @@ -374,19 +359,15 @@ HEADERS += bezier/bezier.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 \ wftexaminer.h \ wftstats.h \ zernikedlg.h \ @@ -400,7 +381,7 @@ FORMS += arbitrarywavefronthelp.ui \ annulushelpdlg.ui \ astigpolargraph.ui \ astigstatsdlg.ui \ - autoinvertdlg.ui \ + autoinvertdlg.ui \ averagewavefrontfilesdlg.ui \ batchigramwizard.ui \ bathastigdlg.ui \ @@ -426,7 +407,6 @@ FORMS += arbitrarywavefronthelp.ui \ hotkeysdlg.ui \ igramintensity.ui \ jitteroutlinedlg.ui \ - lensdialog.ui \ mainwindow.ui \ metricsdisplay.ui \ mirrordlg.ui \ @@ -440,20 +420,16 @@ FORMS += arbitrarywavefronthelp.ui \ pdfcalibrationdlg.ui \ percentcorrectiondlg.ui \ pixelstats.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 \ @@ -470,16 +446,13 @@ FORMS += arbitrarywavefronthelp.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 \ @@ -563,7 +536,6 @@ DISTFILES += buildingDFTFringe64.txt \ ColorMaps/spring.cmp \ COPYING.LESSER.txt \ COPYING.txt \ - helptext.txt \ README.md \ RevisionHistory.html diff --git a/DFTFringe_Dale.pro b/DFTFringe_Dale.pro index 7da7e88b..4161fd6b 100644 --- a/DFTFringe_Dale.pro +++ b/DFTFringe_Dale.pro @@ -47,7 +47,6 @@ SOURCES += main.cpp \ percentcorrectiondlg.cpp \ profileplot.cpp \ profileplotpicker.cpp \ - psiresizeimagesdlg.cpp \ settingsigramimportconfig.cpp \ surface3dcontrolsdlg.cpp \ surfacegraph.cpp \ @@ -66,10 +65,8 @@ SOURCES += main.cpp \ zernikes.cpp \ metricsdisplay.cpp \ reviewwindow.cpp \ - wavefrontloader.cpp \ rotationdlg.cpp \ wftstats.cpp \ - surfacepropertiesdlg.cpp \ imagehisto.cpp \ colorchanneldisplay.cpp \ intensityplot.cpp \ @@ -79,7 +76,6 @@ SOURCES += main.cpp \ simigramdlg.cpp \ punwrap.cpp \ wftexaminer.cpp \ - savewavedlg.cpp \ usercolormapdlg.cpp \ colormapviewerdlg.cpp \ oglview.cpp \ @@ -92,7 +88,6 @@ SOURCES += main.cpp \ psfplot.cpp \ standastigwizard.cpp \ counterrotationdlg.cpp \ - renamewavefrontdlg.cpp \ subtractwavefronatsdlg.cpp \ helpdlg.cpp \ settingsprofile.cpp \ @@ -103,7 +98,6 @@ SOURCES += main.cpp \ nullvariationdlg.cpp \ ccswappeddlg.cpp \ foucaultview.cpp \ - squareimage.cpp \ bathastigdlg.cpp \ zernikeeditdlg.cpp \ settingsGeneral2.cpp \ @@ -115,22 +109,19 @@ SOURCES += main.cpp \ generatetargetdlg.cpp \ lensetablemodel.cpp \ unwraperrorsview.cpp \ - lensdialog.cpp \ messagereceiver.cpp \ myutils.cpp \ pixelstats.cpp \ - utilil.cpp \ + utils.cpp \ circlefit.cpp \ astigstatsdlg.cpp \ averagewavefrontfilesdlg.cpp \ - astigzoomer.cpp \ astigscatterplot.cpp \ wavefrontfilterdlg.cpp \ myplotpicker.cpp \ rmsplot.cpp \ regionedittools.cpp \ reportdlg.cpp \ - videosetupdlg.cpp \ showaliasdlg.cpp \ colorchannel.cpp \ wavefrontaveragefilterdlg.cpp \ @@ -171,7 +162,6 @@ HEADERS += mainwindow.h \ percentcorrectiondlg.h \ profileplot.h \ profileplotpicker.h \ - psiresizeimagesdlg.h \ settingsigramimportconfig.h \ surface3dcontrolsdlg.h \ surfacegraph.h \ @@ -190,11 +180,8 @@ HEADERS += mainwindow.h \ zernikes.h \ metricsdisplay.h \ reviewwindow.h \ - vortex.h \ - wavefrontloader.h \ rotationdlg.h \ wftstats.h \ - surfacepropertiesdlg.h \ punwrap.h \ imagehisto.h \ colorchanneldisplay.h \ @@ -204,7 +191,6 @@ HEADERS += mainwindow.h \ vortexdebug.h \ simigramdlg.h \ wftexaminer.h \ - savewavedlg.h \ usercolormapdlg.h \ colormapviewerdlg.h \ oglview.h \ @@ -217,7 +203,6 @@ HEADERS += mainwindow.h \ psfplot.h \ standastigwizard.h \ counterrotationdlg.h \ - renamewavefrontdlg.h \ subtractwavefronatsdlg.h \ helpdlg.h \ settingsprofile.h \ @@ -228,7 +213,6 @@ HEADERS += mainwindow.h \ nullvariationdlg.h \ ccswappeddlg.h \ foucaultview.h \ - squareimage.h \ bathastigdlg.h \ zernikeeditdlg.h \ settingsGeneral2.h \ @@ -240,7 +224,6 @@ HEADERS += mainwindow.h \ generatetargetdlg.h \ lensetablemodel.h \ unwraperrorsview.h \ - lensdialog.h \ messagereceiver.h \ myutils.h \ pixelstats.h \ @@ -249,14 +232,12 @@ HEADERS += mainwindow.h \ circle.h \ astigstatsdlg.h \ averagewavefrontfilesdlg.h \ - astigzoomer.h \ astigscatterplot.h \ wavefrontfilterdlg.h \ myplotpicker.h \ rmsplot.h \ regionedittools.h \ reportdlg.h \ - videosetupdlg.h \ showaliasdlg.h \ colorchannel.h \ wavefrontaveragefilterdlg.h \ @@ -292,10 +273,8 @@ FORMS += mainwindow.ui \ oglrendered.ui \ pdfcalibrationdlg.ui \ percentcorrectiondlg.ui \ - profilearea.ui \ profileplot.ui \ contourtools.ui \ - psiresizeimagesdlg.ui \ settingsigramimportconfig.ui \ surface3dcontrolsdlg.ui \ surfaceanalysistools.ui \ @@ -303,17 +282,14 @@ FORMS += mainwindow.ui \ userdrawnprofiledlg.ui \ zernikedlg.ui \ mirrordlg.ui \ - wavefrontnulldlg.ui \ reviewwindow.ui \ rotationdlg.ui \ - surfacepropertiesdlg.ui \ colorchanneldisplay.ui \ igramintensity.ui \ dftthumb.ui \ vortexdebug.ui \ simigramdlg.ui \ wftexaminer.ui \ - savewavedlg.ui \ usercolormapdlg.ui \ colormapviewerdlg.ui \ settingsigram.ui \ @@ -325,7 +301,6 @@ FORMS += mainwindow.ui \ psfplot.ui \ standastigwizard.ui \ counterrotationdlg.ui \ - renamewavefrontdlg.ui \ subtractwavefronatsdlg.ui \ helpdlg.ui \ settingsprofile.ui \ @@ -345,14 +320,12 @@ FORMS += mainwindow.ui \ camcalibrationreviewdlg.ui \ generatetargetdlg.ui \ unwraperrorsview.ui \ - lensdialog.ui \ pixelstats.ui \ astigstatsdlg.ui \ averagewavefrontfilesdlg.ui \ wavefrontfilterdlg.ui \ regionedittools.ui \ reportdlg.ui \ - videosetupdlg.ui \ showaliasdlg.ui \ wavefrontaveragefilterdlg.ui \ rejectedwavefrontsdlg.ui \ @@ -434,7 +407,6 @@ DEFINES += QAPPLICATION_CLASS=QApplication DEFINES += DALE_DO_NOT_LOG DISTFILES += \ buildingDFTFringe64.txt \ - helptext.txt \ ColorMaps/Dale1.cmp \ ColorMaps/Dale2.cmp \ ColorMaps/Dale3.cmp \ diff --git a/DFTFringe_QT5.pro b/DFTFringe_QT5.pro index d62f24e3..fa205d97 100644 --- a/DFTFringe_QT5.pro +++ b/DFTFringe_QT5.pro @@ -153,7 +153,6 @@ SOURCES += SingleApplication/singleapplication.cpp \ astigpolargraph.cpp \ astigscatterplot.cpp \ astigstatsdlg.cpp \ - astigzoomer.cpp \ autoinvertdlg.cpp \ averagewavefrontfilesdlg.cpp \ batchigramwizard.cpp \ @@ -190,7 +189,6 @@ SOURCES += SingleApplication/singleapplication.cpp \ imagehisto.cpp \ intensityplot.cpp \ jitteroutlinedlg.cpp \ - lensdialog.cpp \ lensetablemodel.cpp \ main.cpp \ mainwindow.cpp \ @@ -216,17 +214,14 @@ SOURCES += SingleApplication/singleapplication.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 \ @@ -238,7 +233,6 @@ SOURCES += SingleApplication/singleapplication.cpp \ showallcontoursdlg.cpp \ simigramdlg.cpp \ simulationsview.cpp \ - squareimage.cpp \ standastigwizard.cpp \ statsview.cpp \ subtractwavefronatsdlg.cpp \ @@ -247,18 +241,15 @@ SOURCES += SingleApplication/singleapplication.cpp \ surfacegraph.cpp \ surfacelightingproxy.cpp \ surfacemanager.cpp \ - surfacepropertiesdlg.cpp \ transformwavefrontdlg.cpp \ unwraperrorsview.cpp \ usercolormapdlg.cpp \ userdrawnprofiledlg.cpp \ - utilil.cpp \ - videosetupdlg.cpp \ + utils.cpp \ vortexdebug.cpp \ wavefront.cpp \ wavefrontaveragefilterdlg.cpp \ wavefrontfilterdlg.cpp \ - wavefrontloader.cpp \ wftexaminer.cpp \ wftstats.cpp \ zernikedlg.cpp \ @@ -278,7 +269,6 @@ HEADERS += bezier/bezier.h \ arbitrarywavwidget.h \ astigscatterplot.h \ astigstatsdlg.h \ - astigzoomer.h \ autoinvertdlg.h \ averagewavefrontfilesdlg.h \ batchigramwizard.h \ @@ -316,7 +306,6 @@ HEADERS += bezier/bezier.h \ imagehisto.h \ intensityplot.h \ jitteroutlinedlg.h \ - lensdialog.h \ lensetablemodel.h \ mainwindow.h \ messagereceiver.h \ @@ -342,17 +331,14 @@ HEADERS += bezier/bezier.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 \ @@ -364,7 +350,6 @@ HEADERS += bezier/bezier.h \ showallcontoursdlg.h \ simigramdlg.h \ simulationsview.h \ - squareimage.h \ standastigwizard.h \ statsview.h \ subtractwavefronatsdlg.h \ @@ -373,19 +358,15 @@ HEADERS += bezier/bezier.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 \ wftexaminer.h \ wftstats.h \ zernikedlg.h \ @@ -425,7 +406,6 @@ FORMS += arbitrarywavefronthelp.ui \ hotkeysdlg.ui \ igramintensity.ui \ jitteroutlinedlg.ui \ - lensdialog.ui \ mainwindow.ui \ metricsdisplay.ui \ mirrordlg.ui \ @@ -439,20 +419,16 @@ FORMS += arbitrarywavefronthelp.ui \ pdfcalibrationdlg.ui \ percentcorrectiondlg.ui \ pixelstats.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 \ @@ -469,16 +445,13 @@ FORMS += arbitrarywavefronthelp.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 \ @@ -562,7 +535,6 @@ DISTFILES += buildingDFTFringe64.txt \ ColorMaps/spring.cmp \ COPYING.LESSER.txt \ COPYING.txt \ - helptext.txt \ README.md \ RevisionHistory.html diff --git a/How to Build DFTFringe.pdf b/How to Build DFTFringe.pdf deleted file mode 100644 index 883963c7..00000000 Binary files a/How to Build DFTFringe.pdf and /dev/null differ diff --git a/arbitrarywavwidget.cpp b/arbitrarywavwidget.cpp index aa806e0f..110bc364 100644 --- a/arbitrarywavwidget.cpp +++ b/arbitrarywavwidget.cpp @@ -45,11 +45,6 @@ void ArbitraryWavWidget::showPrepare() { update(); // redraw } -void ArbitraryWavWidget::setMode(int _mode) { - mode = _mode; - update(); // redraw - } - ArbitraryWavWidget::~ArbitraryWavWidget(){ pts.empty(); } @@ -754,7 +749,7 @@ void ArbitraryWavWidget::prepare(int size) { wf_array[index] = p.y; } } - + // fill in leading points with first filled value int first_valid_entry; for(first_valid_entry=0; first_valid_entry=0; last_valid_entry--) @@ -770,7 +765,7 @@ void ArbitraryWavWidget::prepare(int size) { break; for (int i=last_valid_entry+1; i < wf_array_size; i++) wf_array[i] = wf_array[last_valid_entry]; - + // now fill in gaps with interpolated values for (int i=0; i -#include -#include -#include -#include - -astigZoomer::astigZoomer( QWidget *canvas, QwtPlot * plot ): - QwtPlotZoomer( canvas ),mPlot(plot) -{ - setRubberBandPen( QPen( Qt::lightGray ) ); - setTrackerMode( QwtPlotPicker::AlwaysOn ); -} - - -QwtText astigZoomer::trackerTextF( const QPointF &p ) const -{ - - QString s(""); - const QwtScaleMap xMap = mPlot->canvasMap(2); - const QwtScaleMap yMap = mPlot->canvasMap(QwtPlot::yLeft); - - const double cx = xMap.transform( p.x()); - const double cy = yMap.transform(p.y()); - - const QwtPlotItemList& itmList = mPlot->itemList(); - for ( QwtPlotItemIterator it = itmList.begin(); - it != itmList.end(); ++it ) - { - if (( *it )->rtti() == QwtPlotItem::Rtti_PlotMarker){ - QwtPlotMarker *mark = static_cast( *it ); - QPointF pm = mark->value(); - - double delx = cx - xMap.transform(pm.x()); - double dely = cy - yMap.transform(pm.y()); - double r = qSqrt(delx * delx + dely * dely); - if (r < 4) { - s = mark->title().text(); - break; - } - } - } - - QwtText text( s ); - text.setColor( Qt::black ); - text.setFont(QFont("Arial",12)); - - QColor c = rubberBandPen().color(); - text.setBorderPen( QPen( c ) ); - text.setBorderRadius( 6 ); - c.setAlpha( 170 ); - text.setBackgroundBrush( c ); - - return text; -} diff --git a/astigzoomer.h b/astigzoomer.h deleted file mode 100644 index 1ec6b8f6..00000000 --- a/astigzoomer.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ASTIGZOOMER_H -#define ASTIGZOOMER_H - -#include -#include -class QwtPlot; -class astigZoomer: public QwtPlotZoomer -{ -public: - QwtPlot * mPlot; - explicit astigZoomer( QWidget *canvas, QwtPlot * plot ); - - -protected: - QwtText trackerTextF( const QPointF &p ) const; - -}; - -#endif // ASTIGZOOMER_H diff --git a/batchigramwizard.cpp b/batchigramwizard.cpp index 69dea17a..8efc9435 100644 --- a/batchigramwizard.cpp +++ b/batchigramwizard.cpp @@ -25,7 +25,7 @@ QLabel *batchIgramWizard::memStatus = 0; QCheckBox *batchIgramWizard::makeReviewAvi = 0; QString batchIgramWizard::reviewFileName; QCheckBox *batchIgramWizard::autoOutlineCenter = 0; -QCheckBox *batchIgramWizard::autoOutlineOutside = 0; +//QCheckBox *batchIgramWizard::autoOutlineOutside = 0; batchIgramWizard::batchIgramWizard(const QStringList &files, QWidget *parent, Qt::WindowFlags flags) : QWizard(parent, flags), @@ -250,9 +250,7 @@ void batchIntro::on_filter(bool flag){ } } } -bool batchIntro::shouldFilterFile(double rms){ - return (filterFile && rms > filterRms); -} + bool batchIntro::shouldFilterWavefront(double rms){ return (filterWavefront && rms > filterRms); } diff --git a/buildingDFTFringe64.txt b/buildingDFTFringe64.txt deleted file mode 100644 index cbe95db1..00000000 --- a/buildingDFTFringe64.txt +++ /dev/null @@ -1,16 +0,0 @@ -install cmake -Set cmake into system path -Set Qt\tools\bin into system path -Set Qt\Tools\mingw810_64\x86_64-w64-mingw32\bin into system path -build OpenCV - use CMake - set source to be OpenCV directory, set bin directory, set mingw Makefiles as generator - configure then configure again - generate - change to bin directory and type mingw32-make -j4 - -install QWT source - use Qt to build Qwt from it's .pro file. -instal Qwt into path -build libblas -build lpack -build DFTFringe using Qt creator using it's .pro file. diff --git a/contourview.cpp b/contourview.cpp index ee302c42..0b51f56e 100644 --- a/contourview.cpp +++ b/contourview.cpp @@ -100,35 +100,7 @@ void contourView::on_pushButton_pressed() { emit showAllContours(); } -#include -#include -cv::Mat orientationMap(const cv::Mat& mag, const cv::Mat& ori, double thresh = 1.0) -{ - cv::Mat oriMap = cv::Mat::zeros(ori.size(), CV_8UC3); - cv::Vec3b red(0, 0, 255); - cv::Vec3b cyan(255, 255, 0); - cv::Vec3b green(0, 255, 0); - cv::Vec3b yellow(0, 255, 255); - for(int i = 0; i < mag.rows*mag.cols; i++) - { - float* magPixel = reinterpret_cast(mag.data + i*sizeof(float)); - if(*magPixel > thresh) - { - float* oriPixel = reinterpret_cast(ori.data + i*sizeof(float)); - cv::Vec3b* mapPixel = reinterpret_cast(oriMap.data + i*3*sizeof(char)); - if(*oriPixel < 90.0) - *mapPixel = red; - else if(*oriPixel >= 90.0 && *oriPixel < 180.0) - *mapPixel = cyan; - else if(*oriPixel >= 180.0 && *oriPixel < 270.0) - *mapPixel = green; - else if(*oriPixel >= 270.0 && *oriPixel < 360.0) - *mapPixel = yellow; - } - } - return oriMap; -} void contourView::on_histogram_clicked() { ps->show(); diff --git a/dftarea.cpp b/dftarea.cpp index de5ae2ea..dff592d2 100644 --- a/dftarea.cpp +++ b/dftarea.cpp @@ -18,7 +18,6 @@ #include "dftarea.h" #include "ui_dftarea.h" #include "dfttools.h" -#include "vortex.h" #include #include "punwrap.h" #include "zernikeprocess.h" @@ -1177,7 +1176,7 @@ void DFTArea::doPSIstep3(){ } -#include "psiresizeimagesdlg.h" + cv::Mat DFTArea::PSILoadFullImages(){ int cnt = 0; cv::Mat data; diff --git a/dftcolormap.cpp b/dftcolormap.cpp index 836550da..0786ea6a 100644 --- a/dftcolormap.cpp +++ b/dftcolormap.cpp @@ -24,9 +24,6 @@ QList dftColorMap::userStops; -void dftColorMap::setUserStops(QList &stops) { - dftColorMap::userStops = stops; -} dftColorMap::dftColorMap(int type, wavefront *wf, bool zeroBased, double errorMargin, double scale, diff --git a/dftcolormap.h b/dftcolormap.h index 1f6998bc..43d7d69b 100644 --- a/dftcolormap.h +++ b/dftcolormap.h @@ -28,7 +28,6 @@ class dftColorMap: public QwtLinearColorMap double errorMargin = .125, double scale = 1., QColor less = Qt::black, QColor more = Qt::white); void setRange(double low, double high); - static void setUserStops(QList &stops); wavefront *m_wf; static QList userStops; }; diff --git a/dftfringe_fr.ts b/dftfringe_fr.ts index 81bf2348..e6b0dc93 100644 --- a/dftfringe_fr.ts +++ b/dftfringe_fr.ts @@ -1194,39 +1194,6 @@ - - SaveWaveDlg - - - Dialog - - - - - Browse - - - - - Normal - - - - - Nulled - - - - - Write wave font file - - - - - wft (*.wft) - - - Settings2 @@ -2172,79 +2139,6 @@ Try it and if you find no difference in wavefront values then you do not need to - - lensDialog - - - Lens parameters - - - - - Lens Name - - - - - Lens Distortion Matrix - - - - - K1 - - - - - K2 - - - - - P1 - - - - - P2 - - - - - K3 - - - - - K - - - - - Camera Matrix - - - - - Y Focal Length pixels - - - - - X center pixel - - - - - Y center pixel - - - - - X Focal Length pixels - - - makeAverages @@ -2776,14 +2670,6 @@ p, li { white-space: pre-wrap; } - - profileArea - - - Form - - - psfPlot @@ -2815,19 +2701,6 @@ p, li { white-space: pre-wrap; } - - renameWavefrontDlg - - - Rename Wavefront - - - - - Enter new wavefront name: - - - reviewWindow @@ -3460,97 +3333,6 @@ p, li { white-space: pre-wrap; } - - surfacePropertiesDlg - - - 3D surface lighting and material properties - - - - - Lighting properties - - - - - X - - - - - Y - - - - - Z - - - - - - Ambient - - - - - - Diffuse - - - - - - Specular: - - - - - Surface Properties - - - - - shine - - - - - Emission - - - - - Predefined - - - - - Plastic - - - - - Satin - - - - - Brushed Metal - - - - - Ceramic - - - - - Matt - - - unwrapErrorsView @@ -3683,39 +3465,6 @@ p, li { white-space: pre-wrap; } - - videoSetupDlg - - - Video setup - - - - - angle per step - - - - - Frames per Second - - - - - Full Size - - - - - Size - - - - - X - - - vortexDebug @@ -3769,19 +3518,6 @@ p, li { white-space: pre-wrap; } - - waveFrontNullDlg - - - Wavefront Null Enables - - - - - <html><head/><body><p>Specifies what to remove from the wavefront. Normally this is the first 8 Zernike terms.</p><p>Except the x and y astig.</p></body></html> - - - wavefrontFilterDlg @@ -3794,7 +3530,7 @@ p, li { white-space: pre-wrap; } You can set a RMS threshold that will delete any loaded wavefronts and optionally any saved wavefronts that have RMS values over the threshold. -You can hover the mouse over a dot on the plots to see the wavefront name. +You can hover the mouse over a dot on the plots to see the wavefront name. You can click on the dot and it will be set as the current displayed wavefront. diff --git a/dfttools.cpp b/dfttools.cpp index 4dc607a6..c2d0ee76 100644 --- a/dfttools.cpp +++ b/dfttools.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "dfttools.h" #include "ui_dfttools.h" -#include "vortex.h" #include #include "settings2.h" #include "dftarea.h" diff --git a/foucaultview.cpp b/foucaultview.cpp index 70b6ab43..ff3c3df4 100644 --- a/foucaultview.cpp +++ b/foucaultview.cpp @@ -662,14 +662,6 @@ void foucaultView::on_SaveImageCB_clicked(bool checked) if (!dir.isEmpty()) imageDir = dir; } -bool foucaultView::saveOnlyFoucault(){ - return ui->saveOnlyFouccault->isChecked(); -} - -void foucaultView::on_saveOnlyFouccault_clicked(bool /*checked*/) -{ - -} void foucaultView::on_overlayProfile_stateChanged(int /*arg1*/) { diff --git a/foucaultview.h b/foucaultview.h index 446f7064..23e4be92 100644 --- a/foucaultview.h +++ b/foucaultview.h @@ -68,8 +68,6 @@ private slots: void on_SaveImageCB_clicked(bool checked); - void on_saveOnlyFouccault_clicked(bool checked); - void saveRonchiImage(); void saveFoucaultImage(); diff --git a/helptext.txt b/helptext.txt deleted file mode 100644 index 7f59263d..00000000 --- a/helptext.txt +++ /dev/null @@ -1,100 +0,0 @@ - /* how to make a gif player - QMovie *movie = new QMovie("C:\\Users\\DOE\\Videos\\a.gif"); - QLabel *processLabel = new QLabel(this); - processLabel->setMovie(movie); - movie->start(); - */ - -Quick overview - Why a new version of OpenFringe - To be able to modify it using modern software tools. - What is DFTFringe - Successor to OpenFringe with modern Uers interface. - Focuses on the most used Features of OpenFringe. - New features - stats. - - -Quick start Guide. - Setup the Mirror data in the MirrorDialog. - Load an interferogram. - Outline it - Analyze it. - -Mirror dialog in depth. -Outlining mirror in depth. - mouse - zoom - undo - crop/not crop - -New features in Depth. - -Using DFTFringe to inspect interferogram intensity and gamma correction effects. - -DFTFringe has tools to help you determine the right exposue for your interferograms. -SO first off lets make a well exposed interferogram of a perfect mirror. -Go to the simulations view and make an igram. -We can look at an intensity plot across the igram. -See that the intensity has a sinusodal variation. -Use the compass knob to vary to change the angle of the sample diameter. - -We can also look at each color channel. In this case only the red channel has any information. -A interferogram taken with a red laser should look similar. - -If we turn on the DFT thumb nail display we can see the DFT used by the program to analyze the surface. -We can see the 2 sidelobes look nice without any extra ones outside of them. - -Ok now lets load a real world interferogram taken with a web cam and that was over exposed. - -Here we see that the red channel is completly maxed out and information spills over into the -other color channels. - -There are some other intersting things in this plot that I will come back -to later when I discuss Gamma correction. - -Now lets look at a few other interferograms. - - - - - - -Hello I'm Dale Eason and this is a Quick start guide for DFT Fringe the successor to OpenFringe. - -If you are fimiliar with OPenFringe then a lot of this will be familiar to you. However some -things work differently so I hope it will be useful to you as well. - -For detailed info on each of the steps see other help videos. - -DFTfringe is a program used to anayze interferograms of Telescope Optics - -I assume you alaready have interferograms stored as images on your computer. - -So lets get started. - -First input the mirror and laser data using the configuration dialog. Here is an example I already filled out. - -Second Open an interferogram and outline the mirror in it. - -Outlining is a bit easier than in OPenFringe I think. - -When the outline is complete press the done button. - -At this point you can simply press the "Compute surface button." - -Now you have your first anlaysis completed. - - -See the other videos for more information. - -Thank you for watching and happy analizing. - - - - - - - - - diff --git a/lensdialog.cpp b/lensdialog.cpp deleted file mode 100644 index b396c26b..00000000 --- a/lensdialog.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "lensdialog.h" -#include "ui_lensdialog.h" - -lensDialog::lensDialog(QStringList parms, QWidget *parent) : - QDialog(parent),m_parms(parms), - ui(new Ui::lensDialog) -{ - ui->setupUi(this); - ui->name->setText(parms[0]); - ui->xFv->setText(parms[1]); - ui->yFv->setText(parms[2]); - ui->XFc->setText(parms[3]); - ui->YFc->setText(parms[4]); - ui->K1->setText(parms[5]); - ui->K2->setText(parms[6]); - ui->P1->setText(parms[7]); - ui->P2->setText(parms[8]); - ui->K3->setText(parms[9]); -} - -lensDialog::~lensDialog() -{ - delete ui; -} - -void lensDialog::on_buttonBox_accepted() -{ - m_parms << ui->name->text(); - m_parms << "\n"; - m_parms << ui->xFv->text() + "\n"; - m_parms << ui->yFv->text() + "\n"; - m_parms << ui->XFc->text() + "\n"; - m_parms << ui->YFc->text() + "\n"; - m_parms << ui->K1->text() + "\n"; - m_parms << ui->K2->text() + "\n"; - m_parms << ui->P1->text() + "\n"; - m_parms << ui->P2->text() + "\n"; - m_parms << ui->K3->text() + "\n"; -} diff --git a/lensdialog.h b/lensdialog.h deleted file mode 100644 index c994cfff..00000000 --- a/lensdialog.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef LENSDIALOG_H -#define LENSDIALOG_H - -#include -#include -namespace Ui { -class lensDialog; -} - -class lensDialog : public QDialog -{ - Q_OBJECT - -public: - explicit lensDialog(QStringList parms, QWidget *parent = 0); - ~lensDialog(); - QStringList m_parms; - -private slots: - void on_buttonBox_accepted(); - -private: - Ui::lensDialog *ui; -}; - -#endif // LENSDIALOG_H diff --git a/lensdialog.ui b/lensdialog.ui deleted file mode 100644 index 85c82afa..00000000 --- a/lensdialog.ui +++ /dev/null @@ -1,190 +0,0 @@ - - - lensDialog - - - - 0 - 0 - 524 - 265 - - - - Lens parameters - - - - - - - - Lens Name - - - - - - - - - - - - Lens Distortion Matrix - - - - - - K1 - - - - - - - - - - K2 - - - - - - - - - - P1 - - - - - - - - - - P2 - - - - - - - - - - K3 - - - - - - - K - - - - - - - - - - Camera Matrix - - - - - - Y Focal Length pixels - - - - - - - - - - X center pixel - - - - - - - - - - Y center pixel - - - - - - - - - - X Focal Length pixels - - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - lensDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - lensDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/mainwindow.h b/mainwindow.h index 5e13be61..59533e4d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -35,7 +35,6 @@ #include "metricsdisplay.h" #include "reviewwindow.h" #include "settings2.h" -#include "wavefrontloader.h" #include "colorchanneldisplay.h" #include "igramintensity.h" #include "vortexdebug.h" diff --git a/oglview.cpp b/oglview.cpp index 00db28c7..b929f071 100644 --- a/oglview.cpp +++ b/oglview.cpp @@ -26,7 +26,6 @@ #include #include #include -#include "videosetupdlg.h" #include #include #include diff --git a/profilearea.ui b/profilearea.ui deleted file mode 100644 index f8b95e3b..00000000 --- a/profilearea.ui +++ /dev/null @@ -1,19 +0,0 @@ - - - profileArea - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - diff --git a/psiresizeimagesdlg.cpp b/psiresizeimagesdlg.cpp deleted file mode 100644 index 46cb7a1b..00000000 --- a/psiresizeimagesdlg.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "psiresizeimagesdlg.h" -#include "ui_psiresizeimagesdlg.h" -#include -#include -PSIResizeImagesDlg::PSIResizeImagesDlg(int resize,int max, QWidget *parent) : - QDialog(parent), - ui(new Ui::PSIResizeImagesDlg) -{ - ui->setupUi(this); - QSettings set; - ui->m_resize->setMaximum(max); - ui->CurrentSize->setText(QString("%1").arg(max)); - ui->m_resize->setValue(resize); -} - -int PSIResizeImagesDlg::getSize(){ - return ui->m_resize->value(); -} - -PSIResizeImagesDlg::~PSIResizeImagesDlg() -{ - delete ui; -} - -void PSIResizeImagesDlg::on_m_resize_valueChanged(int arg1) -{ - QSettings set; - int v = (arg1/100)*100; - set.setValue("PSIResize", v); - ui->m_resize->setValue(v); -} - diff --git a/psiresizeimagesdlg.h b/psiresizeimagesdlg.h deleted file mode 100644 index 8c2fe7aa..00000000 --- a/psiresizeimagesdlg.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef PSIRESIZEIMAGESDLG_H -#define PSIRESIZEIMAGESDLG_H - -#include - -namespace Ui { -class PSIResizeImagesDlg; -} - -class PSIResizeImagesDlg : public QDialog -{ - Q_OBJECT - -public: - explicit PSIResizeImagesDlg(int newSize, int max, QWidget *parent = nullptr); - ~PSIResizeImagesDlg(); - int getSize(); -private slots: - void on_m_resize_valueChanged(int arg1); - -private: - Ui::PSIResizeImagesDlg *ui; -}; - -#endif // PSIRESIZEIMAGESDLG_H diff --git a/psiresizeimagesdlg.ui b/psiresizeimagesdlg.ui deleted file mode 100644 index 86ce89a9..00000000 --- a/psiresizeimagesdlg.ui +++ /dev/null @@ -1,131 +0,0 @@ - - - PSIResizeImagesDlg - - - - 0 - 0 - 400 - 181 - - - - Resize PSI Images - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The first image is larger than 1000 pixels wide. It will speed up the process if you resize it to a smaller size. However it can be resized too small and make the phase esstimation process fail. </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> This will only resize image for the phase estimation process and not the PSI surface analysis phase.</p></body></html> - - - - - - - - - Current width: - - - - - - - TextLabel - - - - - - - - - - - Resize Image widths to: - - - - - - - 600 - - - 5000 - - - 200 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - PSIResizeImagesDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - PSIResizeImagesDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/renamewavefrontdlg.cpp b/renamewavefrontdlg.cpp deleted file mode 100644 index f4694107..00000000 --- a/renamewavefrontdlg.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#include "renamewavefrontdlg.h" -#include "ui_renamewavefrontdlg.h" - -renameWavefrontDlg::renameWavefrontDlg(const QString &name, QWidget *parent) : - QDialog(parent), - ui(new Ui::renameWavefrontDlg) -{ - ui->setupUi(this); - ui->name->setText(name); -} - -renameWavefrontDlg::~renameWavefrontDlg() -{ - delete ui; -} -QString renameWavefrontDlg::name(){ - return ui->name->text(); -} diff --git a/renamewavefrontdlg.h b/renamewavefrontdlg.h deleted file mode 100644 index 74ad77df..00000000 --- a/renamewavefrontdlg.h +++ /dev/null @@ -1,40 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#ifndef RENAMEWAVEFRONTDLG_H -#define RENAMEWAVEFRONTDLG_H - -#include - -namespace Ui { -class renameWavefrontDlg; -} - -class renameWavefrontDlg : public QDialog -{ - Q_OBJECT - -public: - explicit renameWavefrontDlg(const QString &name, QWidget *parent = 0); - ~renameWavefrontDlg(); - QString name(); - -private: - Ui::renameWavefrontDlg *ui; -}; - -#endif // RENAMEWAVEFRONTDLG_H diff --git a/renamewavefrontdlg.ui b/renamewavefrontdlg.ui deleted file mode 100644 index 934748c6..00000000 --- a/renamewavefrontdlg.ui +++ /dev/null @@ -1,74 +0,0 @@ - - - renameWavefrontDlg - - - - 0 - 0 - 400 - 86 - - - - Rename Wavefront - - - - - - Enter new wavefront name: - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - renameWavefrontDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - renameWavefrontDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/rmsplot.h b/rmsplot.h index 3af66da9..515012df 100644 --- a/rmsplot.h +++ b/rmsplot.h @@ -8,7 +8,6 @@ #include class QwtPlotCurve; -class astigZoomer; class myPlotPicker; class rmsPlot : public QwtPlot { diff --git a/savewavedlg.cpp b/savewavedlg.cpp deleted file mode 100644 index 400d46ed..00000000 --- a/savewavedlg.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#include "savewavedlg.h" -#include "ui_savewavedlg.h" -#include -SaveWaveDlg::SaveWaveDlg(const QString &lastPath, QWidget *parent) : - QDialog(parent),lastPath(lastPath), - ui(new Ui::SaveWaveDlg) -{ - ui->setupUi(this); - ui->lineEdit->setText(lastPath); -} - -SaveWaveDlg::~SaveWaveDlg() -{ - delete ui; -} - -void SaveWaveDlg::on_normalRb_clicked(bool) -{ - -} - -void SaveWaveDlg::on_browsePB_clicked() -{ - fileName = QFileDialog::getSaveFileName(0, - tr("Write wave font file"), lastPath, - tr("wft (*.wft)")); - if (fileName.isEmpty()) - return; - ui->lineEdit->setText(fileName); -} diff --git a/savewavedlg.h b/savewavedlg.h deleted file mode 100644 index b39205fc..00000000 --- a/savewavedlg.h +++ /dev/null @@ -1,46 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#ifndef SAVEWAVEDLG_H -#define SAVEWAVEDLG_H - -#include - -namespace Ui { -class SaveWaveDlg; -} - -class SaveWaveDlg : public QDialog -{ - Q_OBJECT - -public: - explicit SaveWaveDlg(const QString &lastPath, QWidget *parent = 0); - ~SaveWaveDlg(); - QString fileName; - QString lastPath; - -private slots: - void on_normalRb_clicked(bool); - - void on_browsePB_clicked(); - -private: - Ui::SaveWaveDlg *ui; -}; - -#endif // SAVEWAVEDLG_H diff --git a/savewavedlg.ui b/savewavedlg.ui deleted file mode 100644 index bb12b024..00000000 --- a/savewavedlg.ui +++ /dev/null @@ -1,120 +0,0 @@ - - - SaveWaveDlg - - - - 0 - 0 - 587 - 182 - - - - Dialog - - - - - 110 - 90 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 50 - 50 - 431 - 20 - - - - - - - 500 - 50 - 75 - 23 - - - - Browse - - - - - - 60 - 100 - 82 - 17 - - - - Normal - - - true - - - - - - 60 - 120 - 82 - 17 - - - - Nulled - - - - - - - buttonBox - accepted() - SaveWaveDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - SaveWaveDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/squareimage.cpp b/squareimage.cpp deleted file mode 100644 index c250bd52..00000000 --- a/squareimage.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "squareimage.h" - -//in cpp file -squareImage::squareImage( QWidget* parent) - : QLabel(parent) -{ -} diff --git a/squareimage.h b/squareimage.h deleted file mode 100644 index 7adaa8ec..00000000 --- a/squareimage.h +++ /dev/null @@ -1,10 +0,0 @@ -//in header file -#include -class squareImage: public QLabel{ - Q_OBJECT -public: - squareImage( QWidget* parent=0); - int heightForWidth(int w) const {return w;} - //other methods -}; - diff --git a/surfaceanalysistools.cpp b/surfaceanalysistools.cpp index 0dc5aa36..2c8d8bfe 100644 --- a/surfaceanalysistools.cpp +++ b/surfaceanalysistools.cpp @@ -25,7 +25,6 @@ #include #include #include "mirrordlg.h" -#include "renamewavefrontdlg.h" #include surfaceAnalysisTools *surfaceAnalysisTools::m_Instance = NULL; diff --git a/surfacepropertiesdlg.cpp b/surfacepropertiesdlg.cpp deleted file mode 100644 index 5a3f007b..00000000 --- a/surfacepropertiesdlg.cpp +++ /dev/null @@ -1,231 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#include "surfacepropertiesdlg.h" -#include "ui_surfacepropertiesdlg.h" -#include -#include -surfacePropertiesDlg::surfacePropertiesDlg(QWidget *parent) : - QDialog(parent), - ui(new Ui::surfacePropertiesDlg) -{ - ui->setupUi(this); - QSettings settings; - ui->xLight->setValue(settings.value("xlight", -20).toInt()); - ui->yLight->setValue(settings.value("ylight", -20).toInt()); - ui->zLight->setValue(settings.value("zlight", -20).toInt()); - ui->ambientLight->setValue(settings.value("ambientLight", -20).toInt()); - ui->diffuse->setValue(settings.value("diffuseLight",0).toInt()); - ui->specular->setValue(settings.value("specularLight", 0).toInt()); - ui->surfaceAmbient->setValue(settings.value("surfaceAmbient", 0).toInt()); - ui->surfaceDiffuse->setValue(settings.value("surfaceDiffuse", 0).toInt()); - ui->surfaceSpecular->setValue(settings.value("surfaceSpecular",0).toInt()); - ui->surfaceShine->setValue(settings.value("surfaceShine",0).toInt()); -} - -surfacePropertiesDlg::~surfacePropertiesDlg() -{ - delete ui; -} - - -void surfacePropertiesDlg::on_xLight_valueChanged(int value) -{ - QSettings set; - set.setValue("xLight", value); - emit xLightMoved(value); -} - -void surfacePropertiesDlg::on_yLight_valueChanged(int value) -{ - QSettings set; - set.setValue("yLight", value); - emit yLightMoved(value); -} - -void surfacePropertiesDlg::on_zLight_valueChanged(int value) -{ - QSettings set; - set.setValue("zLight", value); - emit zLightMoved(value); -} -void surfacePropertiesDlg::on_ambientLight_valueChanged(int value) -{ - QSettings set; - set.setValue("ambientLight", value); - emit ambientMoved(value); -} - -void surfacePropertiesDlg::on_diffuse_valueChanged(int value) -{ - QSettings set; - set.setValue("diffuseLight", value); - emit diffuseMoved(value); -} - -void surfacePropertiesDlg::on_specular_valueChanged(int value) -{ - QSettings set; - set.setValue("specularLight", value); - emit specularMoved(value); -} - -void surfacePropertiesDlg::on_surfaceAmbient_valueChanged(int value) -{ - QSettings set; - set.setValue("surfaceAmbient", value); - emit surfaceAmbientMoved(value); -} - -void surfacePropertiesDlg::on_surfaceDiffuse_valueChanged(int value) -{ - QSettings set; - set.setValue("surfaceDiffuse", value); - emit surfaceDiffuseMoved(value); -} - -void surfacePropertiesDlg::on_surfaceSpecular_valueChanged(int value) -{ - QSettings set; - set.setValue("surfaceSpucular", value); - emit surfaceSpecularMoved(value); -} - -void surfacePropertiesDlg::on_surfaceShine_valueChanged(int value) -{ - QSettings set; - set.setValue("surfaceShine", value); - emit surfaceShineMoved(value); -} - - -void surfacePropertiesDlg::on_surfaceEmission_valueChanged(int value) -{ - emit surfaceEmitionMove(value); -} - - - -void surfacePropertiesDlg::on_metalFoil_clicked(bool checked) -{ - if (checked){ - ui->xLight->setValue(-38); - ui->yLight->setValue(500); - ui->zLight->setValue(-6); - ui->ambientLight->setValue(9); - ui->diffuse->setValue(50); - ui->specular->setValue(100); - ui->surfaceDiffuse->setValue(0); - ui->surfaceSpecular->setValue(75); - ui->surfaceShine->setValue(25); - update(); - } -} - -void surfacePropertiesDlg::on_glass_clicked(bool checked) -{ - if (checked) - { - ui->xLight->setValue(-16); - ui->yLight->setValue(269); - ui->zLight->setValue(-6); - ui->ambientLight->setValue(14); - ui->diffuse->setValue(52); - ui->specular->setValue(100); - ui->surfaceDiffuse->setValue(44); - ui->surfaceSpecular->setValue(79); - ui->surfaceShine->setValue(104); - update(); - } -} - -void surfacePropertiesDlg::on_matt_clicked(bool checked) -{ - if (checked){ - ui->xLight->setValue(-25); - ui->yLight->setValue(40); - ui->zLight->setValue(4); - ui->ambientLight->setValue(23); - ui->diffuse->setValue(52); - ui->specular->setValue(29); - ui->surfaceDiffuse->setValue(99); - ui->surfaceSpecular->setValue(15); - ui->surfaceShine->setValue(128); - update(); - } -} - - - -void surfacePropertiesDlg::on_buttonBox_accepted() -{ - qDebug() << "Params"; - qDebug() << ui->xLight->value() << " " << ui->yLight->value() << " " << ui->zLight->value(); - qDebug() <<"ambient light" << ui->ambientLight->value() << " diff " << ui->diffuse->value() << " spec " << ui->specular->value(); - qDebug() << "sur amb " << ui->surfaceAmbient->value() << " surdiff " << ui->surfaceDiffuse->value() << " sur spec" << ui->surfaceSpecular->value(); - qDebug() << ui->surfaceShine->value(); -} - - - -void surfacePropertiesDlg::on_Satin_clicked(bool checked) -{ if (checked){ - ui->xLight->setValue(-26); - ui->yLight->setValue(432); - ui->zLight->setValue(-18); - ui->ambientLight->setValue(17); - ui->diffuse->setValue(0); - ui->specular->setValue(74); - ui->surfaceDiffuse->setValue(94); - ui->surfaceSpecular->setValue(61); - ui->surfaceShine->setValue(30); - update(); - } - -} - -void surfacePropertiesDlg::on_plastic_clicked(bool checked) -{ - if (checked){ - ui->xLight->setValue(-25); - ui->yLight->setValue(462); - ui->zLight->setValue(4); - ui->ambientLight->setValue(28); - ui->diffuse->setValue(0); - ui->specular->setValue(100); - ui->surfaceDiffuse->setValue(0); - ui->surfaceSpecular->setValue(61); - ui->surfaceShine->setValue(48); - update(); - } -} - - -void surfacePropertiesDlg::on_red_valueChanged(int value) -{ - emit red(value); -} - -void surfacePropertiesDlg::on_green_valueChanged(int value) -{ - emit green(value); -} - -void surfacePropertiesDlg::on_blue_valueChanged(int value) -{ - emit blue(value); -} diff --git a/surfacepropertiesdlg.h b/surfacepropertiesdlg.h deleted file mode 100644 index 3b312dc8..00000000 --- a/surfacepropertiesdlg.h +++ /dev/null @@ -1,99 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#ifndef SURFACEPROPERTIESDLG_H -#define SURFACEPROPERTIESDLG_H - -#include - -namespace Ui { -class surfacePropertiesDlg; -} - -class surfacePropertiesDlg : public QDialog -{ - Q_OBJECT - -public: - explicit surfacePropertiesDlg(QWidget *parent = 0); - ~surfacePropertiesDlg(); -signals: - void xLightMoved(int value); - void yLightMoved(int value); - void zLightMoved(int value); - void ambientMoved(int value); - void diffuseMoved(int value); - void specularMoved(int value); - void surfaceDiffuseMoved(int value); - void surfaceSpecularMoved(int value); - void surfaceAmbientMoved(int value); - void surfaceShineMoved(int value); - void surfaceEmitionMove(int value); - void silk(); - void glass(); - void metalFoil(); - void matt(); - void red(int); - void green(int); - void blue(int); - -private slots: - void on_specular_valueChanged(int value); - - void on_surfaceAmbient_valueChanged(int value); - - void on_surfaceDiffuse_valueChanged(int value); - - void on_surfaceSpecular_valueChanged(int value); - - void on_metalFoil_clicked(bool checked); - - void on_glass_clicked(bool checked); - - void on_matt_clicked(bool checked); - - void on_surfaceShine_valueChanged(int value); - - void on_surfaceEmission_valueChanged(int value); - - void on_buttonBox_accepted(); - - void on_ambientLight_valueChanged(int value); - - void on_xLight_valueChanged(int value); - - void on_yLight_valueChanged(int value); - - void on_zLight_valueChanged(int value); - - void on_diffuse_valueChanged(int value); - - void on_Satin_clicked(bool checked); - - void on_plastic_clicked(bool checked); - - void on_red_valueChanged(int value); - - void on_green_valueChanged(int value); - - void on_blue_valueChanged(int value); - -private: - Ui::surfacePropertiesDlg *ui; -}; - -#endif // SURFACEPROPERTIESDLG_H diff --git a/surfacepropertiesdlg.ui b/surfacepropertiesdlg.ui deleted file mode 100644 index 6232124f..00000000 --- a/surfacepropertiesdlg.ui +++ /dev/null @@ -1,344 +0,0 @@ - - - surfacePropertiesDlg - - - - 0 - 0 - 599 - 380 - - - - 3D surface lighting and material properties - - - - - - - - Lighting properties - - - - - - X - - - - - - - -100 - - - 100 - - - Qt::Horizontal - - - - - - - Y - - - - - - - 0 - - - 500 - - - Qt::Horizontal - - - - - - - Z - - - - - - - -50 - - - 50 - - - Qt::Horizontal - - - - - - - Ambient - - - - - - - 0 - - - 100 - - - Qt::Horizontal - - - - - - - Diffuse - - - - - - - 100 - - - Qt::Horizontal - - - - - - - Specular: - - - - - - - 0 - - - 100 - - - Qt::Horizontal - - - - - - - - - - Surface Properties - - - - - - Ambient - - - - - - - 100 - - - Qt::Horizontal - - - - - - - Diffuse - - - - - - - Qt::Horizontal - - - - - - - Specular: - - - - - - - Qt::Horizontal - - - - - - - shine - - - - - - - 128 - - - Qt::Horizontal - - - - - - - Emission - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - - - - - Predefined - - - - - - Plastic - - - - - - - Satin - - - - - - - Brushed Metal - - - - - - - Ceramic - - - - - - - Matt - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - surfacePropertiesDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - surfacePropertiesDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/utilil.cpp b/utils.cpp similarity index 100% rename from utilil.cpp rename to utils.cpp diff --git a/utils.h b/utils.h index 900f0d47..bb6c2555 100644 --- a/utils.h +++ b/utils.h @@ -1,5 +1,5 @@ #ifndef UTILS_H #define UTILS_H int showmem(const QString &title = ""); -extern double outputLambda; +extern double outputLambda; //TODO nothing to do here. But there are many other occurences #endif // UTILS_H diff --git a/videosetupdlg.cpp b/videosetupdlg.cpp deleted file mode 100644 index 8c50b589..00000000 --- a/videosetupdlg.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "videosetupdlg.h" -#include "ui_videosetupdlg.h" -#include -videoSetupDlg::videoSetupDlg(const QImage &img, QWidget *parent) : - QDialog(parent), - ui(new Ui::videoSetupDlg) -{ - ui->setupUi(this); - - ui->width->setValue(img.width() & 0xFFFFFFFFFFFFFFE); - ui->height->setValue(img.height() & 0xFFFFFFFFFFFFFFE); - QSettings set; - ui->angle->setValue(set.value("vidStepAngle", 5).toDouble()); - ui->fps->setValue(set.value("vidFPS", 10).toInt()); - ui->width->setValue(set.value("vidWidth", 400).toInt()); - ui->height->setValue(set.value("vidHeight", 300).toInt()); - m_imageSize = img.size(); - bool fullSize = set.value("vidFullSize", true).toBool(); - if (fullSize){ - ui->fullSize->setChecked( fullSize); - ui->width->setValue(m_imageSize.width() & 0xffffffffffffffe); - ui->height->setValue(m_imageSize.height() & 0xffffffffffffffe); - ui->width->setEnabled(false); - ui->height->setEnabled(false); - } -} - -videoSetupDlg::~videoSetupDlg() -{ - delete ui; -} -int videoSetupDlg::fps(){ - return ui->fps->value(); -} -int videoSetupDlg::width(){ - return ui->width->value() & 0xfffffffffffffffe; -} -int videoSetupDlg::height(){ - return ui->height->value() & 0xfffffffffffffffe; -} -double videoSetupDlg::angleStep(){ - return ui->angle->value(); -} -void videoSetupDlg::on_buttonBox_accepted(){ - QSettings set; - set.setValue("vidStepAngle", ui->angle->value()); - set.setValue("vidFPS", ui->fps->value()); - set.setValue("vidWidth", ui->width->value()); - set.setValue("vidHeight", ui->height->value()); - set.setValue("vidFullSize", ui->fullSize->isChecked()); -} - - -void videoSetupDlg::on_fullSize_clicked(bool checked) -{ - if (checked){ - ui->width->setValue(m_imageSize.width() & 0xffffffffffffffe); - ui->height->setValue(m_imageSize.height() & 0xffffffffffffffe); - ui->width->setEnabled(false); - ui->height->setEnabled(false); - } - else { - ui->width->setEnabled(true); - ui->height->setEnabled(true); - } -} diff --git a/videosetupdlg.h b/videosetupdlg.h deleted file mode 100644 index dee37456..00000000 --- a/videosetupdlg.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef VIDEOSETUPDLG_H -#define VIDEOSETUPDLG_H - -#include -#include - -namespace Ui { -class videoSetupDlg; -} - -class videoSetupDlg : public QDialog -{ - Q_OBJECT - -public: - explicit videoSetupDlg(const QImage &img, QWidget *parent = 0); - ~videoSetupDlg(); - QImage m_img; - int fps(); - int width(); - int height(); - double angleStep(); - QSize m_imageSize; -private slots: - - void on_buttonBox_accepted(); - void on_fullSize_clicked(bool checked); - -private: - Ui::videoSetupDlg *ui; -}; - -#endif // VIDEOSETUPDLG_H diff --git a/videosetupdlg.ui b/videosetupdlg.ui deleted file mode 100644 index 4b0664ee..00000000 --- a/videosetupdlg.ui +++ /dev/null @@ -1,164 +0,0 @@ - - - videoSetupDlg - - - - 0 - 0 - 552 - 291 - - - - Video setup - - - - - - - - - - angle per step - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 180.000000000000000 - - - 5.000000000000000 - - - 5.000000000000000 - - - - - - - - - - - Frames per Second - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 10 - - - - - - - - - - - Full Size - - - - - - - Size - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 2000 - - - - - - - X - - - Qt::AlignCenter - - - - - - - 6000 - - - 10 - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - videoSetupDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - videoSetupDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/vortex.h b/vortex.h deleted file mode 100644 index 9bcdb10d..00000000 --- a/vortex.h +++ /dev/null @@ -1,25 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#ifndef VORTEX_H -#define VORTEX_H -#include - -void vortex(cv::Mat &dft, const char *ext, - double low, double smooth, - double *phase, const char *what); -#endif // VORTEX_H diff --git a/wavefrontloader.cpp b/wavefrontloader.cpp deleted file mode 100644 index 7a1b51bd..00000000 --- a/wavefrontloader.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#include "wavefrontloader.h" -#include "utils.h" -waveFrontLoader::waveFrontLoader(QObject *parent) : - QObject(parent), done(true),shouldCancel(false) -{ - pd = new QProgressDialog(" Loading wavefronts in PRogress.", "Cancel", 0, 100); - connect(pd, &QProgressDialog::canceled, this, &waveFrontLoader::cancel); - connect(this, &waveFrontLoader::status, pd, &QProgressDialog::setValue); - connect(this, &waveFrontLoader::progressRange, pd, &QProgressDialog::setRange); - connect(this, &waveFrontLoader::currentWavefront, pd, &QProgressDialog::setLabelText); -} - -void waveFrontLoader::addWavefront(const QString &filename){ - mutex.lock(); - m_list << filename; - mutex.unlock(); -} - -void waveFrontLoader::cancel(){ - shouldCancel = true; - qDebug() << "trying to cancel"; -} - -void waveFrontLoader::loadx(const QStringList &list, SurfaceManager *sm){ - m_list = list; - loadx(sm); -} - -void waveFrontLoader::loadx( SurfaceManager *sm){ - - shouldCancel = false; - int prog = 0; - int size = m_list.size(); - - emit status(0); - //bool mirrorConfigChanged = false; - done = false; - - emit progressRange(0, size); - sm->okToUpdateSurfacesOnGenerateComplete = false; - try { - while (m_list.size() > 0){ - int left = showmem(); - qDebug() << left; - if (left < 300){ - qDebug() << "low memory"; - sm->okToContinue = -1; - emit memoryLow(); - while(sm->okToContinue == -1){} - qDebug() << "continue code" << sm->okToContinue; - if (sm->okToContinue == QMessageBox::No) - { - qDebug() << "Abort load"; - break; - } - qDebug() << "Continue load"; - - } - mutex.lock(); - QString file = m_list.front(); - m_list.removeAt(0); - mutex.unlock(); - - if (pd->wasCanceled()) - break; - - emit currentWavefront(file); - - emit status(++prog); - /*mirrorConfigChanged |= */sm->loadWavefront(file); - } - } - catch (const std::bad_alloc &ex) - { - // clean up here, e.g. save the session - // and close all config files. - - return; - } - - emit loadComplete(); - sm->okToUpdateSurfacesOnGenerateComplete = true; - done = true; - emit progressRange(0, 1); - emit status(0); - emit status(1); - -} - diff --git a/wavefrontloader.h b/wavefrontloader.h deleted file mode 100644 index dc0474d1..00000000 --- a/wavefrontloader.h +++ /dev/null @@ -1,61 +0,0 @@ -/****************************************************************************** -** -** Copyright 2016 Dale Eason -** This file is part of DFTFringe -** is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation version 3 of the License - -** DFTFringe is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with DFTFringe. If not, see . - -****************************************************************************/ -#ifndef WAVEFRONTLOADER_H -#define WAVEFRONTLOADER_H - -#include -#include -#include -#include "surfacemanager.h" -#include - -class waveFrontLoader : public QObject -{ - Q_OBJECT -public: - explicit waveFrontLoader(QObject *parent = 0); - void addWavefront(const QString &filename); - bool done; -signals: - void status(int); - void memoryLow(); - void progressRange(int,int); - void currentWavefront(QString); - void showMessage(QString); - void diameterChangedSig(double); - void loadComplete(); - -public slots: - void loadx(SurfaceManager *sm); - void loadx(const QStringList &list, SurfaceManager *sm); - void cancel(); - - - -private: - QProgressDialog *pd; - bool shouldCancel; - QMutex sync; - QWaitCondition pauseCond; - bool pause; - int messageResp; - QMutex mutex; - QStringList m_list; -}; - -#endif // WAVEFRONTLOADER_H diff --git a/wavefrontnulldlg.ui b/wavefrontnulldlg.ui deleted file mode 100644 index 25575557..00000000 --- a/wavefrontnulldlg.ui +++ /dev/null @@ -1,70 +0,0 @@ - - - waveFrontNullDlg - - - - 0 - 0 - 265 - 501 - - - - Wavefront Null Enables - - - <html><head/><body><p>Specifies what to remove from the wavefront. Normally this is the first 8 Zernike terms.</p><p>Except the x and y astig.</p></body></html> - - - - - - - - - Qt::Vertical - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - waveFrontNullDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - waveFrontNullDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - -