Version 2.1.

Author: githubdoe

DFTFringe.pro

@@ -111,7 +111,9 @@ SOURCES += main.cpp\
     myplotpicker.cpp \
     testplotclass.cpp \
     rmsplot.cpp \
-    regionedittools.cpp
+    regionedittools.cpp \
+    reportdlg.cpp \
+    videosetupdlg.cpp
     punwrap.cpp
 
 HEADERS  += mainwindow.h \
@@ -206,7 +208,9 @@ HEADERS  += mainwindow.h \
     myplotpicker.h \
     testplotclass.h \
     rmsplot.h \
-    regionedittools.h
+    regionedittools.h \
+    reportdlg.h \
+    videosetupdlg.h
 FORMS    += mainwindow.ui \
     dfttools.ui \
     dftarea.ui \
@@ -266,7 +270,9 @@ FORMS    += mainwindow.ui \
     astigstatsdlg.ui \
     averagewavefrontfilesdlg.ui \
     wavefrontfilterdlg.ui \
-    regionedittools.ui
+    regionedittools.ui \
+    reportdlg.ui \
+    videosetupdlg.ui
 
 win32 {
       CONFIG( debug, debug|release ) {
@@ -304,7 +310,7 @@ RC_FILE = DFTFringe.rc
 QMAKE_CXXFLAGS += -std=c++11
 
 # The application version
-VERSION = 2.0
+VERSION = 2.1
 
 # Define the preprocessor macro to get the application version in our application.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

RevisionHistory.html

@@ -132,5 +132,15 @@
 <li>Fixed rotation issues and center hole issues.</li>
 <li>Added width and height of wavefront to contour plot title.</li>
 <li>Added width and height values to status bar when wavefront is selected.</li>
+</ul></ul>
+<ul><li>Version 2.1</li>
+<ul><li>Fixed problems created by 2.0 when rotating, averaging, and writing wavefronts</li>
+<li>Added save 3d image and 3d Video creation</li>
+<li>Added options to report and added astig polar value to report</li>
+<li>Made contour settings also apply to the show all contours function.</li>
+<li>Imporved offset values for Ronchi and Foucault simulations.</li>
+<li>Corrected size of simulated interferogram to match requested size.</li>
+<li>Changed gaussian blur to not cross mirror outline thus better preserving the edge of the mirror</li>
+
 </ul></ul>
 <ul>

circleoutline.cpp

@@ -51,6 +51,33 @@ CircleOutline::CircleOutline()
 }
 
 CircleOutline::~CircleOutline(){}
+bool CircleOutline::isInside(double x, double y, int offset)
+{
+    double x1,y1;
+    x1 = (x+.5) - m_center.x();
+    y1 = (y+.5) - m_center.y();
+    return (sqrt(x1 * x1 + y1 * y1) <= (m_radius-offset));
+}
+
+void fillCircle(cv::Mat &m, double cx, double cy, double rad, void* color){
+    //Size size = m.size();
+    size_t step = m.step;
+    int pix_size = (int)m.elemSize();
+    uchar* ptr = m.ptr();
+
+#define ICV_PUT_POINT( ptr, x )     \
+    memcpy( ptr + (x)*pix_size, color, pix_size );
+
+    for (int y = 0; y < m.rows; ++y){
+        uchar *tptr0 = ptr + y * step;
+        for (int x = 0; x < m.cols; ++x){
+            double dx = (double)(x  - cx)/(rad);
+            double dy = (double)(y  - cy)/(rad);
+            if (sqrt(dx * dx + dy * dy) <= 1.)
+                ICV_PUT_POINT(tptr0, x);
+        }
+    }
+}
 
 bool CircleOutline::isInside(QPointF& p, int offset)
 {

circleoutline.h

@@ -23,7 +23,8 @@
 #include "gplus.h"
 #include <QVector>
 #include <QPointF>
-
+#include <opencv/cv.h>
+void fillCircle(cv::Mat &m, double cx, double cy, double rad, void *color);
 class CircleOutline: public boundary
 {
     public:
@@ -33,6 +34,7 @@ class CircleOutline: public boundary
         virtual ~CircleOutline();
         void draw(QPainter& painter, double scale, double scale2 = -1.);
         bool isInside(QPointF& p , int offset = 0);
+        bool isInside(double x, double y, int offset=0);
         void enlarge(int del);
         void translate(QPointF del);
         void scale(double factor);

contourplot.cpp

@@ -225,9 +225,6 @@ void ContourPlot::setSurface(wavefront * wf) {
         applyZeroOffset(false);
 
     setZRange();
-
-
-
     QwtScaleWidget *rightAxis = axisWidget( QwtPlot::yRight );
     rightAxis->setTitle(tr( "wavefront error at 550nm") );
     rightAxis->setColorBarEnabled( true );
@@ -260,10 +257,13 @@ void ContourPlot::setSurface(wavefront * wf) {
     //resize(QSize(width()-1,height()-1));
     //resize(QSize(width()+1,height()+1));
 }
-
+double ContourPlot::m_waveRange;
+bool ContourPlot::m_useMiddleOffset = true;
+int ContourPlot::m_colorMapNdx = 0;
+QString ContourPlot::m_zRangeMode("Auto");
+double ContourPlot::m_zOffset = 0.;
 ContourPlot::ContourPlot( QWidget *parent, ContourTools *tools, bool minimal ):
-    QwtPlot( parent ),m_wf(0),m_tools(tools), m_useMiddleOffset(true),m_colorMapNdx(0)
-    ,m_zRangeMode("Auto"), m_autoInterval(false),m_minimal(minimal),m_contourPen(Qt::white)
+    QwtPlot( parent ),m_wf(0),m_tools(tools), m_autoInterval(false),m_minimal(minimal),m_contourPen(Qt::white)
 {
     d_spectrogram = new QwtPlotSpectrogram();
     QSettings settings;

contourplot.h

@@ -44,12 +44,12 @@ class ContourPlot: public QwtPlot
 
     wavefront* m_wf;
     ContourTools *m_tools;
-    bool m_useMiddleOffset;
-    int m_colorMapNdx;
-    double m_zOffset;
-    double m_waveRange;
+    static bool m_useMiddleOffset;
+    static int m_colorMapNdx;
+    static double m_zOffset;
+    static double m_waveRange;
     double contourRange;
-    QString m_zRangeMode;
+    static QString m_zRangeMode;
     ContourPlot(QWidget * = NULL, ContourTools *tools  = 0, bool minimal = false);
     void setSurface(wavefront * mat);
     void applyZeroOffset(bool useMiddle);

foucaultview.cpp

@@ -141,7 +141,6 @@ void foucaultView::on_makePb_clicked()
 
     double pixels_per_thou = .001 / pixwidth;
 
-    qDebug()<<"fouc" << pixels_per_thou << pixwidth << pad << size;
     double slitWidthHalf = pixels_per_thou * ui->slitWidthSb->value() * 1000 * ((ui->useMM->isChecked()) ? 1./25.4 : 1.);
     if (slitWidthHalf < .75){
         QString msg = QString().sprintf("warning the slit width of %6.5lf may too small. Using one pixel slit instead", ui->slitWidthSb->value());
@@ -388,7 +387,8 @@ void foucaultView::on_rocOffsetSlider_valueChanged(int value)
 
 }
 inline double foucaultView::getStep(){
-    return (ui->autoStepSize->isChecked())? round(100. * ((ui->useMM->isChecked()) ? 25.4 * m_sag/40. : m_sag/40.))/100. : ui->rocStepSize->value();
+    return (ui->autoStepSize->isChecked())? round(1000. * ((ui->useMM->isChecked()) ? 25.4 * m_sag/5. : m_sag/5.))/1000. :
+                                            ui->rocStepSize->value();
 }
 
 void foucaultView::on_clearCenterCb_clicked()
@@ -402,6 +402,9 @@ void foucaultView::on_autoStepSize_clicked(bool checked)
     ui->rocStepSize->setEnabled(!checked);
 
     double step = getStep();
+    ui->rocStepSize->setValue(step);
+
+
     for (int i = 0; i< 17; ++i){
         double val = (i - 8) * step * 5;
         findChild<QLabel *>(QString().sprintf("l%d",i))->setText(QString::number(val));

glwidget.cpp

@@ -44,6 +44,7 @@ GLWidget::GLWidget(QWidget *parent, ContourTools* tools, surfaceAnalysisTools* s
       m_flip_y_view(false),
       m_flip_x_view(false)
 {
+    m_spinRate = 5;
     QSettings set;
     m_background = QColor(set.value("oglBackground", "black").toString());
     //====== Initial lighting params
@@ -89,13 +90,19 @@ GLWidget::GLWidget(QWidget *parent, ContourTools* tools, surfaceAnalysisTools* s
     connect(m_tools, SIGNAL(newDisplayErrorRange(double,double)),
             this, SLOT(setMinMaxValues(double,double)));
     connect(tools, SIGNAL(contourColorRangeChanged(QString)), SLOT(contourColorRangeChanged(QString)));
+    connect(&aniTimer, SIGNAL(timeout()),this, SLOT(updateAni()));
 }
 
 GLWidget::~GLWidget()
 {
     makeCurrent();
 }
 
+void GLWidget::updateAni(){
+    setYRotation(yRot + m_spinRate);
+    aniTimer.start(10);
+}
+
 void GLWidget::setBackground(QColor c){
     m_background = c;
     QSettings set;

glwidget.h

@@ -30,6 +30,7 @@
 #include "surfaceanalysistools.h"
 #include "surfacepropertiesdlg.h"
 #define RADIUS 400
+#include <Qtimer>
 class CQuad
 {
 public:
@@ -76,9 +77,12 @@ class GLWidget : public QGLWidget
     int m_blue;
     QCheckBox FillCB;
     QColor m_background;
+    QTimer aniTimer;
     void setBackground(QColor c);
+    int m_spinRate;
 
 public slots:
+    void updateAni();
     void setXRotation(int angle);
     void setYRotation(int angle);
     void setZRotation(int angle);

igramarea.cpp

@@ -152,10 +152,11 @@ void IgramArea::DrawSimIgram(void){
         return;
      QApplication::setOverrideCursor(Qt::WaitCursor);
     //m_demo->hide();
-    int wx = dlg.size;
+    int border = 20;
+    int wx = dlg.size + 2 * border;
     double xcen = (double)(wx-1)/2.;
     double ycen = (double)(wx-1)/2.;
-    int border = 20;
+
     double rad = xcen-border;
     cv::Mat simgram = makeSurfaceFromZerns(border, true);
     //cv::imshow("igram", simgram);