Added simple progress reporting to Spline algorithms.

Refs #7565
mantidproject · Aug 5, 2013 · e86393b · e86393b
1 parent 346187f
commit e86393b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp b/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp
@@ -16,6 +16,7 @@ of the bin boundaries. This will cause some values to fall outside of the range
  *WIKI*/
 
 #include "MantidAPI/TextAxis.h"
+#include "MantidAPI/Progress.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidCurveFitting/SplineInterpolation.h"
 
@@ -115,6 +116,8 @@ namespace Mantid
 
       MatrixWorkspace_sptr outputWorkspace = setupOutputWorkspace(mws, histNo);
 
+      Progress pgress(this, 0.0, 1.0, histNo);
+
       //for each histogram in workspace, calculate interpolation and derivatives
       for (int i = 0; i < histNo; ++i)
       {
@@ -138,6 +141,8 @@ namespace Mantid
             calculateDerivatives(mwspt, derivs[i], j+1);
           }
         }
+
+        pgress.report();
       }
 
       //Store the output workspaces

diff --git a/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp b/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp
@@ -11,6 +11,7 @@ If the input workspace contains histograms, rather than data points, then Spline
 
 #include "MantidAPI/IFunction1D.h"
 #include "MantidAPI/FunctionFactory.h"
+#include "MantidAPI/Progress.h"
 #include "MantidAPI/TextAxis.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/BoundedValidator.h"
@@ -108,6 +109,7 @@ namespace CurveFitting
     MatrixWorkspace_sptr outputWorkspace = setupOutputWorkspace(inputWorkspaceBinned, histNo);
     std::vector<MatrixWorkspace_sptr> derivs (histNo);
 
+    Progress pgress(this, 0.0, 1.0, histNo);
     for(int i = 0; i < histNo; ++i)
     {
       m_cspline = boost::make_shared<CubicSpline>();
@@ -132,6 +134,8 @@ namespace CurveFitting
           calculateDerivatives(inputWorkspacePt, derivs[i], j+1, i);
         }
       }
+
+      pgress.report();
     }
 
     //prefix to name of deriv output workspaces