Moved SliceViewer.

qt/CMakeLists.txt

@@ -19,11 +19,11 @@ if ( MSVC_IDE )
 #  # Add to the 'MantidQt' group in VS
   set_property ( TARGET qtwidgetscommon PROPERTY FOLDER "MantidQt" )
   set_property ( TARGET qtwidgetsinstrumentview PROPERTY FOLDER "MantidQt" )
+  set_property ( TARGET qtwidgetssliceviewer PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET MantidWidgets PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET CustomDialogs PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET CustomInterfaces PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET DesignerPlugins PROPERTY FOLDER "MantidQt" )
-#  set_property ( TARGET MantidQtSliceViewer PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET MantidQtSpectrumViewer PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET MantidQtFactory PROPERTY FOLDER "MantidQt" )
 #  set_property ( TARGET mantidqtpython PROPERTY FOLDER "MantidQt" )

qt/widgets/CMakeLists.txt

@@ -3,10 +3,10 @@
 ###########################################################################
 add_subdirectory ( common )
 add_subdirectory ( instrumentview )
+add_subdirectory ( sliceviewer )
 
 #add_subdirectory ( CustomDialogs )
 #add_subdirectory ( CustomInterfaces )
-#add_subdirectory ( SliceViewer )
 #add_subdirectory ( SpectrumViewer )
 #add_subdirectory ( RefDetectorViewer)
 #add_subdirectory ( Factory )

qt/widgets/sliceviewer/CMakeLists.txt

@@ -9,13 +9,13 @@ set ( SRC_FILES
 	src/LineViewer.cpp
 	src/PeakBoundingBox.cpp
 	src/PeaksViewerOverlayDialog.cpp
-        src/PeakOverlayInteractive.cpp
+    src/PeakOverlayInteractive.cpp
 	src/PeakOverlayViewFactoryBase.cpp
 	src/PeakPalette.cpp
 	src/PeakRepresentation.cpp
 	src/PeakRepresentationCross.cpp
-        src/PeakRepresentationEllipsoid.cpp
-        src/PeakRepresentationSphere.cpp
+    src/PeakRepresentationEllipsoid.cpp
+    src/PeakRepresentationSphere.cpp
 	src/PeaksTableColumnsDialog.cpp
 	src/PeakView.cpp
 	src/PeakViewFactory.cpp
@@ -35,80 +35,80 @@ set ( SRC_FILES
 
 # Include files aren't required, but this makes them appear in Visual Studio
 set ( INC_FILES
-	inc/MantidQtSliceViewer/CompositePeaksPresenter.h
-	inc/MantidQtSliceViewer/ConcretePeaksPresenter.h
-	inc/MantidQtSliceViewer/CoordinateTransform.h
-	inc/MantidQtSliceViewer/CustomTools.h
-	inc/MantidQtSliceViewer/DimensionSliceWidget.h
-	inc/MantidQtSliceViewer/EllipsoidPlaneSliceCalculator.h
-	inc/MantidQtSliceViewer/FirstExperimentInfoQuery.h
-	inc/MantidQtSliceViewer/LineOverlay.h
-	inc/MantidQtSliceViewer/LinePlotOptions.h
-	inc/MantidQtSliceViewer/LineViewer.h
-	inc/MantidQtSliceViewer/NullPeaksPresenter.h
-	inc/MantidQtSliceViewer/NonOrthogonalOverlay.h
-	inc/MantidQtSliceViewer/PeakEditMode.h
-        inc/MantidQtSliceViewer/PeakBoundingBox.h
-        inc/MantidQtSliceViewer/PeakOverlayInteractive.h
-	inc/MantidQtSliceViewer/PeakOverlayView.h
-	inc/MantidQtSliceViewer/PeakOverlayViewFactory.h
-	inc/MantidQtSliceViewer/PeakOverlayViewFactoryBase.h
-	inc/MantidQtSliceViewer/PeakPalette.h
-	inc/MantidQtSliceViewer/PeaksPresenter.h
-	inc/MantidQtSliceViewer/PeakPrimitives.h
-        inc/MantidQtSliceViewer/PeakRepresentation.h
-	inc/MantidQtSliceViewer/PeakRepresentationCross.h
-        inc/MantidQtSliceViewer/PeakRepresentationEllipsoid.h
-        inc/MantidQtSliceViewer/PeakRepresentationSphere.h
-	inc/MantidQtSliceViewer/PeaksTableColumnsDialog.h
-	inc/MantidQtSliceViewer/PeakView.h
-	inc/MantidQtSliceViewer/PeakViewColor.h
-	inc/MantidQtSliceViewer/PeakViewFactory.h
-	inc/MantidQtSliceViewer/PeaksViewer.h
-	inc/MantidQtSliceViewer/PeaksViewerOverlayDialog.h
-	inc/MantidQtSliceViewer/PeaksWorkspaceWidget.h
-	inc/MantidQtSliceViewer/ProxyCompositePeaksPresenter.h
-	inc/MantidQtSliceViewer/QPeaksTableModel.h
-	inc/MantidQtSliceViewer/SliceViewer.h
-	inc/MantidQtSliceViewer/SliceViewerFunctions.h
-	inc/MantidQtSliceViewer/SliceViewerWindow.h
-	inc/MantidQtSliceViewer/SnapToGridDialog.h
-	inc/MantidQtSliceViewer/UpdateableOnDemand.h
-	inc/MantidQtSliceViewer/XYLimitsDialog.h
-	inc/MantidQtSliceViewer/ZoomableOnDemand.h
-	inc/MantidQtSliceViewer/ZoomablePeaksView.h
-	inc/MantidQtSliceViewer/QwtScaleDrawNonOrthogonal.h
+	inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h
+	inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h
+	inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h
+	inc/MantidQtWidgets/SliceViewer/CustomTools.h
+	inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
+	inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h
+	inc/MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h
+	inc/MantidQtWidgets/SliceViewer/LineOverlay.h
+	inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
+	inc/MantidQtWidgets/SliceViewer/LineViewer.h
+	inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h
+	inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
+	inc/MantidQtWidgets/SliceViewer/PeakEditMode.h
+    inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h
+    inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
+	inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h
+	inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h
+	inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
+	inc/MantidQtWidgets/SliceViewer/PeakPalette.h
+	inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h
+	inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h
+    inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h
+	inc/MantidQtWidgets/SliceViewer/PeakRepresentationCross.h
+    inc/MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h
+    inc/MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h
+	inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h
+	inc/MantidQtWidgets/SliceViewer/PeakView.h
+	inc/MantidQtWidgets/SliceViewer/PeakViewColor.h
+	inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h
+	inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
+	inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h
+	inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
+	inc/MantidQtWidgets/SliceViewer/ProxyCompositePeaksPresenter.h
+	inc/MantidQtWidgets/SliceViewer/QPeaksTableModel.h
+	inc/MantidQtWidgets/SliceViewer/SliceViewer.h
+	inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h
+	inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
+	inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
+	inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h
+	inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
+	inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h
+	inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h
+	inc/MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h
 )
 
 set ( MOC_FILES
-	inc/MantidQtSliceViewer/CustomTools.h
-	inc/MantidQtSliceViewer/DimensionSliceWidget.h
-	inc/MantidQtSliceViewer/LineOverlay.h
-	inc/MantidQtSliceViewer/LineViewer.h
-	inc/MantidQtSliceViewer/LinePlotOptions.h
-	inc/MantidQtSliceViewer/NonOrthogonalOverlay.h
-        inc/MantidQtSliceViewer/PeakOverlayInteractive.h
-	inc/MantidQtSliceViewer/PeaksTableColumnsDialog.h
-	inc/MantidQtSliceViewer/SliceViewer.h
-	inc/MantidQtSliceViewer/SliceViewerWindow.h
-	inc/MantidQtSliceViewer/SnapToGridDialog.h
-	inc/MantidQtSliceViewer/PeaksViewer.h
-	inc/MantidQtSliceViewer/PeaksViewerOverlayDialog.h
-	inc/MantidQtSliceViewer/PeaksWorkspaceWidget.h
-	inc/MantidQtSliceViewer/XYLimitsDialog.h
-	inc/MantidQtSliceViewer/QPeaksTableModel.h
+	inc/MantidQtWidgets/SliceViewer/CustomTools.h
+	inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
+	inc/MantidQtWidgets/SliceViewer/LineOverlay.h
+	inc/MantidQtWidgets/SliceViewer/LineViewer.h
+	inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
+	inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
+    inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
+	inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h
+	inc/MantidQtWidgets/SliceViewer/SliceViewer.h
+	inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
+	inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
+	inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
+	inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h
+	inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
+	inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
+	inc/MantidQtWidgets/SliceViewer/QPeaksTableModel.h
 )
 
 set ( UI_FILES
-        inc/MantidQtSliceViewer/DimensionSliceWidget.ui
-	inc/MantidQtSliceViewer/SliceViewer.ui
-	inc/MantidQtSliceViewer/LineViewer.ui
-	inc/MantidQtSliceViewer/LinePlotOptions.ui
-	inc/MantidQtSliceViewer/SnapToGridDialog.ui
-	inc/MantidQtSliceViewer/PeaksTableColumnsDialog.ui
-	inc/MantidQtSliceViewer/PeaksWorkspaceWidget.ui
-	inc/MantidQtSliceViewer/PeaksViewerOverlayDialog.ui
-	inc/MantidQtSliceViewer/XYLimitsDialog.ui
+    inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.ui
+	inc/MantidQtWidgets/SliceViewer/SliceViewer.ui
+	inc/MantidQtWidgets/SliceViewer/LineViewer.ui
+	inc/MantidQtWidgets/SliceViewer/LinePlotOptions.ui
+	inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.ui
+	inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.ui
+	inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.ui
+	inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.ui
+	inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.ui
 )
 
 set ( TEST_FILES
@@ -154,16 +154,15 @@ include_directories ( ../../Framework/DataObjects/inc )
 add_definitions ( -DIN_MANTIDQT_SLICEVIEWER )
 
 # This creates the target library
-add_library ( MantidQtSliceViewer ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
+add_library ( qtwidgetssliceviewer ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
 
 if (OSX_VERSION VERSION_GREATER 10.8)
-  set_target_properties ( MantidQtSliceViewer PROPERTIES INSTALL_RPATH "@loader_path/../MacOS")
+  set_target_properties ( qtwidgetssliceviewer PROPERTIES INSTALL_RPATH "@loader_path/../MacOS")
 endif ()
 
 # ... and links to other required libs
-target_link_libraries ( MantidQtSliceViewer LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
-            MantidQtAPI
-            MantidWidgets
+target_link_libraries ( qtwidgetssliceviewer LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+            qtwidgetscommon
             DataObjects
             ${CORE_MANTIDLIBS}
             ${POCO_LIBRARIES}
@@ -182,17 +181,17 @@ endif ()
 if ( CXXTEST_FOUND )
   include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
 
-  include_directories( ../../Framework/TestHelpers/inc ../../Framework/DataObjects/inc ../../Framework/Crystal/inc)
+  include_directories( ../../../Framework/TestHelpers/inc ../../../Framework/DataObjects/inc ../../../Framework/Crystal/inc)
 
   set ( TESTHELPER_SRCS
-    ../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
-    ../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
-    ../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
+    ../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
+    ../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
+    ../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
   )
 
   cxxtest_add_test ( SliceViewerTest ${TEST_FILES} ${GMOCK_TEST_FILES} )
   target_link_libraries( SliceViewerTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
-            MantidQtSliceViewer
+            qtwidgetssliceviewer
             DataObjects
             Crystal
             ${CORE_MANTIDLIBS}
@@ -212,4 +211,4 @@ endif ()
 # Installation settings
 ###########################################################################
 
-install ( TARGETS MantidQtSliceViewer ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )
+install ( TARGETS qtwidgetssliceviewer ${SYSTEM_PACKAGE_TARGET} DESTINATION ${LIB_DIR} )

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/CompositePeaksPresenter.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h

 #ifndef MANTID_SLICEVIEWER_COMPOSITEPEAKSPRESENTER_H_
 #define MANTID_SLICEVIEWER_COMPOSITEPEAKSPRESENTER_H_
 
-#include "MantidQtSliceViewer/PeaksPresenter.h"
-#include "MantidQtSliceViewer/NullPeaksPresenter.h"
-#include "MantidQtSliceViewer/PeakBoundingBox.h"
-#include "MantidQtSliceViewer/PeakPalette.h"
-#include "MantidQtSliceViewer/ZoomablePeaksView.h"
-#include "MantidQtSliceViewer/UpdateableOnDemand.h"
-#include "MantidQtSliceViewer/ZoomableOnDemand.h"
+#include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
+#include "MantidQtWidgets/SliceViewer/NullPeaksPresenter.h"
+#include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
+#include "MantidQtWidgets/SliceViewer/PeakPalette.h"
+#include "MantidQtWidgets/SliceViewer/ZoomablePeaksView.h"
+#include "MantidQtWidgets/SliceViewer/UpdateableOnDemand.h"
+#include "MantidQtWidgets/SliceViewer/ZoomableOnDemand.h"
 #include <vector>
 #include <stdexcept>
 #include <boost/shared_ptr.hpp>

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/ConcretePeaksPresenter.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h

@@ -2,8 +2,8 @@
 #define MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_
 #include "MantidGeometry/Crystal/PeakTransform.h"
 #include "MantidGeometry/Crystal/PeakTransformFactory.h"
-#include "MantidQtSliceViewer/PeaksPresenter.h"
-#include "MantidQtSliceViewer/PeakOverlayViewFactory.h"
+#include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
+#include "MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h"
 #include "MantidAPI/MDGeometry.h"
 #include "MantidAPI/IPeaksWorkspace_fwd.h"
 #include "MantidKernel/SpecialCoordinateSystem.h"

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/EllipsoidPlaneSliceCalculator.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h

@@ -4,7 +4,7 @@
 #include "DllOption.h"
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/V3D.h"
-#include "MantidQtSliceViewer/PeakBoundingBox.h"
+#include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
 #include <vector>
 
 namespace Mantid {

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/LinePlotOptions.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h

@@ -3,7 +3,7 @@
 
 #include <QtGui/QWidget>
 #include "ui_LinePlotOptions.h"
-#include "MantidQtAPI/MantidQwtIMDWorkspaceData.h"
+#include "MantidQtWidgets/Common/MantidQwtIMDWorkspaceData.h"
 #include "MantidAPI/IMDWorkspace.h"
 #include "DllOption.h"
 

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/LineViewer.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h

@@ -10,9 +10,9 @@
 #include <qwt_plot.h>
 #include <qwt_painter.h>
 #include "MantidAPI/CoordTransform.h"
-#include "MantidQtAPI/MantidQwtIMDWorkspaceData.h"
-#include "MantidQtSliceViewer/LinePlotOptions.h"
-#include "MantidQtAPI/AlgorithmRunner.h"
+#include "MantidQtWidgets/Common/MantidQwtIMDWorkspaceData.h"
+#include "MantidQtWidgets/SliceViewer/LinePlotOptions.h"
+#include "MantidQtWidgets/Common/AlgorithmRunner.h"
 
 namespace MantidQt {
 namespace SliceViewer {

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/NonOrthogonalOverlay.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h

@@ -8,12 +8,12 @@
 #include <qwt_valuelist.h>
 #include <qpainter.h>
 #include "MantidKernel/System.h"
-#include "MantidQtAPI/QwtRasterDataMD.h"
-#include "MantidQtAPI/QwtRasterDataMDNonOrthogonal.h"
+#include "MantidQtWidgets/Common/QwtRasterDataMD.h"
+#include "MantidQtWidgets/Common/QwtRasterDataMDNonOrthogonal.h"
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidAPI/IMDHistoWorkspace.h"
 #include "MantidAPI/IMDWorkspace.h"
-#include "MantidQtAPI/NonOrthogonal.h"
+#include "MantidQtWidgets/Common/NonOrthogonal.h"
 #include "MantidKernel/Matrix.h"
 
 namespace MantidQt {

qt/widgets/sliceviewer/inc/MantidQtSliceViewer/NullPeaksPresenter.h → qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h

 #ifndef MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
 #define MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
 
-#include "MantidQtSliceViewer/PeaksPresenter.h"
-#include "MantidQtSliceViewer/PeakBoundingBox.h"
+#include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
+#include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
 
 namespace MantidQt {
 namespace SliceViewer {