refs #4328 #3641. Add EventNexus memento. Improve Gui Layout.

Event Nexus Files can now be added. Gui Layout improved. Start work on Workspace creation methods.
mantidproject · Jan 6, 2012 · cf38125 · cf38125
1 parent 162fd66
commit cf38125
Show file tree

Hide file tree

Showing 9 changed files with 541 additions and 206 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -1,6 +1,7 @@
 set ( SRC_FILES
     src/ConvertToEnergy.cpp
 	src/CreateMDWorkspace.cpp
+	src/EventNexusFileMemento.cpp
 	src/Homer.cpp
 	src/IO_MuonGrouping.cpp
 	src/Indirect.cpp
@@ -18,16 +19,17 @@ set ( SRC_FILES
 	src/SANSRunWindow.cpp
 	src/background.cpp
 	src/deltaECalc.cpp
-  src/WorkspaceInADS.cpp
+	src/WorkspaceInADS.cpp
 	src/WorkspaceMemento.cpp
-  src/RawFileMemento.cpp
+	src/RawFileMemento.cpp
 )
 
 # Include files aren't required, but this makes them appear in Visual Studio
 set ( INC_FILES
 	inc/MantidQtCustomInterfaces/Background.h
 	inc/MantidQtCustomInterfaces/ConvertToEnergy.h
 	inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
+	inc/MantidQtCustomInterfaces/EventNexusFileMemento.h	
 	inc/MantidQtCustomInterfaces/Homer.h
 	inc/MantidQtCustomInterfaces/IO_MuonGrouping.h
 	inc/MantidQtCustomInterfaces/Indirect.h
@@ -79,6 +81,7 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
 )
 
 set( TEST_FILES
+               test/EventNexusFileMementoTest.h
                test/WorkspaceMementoTest.h
                test/WorkspaceInADSTest.h
                test/RawFileMementoTest.h

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CreateMDWorkspace.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
@@ -47,7 +47,9 @@ namespace MantidQt
 
       void addWorkspaceClicked();
 
-      void addFileClicked();
+      void addRawFileClicked();
+
+      void addEventNexusFileClicked();
 
       void setUBMatrixClicked();