refs #4116. Introduce base type (assumes old name MantidCurve)

Code/Mantid/MantidPlot/CMakeLists.txt

@@ -162,10 +162,11 @@ set ( MANTID_SRCS  src/Mantid/AbstractMantidLog.cpp
                    src/Mantid/ManageCustomMenus.cpp
                    src/Mantid/MantidAbout.cpp
                    src/Mantid/MantidApplication.cpp
-                   src/Mantid/MantidMatrixCurve.cpp
+				   src/Mantid/MantidCurve.cpp
                    src/Mantid/MantidDock.cpp
                    src/Mantid/MantidLog.cpp
                    src/Mantid/MantidMatrix.cpp
+				   src/Mantid/MantidMatrixCurve.cpp
                    src/Mantid/MantidMatrixDialog.cpp
                    src/Mantid/MantidSampleLogDialog.cpp
                    src/Mantid/MantidUI.cpp
@@ -376,9 +377,10 @@ set ( MANTID_HDRS  src/Mantid/AbstractMantidLog.h
                    src/Mantid/ManageCustomMenus.h
                    src/Mantid/MantidAbout.h
                    src/Mantid/MantidApplication.h
-                   src/Mantid/MantidMatrixCurve.h
-                   src/Mantid/MantidDock.h
+				   src/Mantid/MantidCurve.h
+				   src/Mantid/MantidDock.h
                    src/Mantid/MantidLog.h
+                   src/Mantid/MantidMatrixCurve.h
                    src/Mantid/MantidMatrixDialog.h
                    src/Mantid/MantidMatrix.h
                    src/Mantid/MantidSampleLogDialog.h
@@ -639,9 +641,10 @@ set ( MANTID_MOC_FILES src/Mantid/AlgMonitor.h
                        src/Mantid/ManageCustomMenus.h
                        src/Mantid/MantidAbout.h
                        src/Mantid/MantidApplication.h
-                       src/Mantid/MantidMatrixCurve.h
+                       src/Mantid/MantidCurve.h
                        src/Mantid/MantidDock.h
                        src/Mantid/MantidLog.h
+					   src/Mantid/MantidMatrixCurve.h
                        src/Mantid/MantidMatrixDialog.h
                        src/Mantid/MantidMatrix.h
                        src/Mantid/MantidSampleLogDialog.h

Code/Mantid/MantidPlot/src/Mantid/MantidCurve.h

+#ifndef MANTIDPLOT_MANTIDCURVE_H
+#define MANTIDPLOT_MANTIDCURVE_H
+
+#include "../PlotCurve.h"
+#include "MantidQtAPI/WorkspaceObserver.h"
+
+class MantidCurve :public PlotCurve, public MantidQt::API::WorkspaceObserver
+{
+public:
+  MantidCurve(const QString& wsName):PlotCurve(wsName), 
+  WorkspaceObserver()
+  {
+  }
+  MantidCurve():PlotCurve(), 
+  WorkspaceObserver()
+  {
+  }
+};
+
+#endif
+

Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp

@@ -25,8 +25,7 @@ using namespace MantidQt::API;
  *  @throw std::invalid_argument if the index is out of range for the given workspace
  */
 MantidMatrixCurve::MantidMatrixCurve(const QString& name,const QString& wsName,Graph* g,int index,bool err,bool distr)
-  :PlotCurve(name), 
-  WorkspaceObserver(),
+  :MantidCurve(),
   m_drawErrorBars(err),
   m_drawAllErrorBars(false),
   m_wsName(wsName),
@@ -58,8 +57,7 @@ MantidMatrixCurve::MantidMatrixCurve(const QString& name,const QString& wsName,G
  *  @throw std::invalid_argument if the index is out of range for the given workspace
  */
 MantidMatrixCurve::MantidMatrixCurve(const QString& wsName,Graph* g,int index,bool err,bool distr)
-  :PlotCurve(), 
-  WorkspaceObserver(), 
+  :MantidCurve(),
   m_drawErrorBars(err),
   m_drawAllErrorBars(false),
   m_wsName(wsName),
@@ -86,8 +84,7 @@ MantidMatrixCurve::MantidMatrixCurve(const QString& wsName,Graph* g,int index,bo
 }
 
 MantidMatrixCurve::MantidMatrixCurve(const MantidMatrixCurve& c)
-  :PlotCurve(createCopyName(c.title().text())),
-  WorkspaceObserver(),
+  :MantidCurve(createCopyName(c.title().text())),
   m_drawErrorBars(c.m_drawErrorBars),
   m_drawAllErrorBars(c.m_drawAllErrorBars),
   m_wsName(c.m_wsName),

Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.h

-#ifndef MANTID_CURVE_H
-#define MANTID_CURVE_H
+#ifndef MANTID_MATRIX_CURVE_H
+#define MANTID_MATRIX_CURVE_H
 
-#include "../PlotCurve.h"
-#include "MantidQtAPI/WorkspaceObserver.h"
+#include "MantidCurve.h"
 #include <boost/shared_ptr.hpp>
 #include "MantidAPI/MatrixWorkspace.h"
 
@@ -42,7 +41,7 @@ class MantidUI;
     Code Documentation is available at: <http://doxygen.mantidproject.org>    
 */
 
-class MantidMatrixCurve:public PlotCurve, public MantidQt::API::WorkspaceObserver
+class MantidMatrixCurve:public MantidCurve
 {
   Q_OBJECT
 public: