Merge pull request #327 from githubdoe/averageProfile

When creating a wavefront based on the average profile, it adds "_avg" to the wavefront name

Author: gr5

profilecurve.cpp

@@ -4,6 +4,8 @@
 #include <qpainter.h>
 #include <qpainterpath.h>
 #include <qwt_scale_map.h>
+#include <qpainter.h>
+
 
 // creates a curve of the profile and will highlight segments where the slope is violated if the user has that feature enabled.
 // uses the base class for most of the work.  Overrides the actual painting of the line.
@@ -24,10 +26,7 @@ void ProfileCurve::setSlopeSettings(bool show, double limit, int highlightWidth)
     m_highlightWidth = highlightWidth;
 }
 
-#include <QPainterPath> // Ensure this is at the top of profilecurve.cpp
 
-#include <qwt_scale_map.h>
-#include <qpainter.h>
 
 void ProfileCurve::drawLines(QPainter *painter,
                              const QwtScaleMap &xMap,

profileplot.cpp

@@ -710,7 +710,7 @@ qDebug() << "Populate";
                 y_offset = m_waveFrontyOffsets[name];
             else if (m_waveFrontyOffsets.contains(name + " avg")){
                 y_offset = m_waveFrontyOffsets[name + " avg"];
-                qDebug() << "using avg";
+
             }
 
             // if show one angle
@@ -1171,5 +1171,5 @@ void ProfilePlot::CreateWaveFrontFromAverage(){
     sm->createSurfaceFromPhaseMap(result,
                               m_wf->m_outside,
                               m_wf->m_inside,
-                              QString("avg"), WavefrontOrigin::Average);
+                              QString(m_wf->name.replace(".wft","")  + "_avg"), WavefrontOrigin::Average);
 }