Require the distribution flag rather than it being optional

Refs #10639
mantidproject · Nov 27, 2014 · 76f841b · 76f841b
1 parent 50d8c83
commit 76f841b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/QwtWorkspaceSpectrumData.h b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/QwtWorkspaceSpectrumData.h
@@ -8,14 +8,29 @@
 #include <boost/shared_ptr.hpp>
 #include <QString>
 
+namespace MantidQt
+{
+
+  // Enumerate how to handle distributions
+  enum DistributionFlag
+  {
+    DistributionDefault = 0, // Use preferences value
+    DistributionTrue, // Force distribution plotting
+    DistributionFalse // Disable distribution plotting
+  };
+
+}
+
 //=================================================================================================
 //=================================================================================================
 /**  This class implements QwtData with direct access to a spectrum in a MatrixWorkspace.
  */
 class EXPORT_OPT_MANTIDQT_API QwtWorkspaceSpectrumData : public MantidQwtMatrixWorkspaceData
 {
 public:
-  QwtWorkspaceSpectrumData(const Mantid::API::MatrixWorkspace & workspace, int specIndex, const bool logScale, bool distr = false);
+
+  QwtWorkspaceSpectrumData(const Mantid::API::MatrixWorkspace & workspace, int specIndex,
+                           const bool logScale, const bool distr);
 
   //! @return Pointer to a copy (virtual copy constructor)
   virtual QwtWorkspaceSpectrumData *copy() const;

diff --git a/Code/Mantid/MantidQt/API/src/QwtWorkspaceSpectrumData.cpp b/Code/Mantid/MantidQt/API/src/QwtWorkspaceSpectrumData.cpp
@@ -3,8 +3,15 @@
 
 #include <QStringBuilder>
 
-/// Constructor
-QwtWorkspaceSpectrumData::QwtWorkspaceSpectrumData(const Mantid::API::MatrixWorkspace & workspace,int specIndex, const bool logScale, bool distr)
+/**
+ * Construct a QwtWorkspaceSpectrumData object with a source workspace
+ * @param workspace The workspace containing the data
+ * @param specIndex Index of the spectrum to plot
+ * @param logScale If true, plot a log scale
+ * @param distr If true, plot the Y values/X bin-width
+ */
+QwtWorkspaceSpectrumData::QwtWorkspaceSpectrumData(const Mantid::API::MatrixWorkspace & workspace,
+                                                   int specIndex, const bool logScale, const bool distr)
  : m_spec(specIndex),
    m_X(workspace.readX(specIndex)),
    m_Y(workspace.readY(specIndex)),

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTab.cpp
@@ -200,7 +200,8 @@ namespace CustomInterfaces
     if( wsIndex >= workspace->getNumberHistograms() || workspace->readX(0).size() < 2 )
       return;
 
-    QwtWorkspaceSpectrumData wsData(*workspace, static_cast<int>(wsIndex), false);
+    const bool logScale(false), distribution(false);
+    QwtWorkspaceSpectrumData wsData(*workspace, static_cast<int>(wsIndex), logScale, distribution);
 
     removeCurve(cID);
 

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/LineViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/LineViewer.cpp
@@ -1084,7 +1084,8 @@ void LineViewer::showFull()
   MatrixWorkspace_sptr sliceMatrix = boost::dynamic_pointer_cast<MatrixWorkspace>(m_sliceWS);
   if (sliceMatrix)
   {
-    QwtWorkspaceSpectrumData curveData(*sliceMatrix, 0, isLogScaledY());
+    const bool distribution(false);
+    QwtWorkspaceSpectrumData curveData(*sliceMatrix, 0, isLogScaledY(), distribution);
     m_fullCurve->setData(curveData);
     setupScaleEngine(curveData);
     m_plot->setAxisTitle( QwtPlot::xBottom, curveData.getXAxisLabel() );