Version 1.6 beta. Fixed zernike bug and made other changes, See

revhistory.

Author: githubdoe

DFTFringe.pro

@@ -22,6 +22,7 @@ TARGET = DFTFringe
 TEMPLATE = app
 
 CONFIG += ``
+
 SOURCES += main.cpp\
     mainwindow.cpp \
     igramarea.cpp \
@@ -147,7 +148,6 @@ HEADERS  += mainwindow.h \
     statsview.h \
     jitteroutlinedlg.h \
     nullvariationdlg.h
-
 FORMS    += mainwindow.ui \
     dfttools.ui \
     dftarea.ui \
@@ -205,7 +205,6 @@ CONFIG( debug, debug|release ) {
 INCLUDEPATH += C:\\qwt-6.1.2\\src
 
 
-
 INCLUDEPATH += c:\opencv\build\include
 LIBS += C:/opencv/build-mingw/bin/*.dll
 
@@ -220,7 +219,7 @@ RC_FILE = DFTFringe.rc
 
 
 # The application version
-VERSION = 1.4
+VERSION = 1.6
 
 # Define the preprocessor macro to get the application version in our application.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

RevisionHistory.html

@@ -36,6 +36,17 @@
 
 
 </ul></ul>
+<ul><li>Version 1.6-beta</li>
+<ul><li>Corrected zernike calculating bug introduced in vers 1.2 Should give reliable results once again.</li>
+<li> Added software null error tolerance in view menu. </li>
+<li> Modified outline boundary slightly to eliminate fringes around mirror after DFT analysis.</li>
+<li> Added gamma (contrast) horizontal slider control to DFT tools.</li>
+<li> Corrected issues when several wavefronts are loaded and a change propigates thru all with the last one in the list
+displaying the correct metrics.Hopefully smoothing remains if enabled.</li>
+<li> Gaussian smoothing modified to not include data outise mirror outside board when calculating smoothing just inside the outline.</li>
+</ul></ul>
+
+
 <h3>Known bugs</h3>
 <p>Outline does not always appear on interferogram when processing in batch mode.  Workaround is to rotate the mouse wheel to resize it
 when in Manual mode batch.</p>

contourview.h

@@ -33,6 +33,7 @@ class contourView : public QWidget
     explicit contourView(QWidget *parent = 0, ContourTools *tools = 0);
     ~contourView();
     ContourPlot *getPlot();
+    bool zoomed;
 signals:
     void lineSpacingChanged(double);
     void showAllContours();
@@ -45,7 +46,7 @@ private slots:
 
 private:
     Ui::contourView *ui;
-    bool zoomed;
+
 };
 
 #endif // CONTOURVIEW_H

dftarea.cpp

@@ -29,11 +29,11 @@ cv::Mat  makeMask(CircleOutline outside, CircleOutline center, cv::Mat data){
     int width = data.cols;
     int height = data.rows;
 
-    double radm = outside.m_radius+1;  //Don't know why but +1 gives the best result match to the expected value.
+    double radm = ceil(outside.m_radius);
     double rado = center.m_radius;
     double cx = outside.m_center.x();
     double cy = outside.m_center.y();
-    cv::Mat mask = cv::Mat::zeros(height,width,CV_8UC1);
+    cv::Mat mask = cv::Mat::ones(height,width,CV_8UC1);
     for (int y = 0; y < height; ++y){
         for (int x = 0; x < width; ++x){
             double dx = (double)(x - (cx))/(radm);
@@ -57,13 +57,14 @@ cv::Mat  makeMask(CircleOutline outside, CircleOutline center, cv::Mat data){
     return mask;
 }
 
-DFTArea::DFTArea(QWidget *parent, IgramArea *ip, DFTTools * tools, vortexDebug *vdbug) :
-    QWidget(parent),m_size(640), tools(tools),
+DFTArea::DFTArea(QWidget *mparent, IgramArea *ip, DFTTools * tools, vortexDebug *vdbug) :
+    QWidget(mparent),m_size(640), tools(tools),
     dftSizeStr("640 X 640"), m_center_filter(10.),ui(new Ui::DFTArea),igramArea(ip),m_smooth(9.),
     m_vortexDebugTool(vdbug)
 
 {
     ui->setupUi(this);
+    m_gamma = 2.5;
     connect(tools,SIGNAL(dftChannel(const QString&)), this, SLOT(setChannel(const QString&)));
     connect(tools,SIGNAL(dftSizeChanged(const QString&)), this, SLOT(dftSizeChanged(const QString&)));
     connect(tools,SIGNAL(dftSizeVal(int)), this, SLOT(dftSizeVal(int)));
@@ -155,22 +156,20 @@ Mat DFTArea::grayComplexMatfromImage(QImage &img){
     double centerY = igramArea->m_outside.m_center.y();
     double rad = igramArea->m_outside.m_radius;
     double radpix = ceil(rad);
-    double left = centerX - radpix;
-    double top = centerY - radpix;
+    int border = 10;
+    double left = floor((centerX - radpix - border));
+    double top = floor(centerY - radpix - border);
     vector<Mat > bgr_planes;
     top = max(top,0.);
     left = max(left,0.);
-    int width = 2. * (radpix);
+    int width = ceil(2. * (radpix) + 2 * border);
     width = min(width, img.width());
 
     // new center because of crop
     double xCenterShift = centerX - left;
     double yCenterShift = centerY - top;
 
     cv::Mat iMat(img.height(), img.width(), CV_8UC4, img.bits(), img.bytesPerLine());
-    cv::Mat tmp = iMat.clone();
-
-
     cv::Mat roi = iMat(cv::Rect((int)left,(int)top,(int)width,(int)width)).clone();
 
     double centerDx = centerX - igramArea->m_center.m_center.x();
@@ -187,7 +186,7 @@ Mat DFTArea::grayComplexMatfromImage(QImage &img){
     if (scaleFactor < 1.){
 
         cv::resize(roi,roi, cv::Size(0,0), scaleFactor, scaleFactor);
-        double roic = roi.rows/2.;
+        double roic = (roi.rows-1)/2.;
         m_outside = CircleOutline(QPointF(roic,roic),roic);
         m_center = CircleOutline(QPointF((roic - centerDx * scaleFactor), (roic - centerDy * scaleFactor)),
                                  m_center.m_radius * scaleFactor);
@@ -205,6 +204,7 @@ Mat DFTArea::grayComplexMatfromImage(QImage &img){
 
     split( roi, bgr_planes );
 
+
     cv::Scalar mean;
     mean =  cv::mean(roi);
     double maxMean = 0;
@@ -224,32 +224,47 @@ Mat DFTArea::grayComplexMatfromImage(QImage &img){
     else if (channel == "Green") maxndx = 1;
     else if (channel == "Red") maxndx = 2;
     qDebug() << "Max channel " << maxndx;
+    Mat padded = bgr_planes[maxndx].clone();
 
-    Mat  padded;                            //expand input image to optimal size
     int m = getOptimalDFTSize( roi.rows ) - roi.rows;
     int n = getOptimalDFTSize( roi.cols ) - roi.cols; // on the border add zero values
-    m =0;
+    // disabled adding optomizing DFT boarder.
+    m = 0;
     n = 0;
     qDebug() << "pady " << m << " padx " << n;
     if (m > 0 || n > 0)
-        copyMakeBorder(bgr_planes[maxndx], padded, 0, m, 0, n, BORDER_CONSTANT, Scalar::all(0));
-    else
-        padded = bgr_planes[maxndx].clone();
+        copyMakeBorder(padded, padded, 0, m, 0, n, BORDER_CONSTANT, Scalar::all(mean[maxndx]));
+
     padded = padded - mean[maxndx];
-    // disabled adding optomizing DFT boarder.
+
     Mat planes[] = {Mat_<float>(padded), Mat::zeros(padded.size(), CV_32F)};
 
-    m_mask = makeMask(m_outside,m_center,*planes);
-    if (Settings2::showMask())
-        showData("Mask", m_mask);
+    m_mask = makeMask(m_outside,m_center, *planes);
+    if (Settings2::showMask()){
+        Mat tmp = planes[0].clone();
+        normalize(tmp, tmp,0,255,CV_MINMAX);
+        tmp.convertTo(tmp,CV_8U);
+        Mat mm;
+        Mat channels[3];
+
+        channels[1] = m_mask;
+        channels[2] = tmp;
+        channels[0] = m_mask;
+        merge(channels,3,mm);
+        for (int i = 0; i < 3; ++i){
+            //imshow(QString().number(i).toStdString().c_str(),channels[i]);
+        }
+        imshow("mm", mm);
+        waitKey(1);
+
+    }
     cv::Mat tmpMask;
 
     planes[0].copyTo(tmpMask,m_mask);    // Convert image to binary
     planes[0] = tmpMask.clone();
     mean =  cv::mean(planes[0],m_mask);
     planes[0] -= mean;
-    //matDisplay md(planes[0],mean[0]);
-    //md.exec();
+
     Mat  complexI;
     merge(planes, 2, complexI);         // Add to the expanded another plane with zeros
     return complexI;
@@ -346,26 +361,40 @@ void DFTArea::doDFT(){
     cv::Mat realImage;
     dft(complexI,realImage,DFT_INVERSE);
     split(realImage,planes);
-    //cv::imshow("Inverse", planes[0]/(planes[0].cols * planes[0].rows));
-    //cv::waitKey(1);
+
     shiftDFT(complexI);
     m_dft = complexI/complexI.size().area();
 
-    magIImage = showMag(complexI);
+    magIImage = showMag(complexI,false,"", true, m_gamma);
+    scale = 1.;
+    double h = magIImage.height();
+    qDebug() <<" dft size "<< size();
+    scale = double(parentWidget()->size().height())/h;
+    if (scale < 1.)
+        scale = 1.;
+    magIImage = magIImage.scaled(magIImage.width() * scale, magIImage.height() * scale);
+    setMinimumSize(magIImage.size());
 
     //emit selectDFTTab();
     update();
     if (Settings2::showDFT())
         emit dftReady(magIImage);     //Creates a thumbnail dft area
 }
+void DFTArea::gamma(int i){
+    double v = 1. + 5. * (double)i/99.;
+    m_gamma = v;
+    doDFT();
+}
+
 void DFTArea::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
     painter.drawImage(QPoint(0,0),magIImage);
     painter.setBrush(QColor(0,0,100,50));
-    painter.drawEllipse(QPointF(magIImage.width()/2,magIImage.height()/2), m_center_filter,m_center_filter);
+    painter.drawEllipse(QPointF(magIImage.width()/2,magIImage.height()/2),
+                        scale * m_center_filter,scale * m_center_filter);
     if (m_center_filter > 0.) {
-        double val = (double)m_center_filter;
+        double val = (double)m_center_filter * scale;
         val *= val;
         int last = 0;
         for (int i = 0; i < magIImage.width()-1; ++i){
@@ -379,13 +408,7 @@ void DFTArea::paintEvent(QPaintEvent *)
         }
     }
 }
-void DFTArea::resizeIgram(){
-
-}
 
-void DFTArea::setFilter(double){
-
-}
 
 #define WRAP(x) (((x) > 0.5) ? ((x)-1.0) : (((x) <= -0.5) ? ((x)+1.0) : (x)))
 #define WRAPPI(x) (((x) > M_PI) ? ((x)-2*M_PI) : (((x) <= -M_PI) ? ((x)+2*M_PI) : (x)))
@@ -802,8 +825,8 @@ void DFTArea::makeSurface(){
            phase.size().width, phase.size().height);
 
     flip(result,result,0); // flip around x axis.
-    m_outside.m_center.ry() = wy - m_outside.m_center.y() - 1;
-    m_center.m_center.ry() = wy - m_center.m_center.y() - 1;
+    m_outside.m_center.ry() = result.rows - m_outside.m_center.y();
+    m_center.m_center.ry() = result.rows - m_center.m_center.y();
     mirrorDlg *md = mirrorDlg::get_Instance();
     if (md->fringeSpacing != 1.){
         result *= md->fringeSpacing;
@@ -832,7 +855,7 @@ void DFTArea::mouseMoveEvent(QMouseEvent *event){
     int xcenter = (magIImage.width() -1)/2;
     int ycenter = (magIImage.height()-1)/2;
     int rad = sqrt(pow(pos.x()-xcenter,2)+pow(pos.y() - ycenter,2));
-    emit updateFilterSize(rad);
+    emit updateFilterSize(rad/scale);
 }
 
 void DFTArea::mousePressEvent(QMouseEvent *event)
@@ -844,7 +867,7 @@ void DFTArea::mousePressEvent(QMouseEvent *event)
         int ycenter = (magIImage.height()-1)/2;
         int rad = sqrt(pow(Raw.x()-xcenter,2)+pow(Raw.y() - ycenter,2));
 
-        emit updateFilterSize(rad);
+        emit updateFilterSize(rad/scale);
         capture = true;
     }
 

dftarea.h

@@ -55,14 +55,13 @@ class DFTArea : public QWidget
                double low);
 public slots:
     void doDFT();
-    void resizeIgram();
-    void setFilter(double);
     void dftSizeChanged(const QString&);
     void dftSizeVal(int);
     void setChannel(const QString&);
     void dftCenterFilter(double v);
     void makeSurface();
     void newIgram(QImage);
+    void gamma(int);
 signals:
     void setDftSizeVal(int);
     void selectDFTTab();
@@ -76,6 +75,7 @@ public slots:
     bool capture;
     CircleOutline m_outside;
     CircleOutline m_center;
+    double m_gamma;
 
     IgramArea *igramArea;
     void paintEvent(QPaintEvent *);
@@ -87,6 +87,7 @@ public slots:
     vortexDebug    *m_vortexDebugTool;
     int m;  // x border added to dft
     int n;  //y border added to dft
+    double scale;
 };
 
 

dftarea.ui

@@ -1,21 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author/>
- <comment/>
- <exportmacro/>
  <class>DFTArea</class>
- <widget name="DFTArea" class="QWidget">
+ <widget class="QWidget" name="DFTArea">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>800</width>
+    <height>800</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>1</horstretch>
+    <verstretch>1</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout"/>
  </widget>
- <pixmapfunction/>
+ <resources/>
  <connections/>
 </ui>

dfttools.cpp

@@ -34,6 +34,7 @@ DFTTools::DFTTools(QWidget *parent) :
 }
 void DFTTools::connectTo(QWidget *view){
     connect(view, SIGNAL(updateFilterSize(int)),this, SLOT(setCenterFilterValue(int)));
+    connect(ui->gammaSl, SIGNAL(valueChanged(int)), view, SLOT(gamma(int)));
 }
 DFTTools::~DFTTools()
 {
@@ -67,3 +68,5 @@ void DFTTools::on_computeDFT_pressed()
 {
     emit doDFT();
 }
+
+

dfttools.h

@@ -41,7 +41,8 @@ class DFTTools : public QDockWidget
     void dftSizeVal(int);
     void dftCenterFilter(double);
     void makeSurface();
-
+    void enlarge(bool);
+    void gamma(double);
 
 private slots:
 
@@ -53,6 +54,7 @@ private slots:
 
     void on_computeDFT_pressed();
 
+
 private:
     Ui::DFTTools *ui;
 };