Went with Julien's suggestion and moved enums into a class. This will

increase readability slightly and eliminate potential global label conflicts.

Author: gr5

dftarea.cpp

@@ -1049,7 +1049,7 @@ void DFTArea::makeSurface(){
         showData("result surface", result.clone());
     }
 
-    emit newWavefront(result, m_outside, m_center, QFileInfo(igramArea->m_filename).baseName(), wfIgram,
+    emit newWavefront(result, m_outside, m_center, QFileInfo(igramArea->m_filename).baseName(), WavefrontOrigin::Igram,
                         m_poly);
     QApplication::restoreOverrideCursor();
     success = true;
@@ -1514,7 +1514,7 @@ qDebug() << "rec" << left << top << width << height;
         m_center.m_center.rx() =  (result.cols-1) - m_center.m_center.x();
     }
     QString wfname = QString("PSI")+ finfo.baseName() + QString("-") + QFileInfo(m_psiFiles[imagecount-1]).baseName();
-    emit newWavefront(result, m_outside, m_center, wfname, wfIgram, m_poly);
+    emit newWavefront(result, m_outside, m_center, wfname, WavefrontOrigin::Igram, m_poly);
     QApplication::restoreOverrideCursor();
 }
 

mainwindow.cpp

@@ -862,7 +862,7 @@ void MainWindow::on_actionWavefront_triggered()
     m_surfaceManager->createSurfaceFromPhaseMap(result,
                                                 CircleOutline(QPointF(xcen,ycen),rad),
                                                 CircleOutline(QPointF(0,0),0),
-                                                QString("Simulated_Wavefront"), wfSimulation);
+                                                QString("Simulated_Wavefront"), WavefrontOrigin::Simulation);
 }
 
 void MainWindow::on_actionIgram_triggered()

surfacemanager.cpp

@@ -384,8 +384,8 @@ void SurfaceManager::generateSurfacefromWavefront(wavefront * wf){
 		//
 
         if (!m_ignoreInverse &&
-		    wf->m_manuallyInverted == false && // don't auto-invert if user already manually inverted
-			wf->m_origin == wfIgram)           // only auto-invert if wavefront created from processed igram
+		    wf->m_manuallyInverted == false &&      // don't auto-invert if user already manually inverted
+			wf->m_origin == WavefrontOrigin::Igram) // only auto-invert if wavefront created from processed igram
         {
             if (m_inverseMode==invNOTSET)
             {
@@ -815,7 +815,7 @@ void SurfaceManager::useDemoWaveFront(){
     createSurfaceFromPhaseMap(result,
                               CircleOutline(QPointF(xcen,ycen),rad),
                               CircleOutline(QPointF(0,0),0),
-                              QString("Demo"), wfDemo);
+                              QString("Demo"), WavefrontOrigin::Demo);
 }
 
 void SurfaceManager::waveFrontClickedSlot(int ndx)
@@ -1140,7 +1140,7 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
     }
     spdlog::get("logger")->trace("readWaveFront() step 1");
     wavefront *wf = new wavefront();
-	wf->m_origin = wfFile;
+	wf->m_origin = WavefrontOrigin::File;
     double width;
     double height;
     file >> width;
@@ -1646,7 +1646,7 @@ void SurfaceManager::average(QList<wavefront *> wfList){
     wf->data = sum.clone();
     wf->mask = mask;
     wf->workMask = mask.clone();
-    wf->m_origin = wfAverage;
+    wf->m_origin = WavefrontOrigin::Average;
     m_wavefronts << wf;
     wf->wasSmoothed = false;
     wf->name = "Average.wft";
@@ -1671,7 +1671,7 @@ void SurfaceManager::averageComplete(wavefront *wf){
     wf->wasSmoothed = false;
     wf->name = "Average.wft";
     wf->dirtyZerns = true;
-    wf->m_origin = wfAverage;
+    wf->m_origin = WavefrontOrigin::Average;
     m_surfaceTools->addWaveFront(wf->name);
     m_currentNdx = m_wavefronts.size()-1;
     //makeMask(m_currentNdx);
@@ -1816,7 +1816,7 @@ void SurfaceManager::subtract(wavefront *wf1, wavefront *wf2, bool use_null){
     resultwf->data = result.clone();
     resultwf->mask = mask.clone();
     resultwf->workMask = mask.clone();
-    resultwf->m_origin = wfSubtraction;
+    resultwf->m_origin = WavefrontOrigin::Subtraction;
     m_wavefronts << resultwf;
     m_currentNdx = m_wavefronts.size() -1;
 

wavefront.cpp

@@ -18,7 +18,7 @@
 #include "wavefront.h"
 
 wavefront::wavefront():
-    gaussian_diameter(0.),useSANull(true),m_origin(wfUnknown),m_manuallyInverted(false),dirtyZerns(true),regions_have_been_expanded(false)
+    gaussian_diameter(0.),useSANull(true),m_origin(WavefrontOrigin::Unknown),m_manuallyInverted(false),dirtyZerns(true),regions_have_been_expanded(false)
 {
 }
 

wavefront.h

@@ -20,7 +20,18 @@
 #include <opencv2/opencv.hpp>
 #include "Circleoutline.h"
 #include <QPointF>
-enum WavefrontOrigin {wfUnknown, wfIgram, wfFile, wfSimulation, wfAverage, wfSubtraction, wfDemo, wfZernikes, wfSmoothed};
+
+enum class WavefrontOrigin : std::uint8_t {
+    Unknown = 0,
+    Igram,
+    File,
+    Simulation,
+    Demo,
+    Average,
+    Subtraction,
+    Zernikes,
+    Smoothed
+};
 class wavefront
 {
 public:

zernikeeditdlg.cpp

@@ -86,7 +86,7 @@ void zernikeEditDlg::on_createSurface_clicked()
 
     m_sm->createSurfaceFromPhaseMap(result, CircleOutline(QPointF(xcen,ycen),rad),
                                                 CircleOutline(QPointF(0,0),0),
-                                                QString("Zernike_Wavefront"), wfZernikes);
+                                                QString("Zernike_Wavefront"), WavefrontOrigin::Zernikes);
 }
 
 void zernikeEditDlg::on_clearAll_clicked()

zernikesmoothingdlg.cpp

@@ -134,7 +134,7 @@ void ZernikeSmoothingDlg::on_createWaveFront_clicked()
     l.back().append(QString("_sm%1").arg(m_noOfTerms));
 
     m_sm->createSurfaceFromPhaseMap(result, m_wf.m_outside, m_wf.m_inside
-                                               ,l.back(), wfSmoothed);
+                                               ,l.back(), WavefrontOrigin::Smoothed);
 
     if (ui->showResidual->isChecked()){
         m_sm->subtract(&m_wf, m_sm->m_wavefronts.back(), false);