Check once for NULL graph pointer in *Curve constructors.

Refs #7994
mantidproject · Sep 30, 2013 · 293893c · 293893c
1 parent 4866c32
commit 293893c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidMDCurve.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidMDCurve.cpp
@@ -24,6 +24,10 @@ MantidMDCurve::MantidMDCurve(const QString& wsName,Graph* g,bool err,bool distr,
   :MantidCurve(wsName, err),
   m_wsName(wsName)
 {
+  if(!g)
+  {
+    throw std::invalid_argument("MantidMDCurve::MantidMDCurve() - NULL graph pointer not allowed");
+  }
   init(g,distr,style);
 }
 
@@ -77,10 +81,7 @@ void MantidMDCurve::init(Graph* g, bool distr, Graph::CurveType style)
   {
     setStyle(QwtPlotCurve::Lines);
   }
-  if (g)
-  {
-    g->insertCurve(this,lineWidth);
-  }
+  g->insertCurve(this,lineWidth);
   connect(g,SIGNAL(axisScaleChanged(int,bool)),this,SLOT(axisScaleChanged(int,bool)));
   observePostDelete();
   connect( this, SIGNAL(resetData(const QString&)), this, SLOT(dataReset(const QString&)) );

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
@@ -33,6 +33,10 @@ MantidMatrixCurve::MantidMatrixCurve(const QString&,const QString& wsName,Graph*
   m_wsName(wsName),
   m_index(index)
 {
+  if(!g)
+  {
+    throw std::invalid_argument("MantidMatrixCurve::MantidMatrixCurve - NULL graph pointer not allowed");
+  }
   init(g,distr,style);
 }
 
@@ -131,12 +135,7 @@ void MantidMatrixCurve::init(Graph* g,bool distr,Graph::CurveType style)
   {
     setStyle(QwtPlotCurve::Lines);
   }
-
-
-  if (g)
-  {
-    g->insertCurve(this,lineWidth);
-  }
+  g->insertCurve(this,lineWidth);
 
   // Initialise error bar colour to match curve colour
   m_errorSettings->m_color = pen().color();