refs #5167. Separate classes into headers

mantidproject · Aug 30, 2012 · 2766c0f · 2766c0f
1 parent 0f915e6
commit 2766c0f
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 35 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -19,11 +19,13 @@ set ( SRC_FILES
 # Include files aren't required, but this makes them appear in Visual Studio
 set ( INC_FILES
 	inc/MantidQtSliceViewer/ColorBarWidget.h
+	inc/MantidQtSliceViewer/ConcretePeaksPresenter.h
 	inc/MantidQtSliceViewer/CustomTools.h
 	inc/MantidQtSliceViewer/DimensionSliceWidget.h
 	inc/MantidQtSliceViewer/LineOverlay.h
 	inc/MantidQtSliceViewer/LinePlotOptions.h
 	inc/MantidQtSliceViewer/LineViewer.h
+	inc/MantidQtSliceViewer/NullPeaksPresenter.h
     inc/MantidQtSliceViewer/PeakOverlay.h
     inc/MantidQtSliceViewer/PeakOverlayView.h
     inc/MantidQtSliceViewer/PeakOverlayViewFactory.h

diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ConcretePeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/ConcretePeaksPresenter.h
@@ -0,0 +1,32 @@
+#ifndef MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_
+#define MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_
+
+#include "MantidQtSliceViewer/PeaksPresenter.h"
+#include <vector>
+
+namespace MantidQt
+{
+  namespace SliceViewer
+  {
+    /*---------------------------------------------------------
+    ConcretePeaksPresenter
+
+    Concrete implmentation of the Peaks presenter. 
+    ----------------------------------------------------------*/
+    class DLLExport ConcretePeaksPresenter : public PeaksPresenter
+    {
+    public:
+      ConcretePeaksPresenter(PeakOverlayViewFactory* factory, boost::shared_ptr<Mantid::API::IPeaksWorkspace> peaksWS);
+      virtual ~ConcretePeaksPresenter();
+      virtual void update();
+      virtual void updateWithSlicePoint(const double& slicePoint);
+    private:
+      typedef std::vector< boost::shared_ptr<PeakOverlayView> > VecPeakOverlayView;
+      /// Peak overlay views.
+      VecPeakOverlayView m_viewPeaks;
+    };
+
+  }
+}
+
+#endif /* MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_ */
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/NullPeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/NullPeaksPresenter.h
@@ -0,0 +1,27 @@
+#ifndef MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
+#define MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
+
+#include "MantidQtSliceViewer/PeaksPresenter.h"
+
+namespace MantidQt
+{
+  namespace SliceViewer
+  {
+    /*---------------------------------------------------------
+    NullPeaksPresenter
+
+    This implementation prevents the client code having to run Null checks on the PeaksPresenter pointer before using it.
+    ----------------------------------------------------------*/
+    class DLLExport NullPeaksPresenter : public PeaksPresenter
+    {
+    public:
+      virtual void update(){};
+      virtual void updateWithSlicePoint(const double&)
+      {
+      }
+    };
+
+  }
+}
+
+#endif /* MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_ */
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksPresenter.h
@@ -2,7 +2,6 @@
 #define MANTID_SLICEVIEWER_PEAKSPRESENTER_H_
 
 #include "MantidKernel/System.h"
-#include <vector>
 #include <boost/shared_ptr.hpp>
 #include "MantidKernel/System.h"
 
@@ -33,37 +32,6 @@ namespace SliceViewer
     virtual void updateWithSlicePoint(const double&) = 0;
   };
 
-  /*---------------------------------------------------------
-  NullPeaksPresenter
-
-  This implementation prevents the client code having to run Null checks on the PeaksPresenter pointer before using it.
-  ----------------------------------------------------------*/
-  class DLLExport NullPeaksPresenter : public PeaksPresenter
-  {
-  public:
-    virtual void update(){};
-    virtual void updateWithSlicePoint(const double&)
-    {
-    }
-  };
-
-  /*---------------------------------------------------------
-  ConcretePeaksPresenter
-
-  Concrete implmentation of the Peaks presenter. 
-  ----------------------------------------------------------*/
-  class DLLExport ConcretePeaksPresenter : public PeaksPresenter
-  {
-  public:
-    ConcretePeaksPresenter(PeakOverlayViewFactory* factory, boost::shared_ptr<Mantid::API::IPeaksWorkspace> peaksWS);
-    virtual ~ConcretePeaksPresenter();
-    virtual void update();
-    virtual void updateWithSlicePoint(const double& slicePoint);
-  private:
-    typedef std::vector< boost::shared_ptr<PeakOverlayView> > VecPeakOverlayView;
-    /// Peak overlay views.
-    VecPeakOverlayView m_viewPeaks;
-  };
 
   typedef boost::shared_ptr<PeaksPresenter> PeaksPresenter_sptr;
   typedef boost::shared_ptr<const PeaksPresenter> PeaksPresenter_const_sptr;

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/PeaksPresenter.cpp b/Code/Mantid/MantidQt/SliceViewer/src/PeaksPresenter.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtSliceViewer/PeaksPresenter.h"
+#include "MantidQtSliceViewer/ConcretePeaksPresenter.h"
 #include "MantidAPI/IPeaksWorkspace.h"
 #include "MantidAPI/IPeak.h"
 #include "MantidQtSliceViewer/PeakOverlayViewFactory.h"

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -18,7 +18,8 @@
 #include "MantidQtSliceViewer/SliceViewer.h"
 #include "MantidQtSliceViewer/SnapToGridDialog.h"
 #include "MantidQtSliceViewer/XYLimitsDialog.h"
-#include "MantidQtSliceViewer/PeaksPresenter.h"
+#include "MantidQtSliceViewer/ConcretePeaksPresenter.h"
+#include "MantidQtSliceViewer/NullPeaksPresenter.h"
 #include "MantidQtSliceViewer/PeakOverlayFactory.h"
 #include "MantidQtMantidWidgets/SelectWorkspacesDialog.h"
 #include "qmainwindow.h"

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/PeaksPresenterTest.h b/Code/Mantid/MantidQt/SliceViewer/test/PeaksPresenterTest.h
@@ -5,7 +5,7 @@
 #include <gmock/gmock.h>
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidAPI/IPeak.h"
-#include "MantidQtSliceViewer/PeaksPresenter.h"
+#include "MantidQtSliceViewer/ConcretePeaksPresenter.h"
 #include "MantidQtSliceViewer/PeakOverlayViewFactory.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"