Refs #6352. Add API call for special coordinate system for MDEW.

mantidproject · Jan 16, 2013 · d87c51a · d87c51a
1 parent a1f7513
commit d87c51a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWInMemoryLoadingPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWInMemoryLoadingPresenter.h
@@ -48,12 +48,14 @@ namespace Mantid
       virtual ~MDEWInMemoryLoadingPresenter();
       virtual bool canReadFile() const;
       virtual std::string getWorkspaceTypeName();
+      virtual int getSpecialCoordinates();
     private:
       /// Repository for accessing workspaces. At this level, does not specify how or where from.
       boost::scoped_ptr<WorkspaceProvider> m_repository;
       /// The name of the workspace.
       const std::string m_wsName;
       std::string m_wsTypeName;
+      int m_specialCoords;
     };
   }
 }

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDLoadingPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDLoadingPresenter.h
@@ -2,6 +2,7 @@
 #define MANTID_VATES_MD_LOADING_PRESENTER
 
 #include "MantidKernel/System.h"
+#include "MantidAPI/IMDWorkspace.h"
 #include <vtkDataSet.h>
 #include <string>
 #include <vector>
@@ -53,6 +54,10 @@ namespace Mantid
       {
         return "NotSet";
       }
+      virtual int getSpecialCoordinates()
+      {
+        return API::None;
+      }
     };
 
   }

diff --git a/Code/Mantid/Vates/VatesAPI/src/MDEWInMemoryLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDEWInMemoryLoadingPresenter.cpp
@@ -20,7 +20,7 @@ namespace Mantid
     @throw invalid_argument if the repository is null
     @throw invalid_arument if view is null
     */
-    MDEWInMemoryLoadingPresenter::MDEWInMemoryLoadingPresenter(MDLoadingView* view, WorkspaceProvider* repository, std::string wsName) : MDEWLoadingPresenter(view), m_repository(repository), m_wsName(wsName), m_wsTypeName("")
+  MDEWInMemoryLoadingPresenter::MDEWInMemoryLoadingPresenter(MDLoadingView* view, WorkspaceProvider* repository, std::string wsName) : MDEWLoadingPresenter(view), m_repository(repository), m_wsName(wsName), m_wsTypeName(""), m_specialCoords(-1)
     {
       if(m_wsName.empty())
       {
@@ -97,6 +97,7 @@ namespace Mantid
       Workspace_sptr ws = m_repository->fetchWorkspace(m_wsName);
       IMDEventWorkspace_sptr eventWs = boost::dynamic_pointer_cast<Mantid::API::IMDEventWorkspace>(ws);
       m_wsTypeName = eventWs->id();
+      m_specialCoords = eventWs->getSpecialCoordinateSystem();
       //Call base-class extraction method.
       this->extractMetadata(eventWs);
     }
@@ -115,5 +116,14 @@ namespace Mantid
     {
       return m_wsTypeName;
     }
+
+    /**
+     * Getter for the special coordinates.
+     * @return the special coordinates value
+     */
+    int MDEWInMemoryLoadingPresenter::getSpecialCoordinates()
+    {
+      return m_specialCoords;
+    }
   }
-}
+}
diff --git a/Code/Mantid/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h b/Code/Mantid/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
@@ -165,6 +165,7 @@ class MDEWInMemoryLoadingPresenterTest: public CxxTest::TestSuite
     TS_ASSERT_THROWS_NOTHING(presenter.hasTDimensionAvailable());
     TS_ASSERT_THROWS_NOTHING(presenter.getGeometryXML());
     TS_ASSERT(!presenter.getWorkspaceTypeName().empty());
+    TSM_ASSERT("Special coordinate metadata failed.", -1<presenter.getSpecialCoordinates());
     TS_ASSERT(Mock::VerifyAndClearExpectations(view));
     TS_ASSERT(Mock::VerifyAndClearExpectations(&factory));
 
@@ -195,10 +196,14 @@ class MDEWInMemoryLoadingPresenterTest: public CxxTest::TestSuite
     TSM_ASSERT_EQUALS("Characterisation Test Failed", "", presenter.getWorkspaceTypeName());
   }
 
-
+  void testGetSpecialCoordinates()
+  {
+    MDEWInMemoryLoadingPresenter presenter(new MockMDLoadingView, new MockWorkspaceProvider, "_");
+    TSM_ASSERT_EQUALS("Characterisation Test Failed", -1, presenter.getSpecialCoordinates());
+  }
 
 
 
 };
 
-#endif
+#endif