refs #7281. Make room for PeakOverlayMultiSphere.

mantidproject · Jun 12, 2013 · 496d055 · 496d055
1 parent 64ef263
commit 496d055
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 235 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -8,8 +8,8 @@ set ( SRC_FILES
 	src/LineViewer.cpp
 	src/PeakBoundingBox.cpp
 	src/PeaksViewerOptionsDialog.cpp
-	src/PeakOverlayMulti.cpp
-    src/PeakOverlayMultiFactory.cpp    
+	src/PeakOverlayMultiCross.cpp
+	src/PeakOverlayMultiCrossFactory.cpp    
 	src/PeakOverlaySphere.cpp
 	src/PeakOverlayCross.cpp
 	src/PeakOverlaySphereFactory.cpp
@@ -51,8 +51,8 @@ set ( INC_FILES
 	inc/MantidQtSliceViewer/LineViewer.h
 	inc/MantidQtSliceViewer/NullPeaksPresenter.h
 	inc/MantidQtSliceViewer/PeakBoundingBox.h
-	inc/MantidQtSliceViewer/PeakOverlayMulti.h
-    inc/MantidQtSliceViewer/PeakOverlayMultiFactory.h    
+	inc/MantidQtSliceViewer/PeakOverlayMultiCross.h
+	inc/MantidQtSliceViewer/PeakOverlayMultiCrossFactory.h    
 	inc/MantidQtSliceViewer/PeakOverlaySphere.h
 	inc/MantidQtSliceViewer/PeakOverlayCross.h
 	inc/MantidQtSliceViewer/PeakOverlayView.h
@@ -91,7 +91,7 @@ set ( MOC_FILES
 	inc/MantidQtSliceViewer/LineOverlay.h
 	inc/MantidQtSliceViewer/LineViewer.h
 	inc/MantidQtSliceViewer/LinePlotOptions.h
- 	inc/MantidQtSliceViewer/PeakOverlayMulti.h
+ 	inc/MantidQtSliceViewer/PeakOverlayMultiCross.h
  	inc/MantidQtSliceViewer/PeakOverlayCross.h
 	inc/MantidQtSliceViewer/PeakOverlaySphere.h
 	inc/MantidQtSliceViewer/SliceViewer.h

diff --git a/...nc/MantidQtSliceViewer/PeakOverlayMulti.h → ...ntidQtSliceViewer/PeakOverlayMultiCross.h b/...nc/MantidQtSliceViewer/PeakOverlayMulti.h → ...ntidQtSliceViewer/PeakOverlayMultiCross.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYMULTI_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAYCROSS_H_
+#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYMULTICROSS_H_
+#define MANTID_SLICEVIEWER_PEAKOVERLAYMULTICROSS_H_
 
 #include "DllOption.h"
 #include "MantidKernel/System.h"
@@ -43,15 +43,15 @@ namespace SliceViewer
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class EXPORT_OPT_MANTIDQT_SLICEVIEWER PeakOverlayMulti : public QWidget, public PeakOverlayView
+  class EXPORT_OPT_MANTIDQT_SLICEVIEWER PeakOverlayMultiCross : public QWidget, public PeakOverlayView
   {
     Q_OBJECT
 
   public:
     /// Constructor
-    PeakOverlayMulti(QwtPlot * plot, QWidget * parent, const VecPhysicalCrossPeak& vecPhysicalPeaks, const QColor& peakColour);
+    PeakOverlayMultiCross(QwtPlot * plot, QWidget * parent, const VecPhysicalCrossPeak& vecPhysicalPeaks, const QColor& peakColour);
     /// Destructor
-    virtual ~PeakOverlayMulti();
+    virtual ~PeakOverlayMultiCross();
     /// Set the slice point at position.
     virtual void setSlicePoint(const double& point); 
     /// Hide the view.

diff --git a/...idQtSliceViewer/PeakOverlayMultiFactory.h → ...liceViewer/PeakOverlayMultiCrossFactory.h b/...idQtSliceViewer/PeakOverlayMultiFactory.h → ...liceViewer/PeakOverlayMultiCrossFactory.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYMULTI_FACTORY_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAYMULTI_FACTORY_H_
+#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYMULTICROSS_FACTORY_H_
+#define MANTID_SLICEVIEWER_PEAKOVERLAYMULTICROSS_FACTORY_H_
 
 #include "MantidQtSliceViewer/PeakOverlayViewFactoryBase.h"
 #include "MantidAPI/IPeaksWorkspace.h"
@@ -11,7 +11,7 @@ namespace MantidQt
   namespace SliceViewer
   {
 
-    /** Concrete view factory. For creating instances of PeakOverlayMulti widget.
+    /** Concrete view factory. For creating instances of PeakOverlayMultiCross widget.
 
     @date 2013-06-10
 
@@ -35,11 +35,11 @@ namespace MantidQt
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
     */
-    class DLLExport PeakOverlayMultiFactory : public PeakOverlayViewFactoryBase
+    class DLLExport PeakOverlayMultiCrossFactory : public PeakOverlayViewFactoryBase
     {
       public:
-      PeakOverlayMultiFactory(boost::shared_ptr<Mantid::API::MDGeometry> mdWS, PeakTransform_const_sptr transform, Mantid::API::IPeaksWorkspace_sptr peaksWS, QwtPlot * plot, QWidget * parent, const size_t colourNumber=0);
-      virtual ~PeakOverlayMultiFactory();
+      PeakOverlayMultiCrossFactory(boost::shared_ptr<Mantid::API::MDGeometry> mdWS, PeakTransform_const_sptr transform, Mantid::API::IPeaksWorkspace_sptr peaksWS, QwtPlot * plot, QWidget * parent, const size_t colourNumber=0);
+      virtual ~PeakOverlayMultiCrossFactory();
       virtual boost::shared_ptr<PeakOverlayView> createView(const int peakIndex, PeakTransform_const_sptr transform) const;
       virtual int FOM() const;
     private:

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/PeakOverlayMulti.cpp b/Code/Mantid/MantidQt/SliceViewer/src/PeakOverlayMulti.cpp