Fix the crash. Refs #5195.

mantidproject · May 29, 2012 · d2e3aea · d2e3aea
1 parent 44d547c
commit d2e3aea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp b/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp
@@ -99,14 +99,22 @@ namespace Mantid
     ISpectrum * Workspace2D::getSpectrum(const size_t index)
     {
       if (index>=m_noVectors)
-        throw std::range_error("Workspace2D::getSpectrum, histogram number out of range");
+      {
+        std::stringstream ss;
+        ss << "Workspace2D::getSpectrum, histogram number " << index << " out of range " << m_noVectors;
+        throw std::range_error(ss.str());
+      }
       return data[index];
     }
 
     const ISpectrum * Workspace2D::getSpectrum(const size_t index) const
     {
       if (index>=m_noVectors)
-        throw std::range_error("Workspace2D::getSpectrum, histogram number out of range");
+      {
+        std::stringstream ss;
+        ss << "Workspace2D::getSpectrum, histogram number " << index << " out of range " << m_noVectors;
+        throw std::range_error(ss.str());
+      }
       return data[index];
     }
 

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidMatrix.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidMatrix.cpp
@@ -641,7 +641,6 @@ QwtDoubleRect MantidMatrix::boundingRect()
     x_start = x_end = 0;
     while(x_start == x_end && i0 <= m_endRow)
     {
-      i0++;
       const Mantid::MantidVec& X = m_workspace->readX(i0);
       x_start = X[0];
       if (X.size() != m_workspace->readY(i0).size()) x_end = X[m_workspace->blocksize()];
@@ -651,6 +650,7 @@ QwtDoubleRect MantidMatrix::boundingRect()
       {
         x_start = x_end = 0;
       }
+      i0++;
     }
 
     // if i0 > m_endRow there aren't any plottable rows