Merge pull request #262 from githubdoe/JST/daleworkReview

Several enhancements from dalework. See details in PR

Author: gr5

DFTFringe.pro

@@ -235,6 +235,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     simigramdlg.cpp \
     simulationsview.cpp \
     standastigwizard.cpp \
+    startestmoviedlg.cpp \
     statsview.cpp \
     subtractwavefronatsdlg.cpp \
     surface3dcontrolsdlg.cpp \
@@ -352,6 +353,7 @@ HEADERS += bezier/bezier.h \
     simigramdlg.h \
     simulationsview.h \
     standastigwizard.h \
+    startestmoviedlg.h \
     statsview.h \
     subtractwavefronatsdlg.h \
     surface3dcontrolsdlg.h \
@@ -442,6 +444,7 @@ FORMS += arbitrarywavefronthelp.ui \
     simigramdlg.ui \
     simulationsview.ui \
     standastigwizard.ui \
+    startestmoviedlg.ui \
     statsview.ui \
     subtractwavefronatsdlg.ui \
     surface3dcontrolsdlg.ui \

DFTFringe_Dale.pro

@@ -48,6 +48,7 @@ SOURCES += main.cpp \
     profileplot.cpp \
     profileplotpicker.cpp \
     settingsigramimportconfig.cpp \
+    startestmoviedlg.cpp \
     surface3dcontrolsdlg.cpp \
     surfacegraph.cpp \
     surfacelightingproxy.cpp \
@@ -163,6 +164,7 @@ HEADERS  += mainwindow.h \
     profileplot.h \
     profileplotpicker.h \
     settingsigramimportconfig.h \
+    startestmoviedlg.h \
     surface3dcontrolsdlg.h \
     surfacegraph.h \
     surfacelightingproxy.h \
@@ -276,6 +278,7 @@ FORMS    += mainwindow.ui \
     profileplot.ui \
     contourtools.ui \
     settingsigramimportconfig.ui \
+    startestmoviedlg.ui \
     surface3dcontrolsdlg.ui \
     surfaceanalysistools.ui \
     metricsdisplay.ui \

DFTFringe_QT5.pro

@@ -234,6 +234,7 @@ SOURCES += SingleApplication/singleapplication.cpp \
     simigramdlg.cpp \
     simulationsview.cpp \
     standastigwizard.cpp \
+    startestmoviedlg.cpp \
     statsview.cpp \
     subtractwavefronatsdlg.cpp \
     surface3dcontrolsdlg.cpp \
@@ -351,6 +352,7 @@ HEADERS += bezier/bezier.h \
     simigramdlg.h \
     simulationsview.h \
     standastigwizard.h \
+    startestmoviedlg.h \
     statsview.h \
     subtractwavefronatsdlg.h \
     surface3dcontrolsdlg.h \
@@ -441,6 +443,7 @@ FORMS += arbitrarywavefronthelp.ui \
     simigramdlg.ui \
     simulationsview.ui \
     standastigwizard.ui \
+    startestmoviedlg.ui \
     statsview.ui \
     subtractwavefronatsdlg.ui \
     surface3dcontrolsdlg.ui \

IgramArea.h

@@ -150,13 +150,14 @@ class IgramArea : public QWidget
     void writeOutlines(QString fileName);
     QString makeOutlineName();
     void shiftoutline(QPointF p);
-    void setZoomMode(zoomMode mode);
+
     void showAliasDialog();
     cv::Mat igramToGray(const cv::Mat &roi);
     cv::Mat qImageToMat(QImage &roi);
 private slots:
     void aperatureChanged();
 public slots:
+    void setZoomMode(zoomMode mode);
     void gammaChanged(bool, double);
     void generateSimIgram();
     void clearImage();
@@ -270,7 +271,6 @@ public slots:
     dftThumb *m_dftThumb;
     QTimer *m_outlineTimer;
     bool hasBeenCropped;
-    bool m_edgeMode;
     int m_zoomBoxWidth;
     int m_usingChannel;
     zoomMode m_zoomMode;

annulushelpdlg.ui

@@ -6,14 +6,27 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>508</width>
+    <height>330</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Annulus Help</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetNoConstraint</enum>
+   </property>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QTextEdit" name="textEdit">
      <property name="html">
@@ -33,16 +46,6 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

autoinvertdlg.cpp

@@ -7,6 +7,7 @@ autoInvertDlg::autoInvertDlg(QWidget *parent) :
     ui(new Ui::autoInvertDlg)
 {
     ui->setupUi(this);
+    setSizeGripEnabled(true);
 }
 
 autoInvertDlg::~autoInvertDlg()