Merge pull request #184 from githubdoe/dalework

A ton of changes by Dale.  Lots of new features.  See VersionHistory for version 7.3.0

Author: githubdoe

DFTFringe.pro

@@ -148,6 +148,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     annulushelpdlg.cpp \
     arbitrarywavefronthelp.cpp \
     arbitrarywavwidget.cpp \
+    astigpolargraph.cpp \
     astigscatterplot.cpp \
     astigstatsdlg.cpp \
     astigzoomer.cpp \
@@ -181,6 +182,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     gplus.cpp \
     graphicsutilities.cpp \
     helpdlg.cpp \
+    hotkeysdlg.cpp \
     igramarea.cpp \
     igramintensity.cpp \
     imagehisto.cpp \
@@ -204,9 +206,11 @@ SOURCES += SingleApplication/singleapplication.cpp \
     outlineplots.cpp \
     outlinestatsdlg.cpp \
     pdfcalibrationdlg.cpp \
+    percentcorrectiondlg.cpp \
     pixelstats.cpp \
     plotcolor.cpp \
     profileplot.cpp \
+    profileplotpicker.cpp \
     psfplot.cpp \
     psi_dlg.cpp \
     psiphasedisplay.cpp \
@@ -226,6 +230,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     settingsdft.cpp \
     settingsGeneral2.cpp \
     settingsigram.cpp \
+    settingsigramimportconfig.cpp \
     settingsprofile.cpp \
     showaliasdlg.cpp \
     showallcontoursdlg.cpp \
@@ -266,6 +271,7 @@ HEADERS += bezier/bezier.h \
     SingleApplication/singleapplication.h \
     annulushelpdlg.h \
     arbitrarywavefronthelp.h \
+    astigpolargraph.h \
     arbitrarywavwidget.h \
     astigscatterplot.h \
     astigstatsdlg.h \
@@ -302,6 +308,7 @@ HEADERS += bezier/bezier.h \
     gplus.h \
     graphicsutilities.h \
     helpdlg.h \
+    hotkeysdlg.h \
     IgramArea.h \
     igramintensity.h \
     imagehisto.h \
@@ -324,9 +331,12 @@ HEADERS += bezier/bezier.h \
     outlineplots.h \
     outlinestatsdlg.h \
     pdfcalibrationdlg.h \
+    percentcorrectiondlg.h \
+    percentCorrectionSurface.h \
     pixelstats.h \
     plotcolor.h \
     profileplot.h \
+    profileplotpicker.h \
     psfplot.h \
     psi_dlg.h \
     psiphasedisplay.h \
@@ -346,6 +356,7 @@ HEADERS += bezier/bezier.h \
     settingsdft.h \
     settingsGeneral2.h \
     settingsigram.h \
+    settingsigramimportconfig.h \
     settingsprofile.h \
     showaliasdlg.h \
     showallcontoursdlg.h \
@@ -384,6 +395,7 @@ HEADERS += bezier/bezier.h \
 
 FORMS += arbitrarywavefronthelp.ui \
     annulushelpdlg.ui \
+    astigpolargraph.ui \
     astigstatsdlg.ui \
     averagewavefrontfilesdlg.ui \
     batchigramwizard.ui \
@@ -407,6 +419,7 @@ FORMS += arbitrarywavefronthelp.ui \
     foucaultview.ui \
     generatetargetdlg.ui \
     helpdlg.ui \
+    hotkeysdlg.ui \
     igramintensity.ui \
     jitteroutlinedlg.ui \
     lensdialog.ui \
@@ -421,6 +434,7 @@ FORMS += arbitrarywavefronthelp.ui \
     outlineplots.ui \
     outlinestatsdlg.ui \
     pdfcalibrationdlg.ui \
+    percentcorrectiondlg.ui \
     pixelstats.ui \
     profilearea.ui \
     profileplot.ui \
@@ -441,6 +455,7 @@ FORMS += arbitrarywavefronthelp.ui \
     settingsdft.ui \
     settingsGeneral2.ui \
     settingsigram.ui \
+    settingsigramimportconfig.ui \
     settingsprofile.ui \
     showaliasdlg.ui \
     showallcontoursdlg.ui \

DFTFringe_Dale.pro

@@ -30,9 +30,11 @@ SOURCES += main.cpp \
     annulushelpdlg.cpp \
     arbitrarywavefronthelp.cpp \
     arbitrarywavwidget.cpp \
+    astigpolargraph.cpp \
     cpoint.cpp \
     defocusdlg.cpp \
     edgeplot.cpp \
+    hotkeysdlg.cpp \
     mainwindow.cpp \
     igramarea.cpp \
     circleoutline.cpp \
@@ -42,8 +44,11 @@ SOURCES += main.cpp \
     dftarea.cpp \
     oglrendered.cpp \
     pdfcalibrationdlg.cpp \
+    percentcorrectiondlg.cpp \
     profileplot.cpp \
+    profileplotpicker.cpp \
     psiresizeimagesdlg.cpp \
+    settingsigramimportconfig.cpp \
     surface3dcontrolsdlg.cpp \
     surfacegraph.cpp \
     surfacelightingproxy.cpp \
@@ -148,6 +153,7 @@ HEADERS  += mainwindow.h \
     annulushelpdlg.h \
     arbitrarywavefronthelp.h \
     arbitrarywavwidget.h \
+    astigpolargraph.h \
     cpoint.h \
     defocusdlg.h \
     edgeplot.h \
@@ -157,10 +163,15 @@ HEADERS  += mainwindow.h \
     graphicsutilities.h \
     dfttools.h \
     dftarea.h \
+    hotkeysdlg.h \
     oglrendered.h \
     pdfcalibrationdlg.h \
+    percentCorrectionSurface.h \
+    percentcorrectiondlg.h \
     profileplot.h \
+    profileplotpicker.h \
     psiresizeimagesdlg.h \
+    settingsigramimportconfig.h \
     surface3dcontrolsdlg.h \
     surfacegraph.h \
     surfacelightingproxy.h \
@@ -270,16 +281,20 @@ INCLUDEPATH += ./bezier ./SingleApplication
 FORMS    += mainwindow.ui \
     annulushelpdlg.ui \
     arbitrarywavefronthelp.ui \
+    astigpolargraph.ui \
     defocusdlg.ui \
     dfttools.ui \
     dftarea.ui \
     edgeplot.ui \
+    hotkeysdlg.ui \
     oglrendered.ui \
     pdfcalibrationdlg.ui \
+    percentcorrectiondlg.ui \
     profilearea.ui \
     profileplot.ui \
     contourtools.ui \
     psiresizeimagesdlg.ui \
+    settingsigramimportconfig.ui \
     surface3dcontrolsdlg.ui \
     surfaceanalysistools.ui \
     metricsdisplay.ui \
@@ -408,12 +423,12 @@ RC_FILE = DFTFringe.rc
 QMAKE_CXXFLAGS += -std=c++11
 
 # The application version
-VERSION = 6.2
+VERSION = Dale7.3.0
 
 # Define the preprocessor macro to get the application version in our application.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 DEFINES += QAPPLICATION_CLASS=QApplication
-
+DEFINES += DALE_DO_NOT_LOG
 DISTFILES += \
     buildingDFTFringe64.txt \
     helptext.txt \

RevisionHistory.html

@@ -418,3 +418,16 @@
 <li>Improved saving speed when working on network drives</li>
 </ul>
 </ul>
+
+<ul><li>Version 7.3.0</li>
+<ul>
+<li>Added zonal percent completion graph to profile options</li>
+<li>Added polar plot of the astig of selected wave fronts under View menu.</li>
+<li>Changed create movie feature to add user provided prefix to each from created.</li>
+<li>Added hot keys to import interferogram</li>
+<li>Added hot key to help</li>
+<li>User can move mouse cursor over any profile shown,  click and drag it up or down.  Useful for comparing two work sessions results so that they match at zero height.</li>
+<li>If mouse is over the profile plot the scroll wheel can increase or decrease the y axis range.</li>
+<li>Added auto collimation setting to Ronchi and Foucault feature</li>
+<li>Remembered last ROC offset value in Ronchi and Foucault feature to remember last setting when wave front is changed to a different value</li>
+</ul>

astigpolargraph.cpp

@@ -0,0 +1,101 @@
+#include "astigpolargraph.h"
+#include "ui_astigpolargraph.h"
+#include "surfacemanager.h"
+
+void astigPolargraph::makeChart(){
+
+
+    QPolarChart *chart = new QPolarChart();
+
+    // process each wave front and place astig on the chart
+    ui->waveFrontTable->setRowCount(m_list.size());
+
+    QValueAxis *angularAxis = new QValueAxis();
+    angularAxis->setTickCount(9); // First and last ticks are co-located on 0/360 angle.
+    angularAxis->setLabelFormat("%.0f");
+    angularAxis->setShadesVisible(true);
+    angularAxis->setShadesBrush(QBrush(QColor(249, 249, 255)));
+    chart->addAxis(angularAxis, QPolarChart::PolarOrientationAngular);
+
+    QValueAxis *radialAxis = new QValueAxis();
+    radialAxis->setTickCount(5);
+    radialAxis->setLabelFormat("%.1f");
+    chart->addAxis(radialAxis, QPolarChart::PolarOrientationRadial);
+    double maxAstig = 1.;
+
+    QVector<wavefront *>  wavefronts =SurfaceManager::get_instance()->m_wavefronts;
+
+    for(int ndx = 0; ndx < m_list.length(); ++ndx){
+        wavefront *wf = wavefronts[m_list[ndx]];
+        QString name = wf->name;
+        int slashndx = name.lastIndexOf('/');
+        QString shortName = name.mid(name.lastIndexOf('/',slashndx-1));
+        QTableWidgetItem *item = new QTableWidgetItem(shortName, 0);
+        ui->waveFrontTable->setItem(ndx,0,item);
+        double xastig = wf->InputZerns[4];
+        double yastig = wf->InputZerns[5];
+        double mag = sqrt(xastig * xastig + yastig * yastig);
+        if (mag > maxAstig) maxAstig = mag;
+
+        double angle = (atan2(yastig,xastig)/2.) * 180./M_PI;
+        angle = 90 - angle;
+        QScatterSeries *series = new QScatterSeries();
+
+        int lastndx = name.lastIndexOf('/');
+        if (lastndx != -1)
+            name = name.mid(lastndx);
+        series->setName(name);
+        series->append(angle,mag);
+        series->append(angle+180,mag);
+        chart->addSeries(series);
+        series->attachAxis(radialAxis);
+        series->attachAxis(angularAxis);
+
+        QLineSeries *line = new QLineSeries();
+        line->append(angle,mag);
+        line->append(angle+180,mag);
+        chart->addSeries(line);
+        line->attachAxis(radialAxis);
+        line->attachAxis(angularAxis);
+        chart->legend()->markers(line)[0]->setVisible(false);
+
+        line->setPen(QPen(series->brush(),5));
+
+        QTableWidgetItem *pv = new QTableWidgetItem(QString().number(mag), 0);
+        item->setForeground(series->brush());
+        ui->waveFrontTable->setItem(ndx, 1, pv);
+        QTableWidgetItem *anglewidget = new QTableWidgetItem(QString().number(angle,'f',1), 0);
+        ui->waveFrontTable->setItem(ndx, 2, anglewidget);
+    }
+
+    chart->setTitle("Magnitude and axis of high edge");
+    if (m_list.length() > 4)
+        chart->legend()->setAlignment(Qt::AlignRight);
+    else chart->legend()->setAlignment(Qt::AlignBottom);
+
+    maxAstig = ceil(maxAstig);
+    radialAxis->setRange(0, maxAstig);
+    angularAxis->setRange(0, 360);
+
+    ui->polarChart->setChart(chart);
+
+
+
+}
+astigPolargraph::astigPolargraph(    QList<int>list, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::astigPolargraph), m_list(list)
+{
+    ui->setupUi(this);
+    //For some reason the original starter code of makeChart was in this function but it caused a crash.
+    // I could never figure out why because that code was taken from a working Qt example.  When
+    // moved to inside another function it worked.  So there you go.  Exact same code with no changes worked there but not here.
+    makeChart();
+
+
+}
+
+astigPolargraph::~astigPolargraph()
+{
+    delete ui;
+}

astigpolargraph.h

@@ -0,0 +1,31 @@
+#ifndef ASTIGPOLARGRAPH_H
+#define ASTIGPOLARGRAPH_H
+
+#include <QDialog>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QPolarChart>
+#include "wavefront.h"
+
+namespace Ui {
+class astigPolargraph;
+}
+
+class astigPolargraph : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit astigPolargraph(QList<int> list,QWidget *parent = nullptr);
+    ~astigPolargraph();
+
+private:
+    Ui::astigPolargraph *ui;
+    QList<int> m_list;  // list index of selected wave fronts in surface manager's list.
+    void makeChart();
+};
+
+#endif // ASTIGPOLARGRAPH_H