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

mantidproject · Jan 16, 2013 · 8ad7313 · 8ad7313
1 parent b4f9f41
commit 8ad7313
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDHWInMemoryLoadingPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDHWInMemoryLoadingPresenter.h
@@ -47,12 +47,14 @@ namespace Mantid
       virtual ~MDHWInMemoryLoadingPresenter();
       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/src/MDHWInMemoryLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp
@@ -20,7 +20,7 @@ namespace Mantid
     @throw invalid_argument if the repository is null
     @throw invalid_arument if view is null
     */
-    MDHWInMemoryLoadingPresenter::MDHWInMemoryLoadingPresenter(MDLoadingView* view, WorkspaceProvider* repository, std::string wsName) : MDHWLoadingPresenter(view), m_repository(repository), m_wsName(wsName), m_wsTypeName("")
+  MDHWInMemoryLoadingPresenter::MDHWInMemoryLoadingPresenter(MDLoadingView* view, WorkspaceProvider* repository, std::string wsName) : MDHWLoadingPresenter(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);
       IMDHistoWorkspace_sptr histoWs = boost::dynamic_pointer_cast<Mantid::API::IMDHistoWorkspace>(ws);
       m_wsTypeName = histoWs->id();
+      m_specialCoords = histoWs->getSpecialCoordinateSystem();
       //Call base-class extraction method.
       this->extractMetadata(histoWs);
     }
@@ -115,5 +116,14 @@ namespace Mantid
     {
       return m_wsTypeName;
     }
+
+    /**
+     * Getter for the special coordinates.
+     * @return the special coordinates value
+     */
+    int MDHWInMemoryLoadingPresenter::getSpecialCoordinates()
+    {
+      return m_specialCoords;
+    }
   }
 }
diff --git a/Code/Mantid/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h b/Code/Mantid/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
@@ -165,7 +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());
+    TSM_ASSERT("Special coordinate metadata failed.", -1 < presenter.getSpecialCoordinates());
     TS_ASSERT(Mock::VerifyAndClearExpectations(view));
     TS_ASSERT(Mock::VerifyAndClearExpectations(&factory));
 

diff --git a/Code/Mantid/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h b/Code/Mantid/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
@@ -158,6 +158,7 @@ class MDHWInMemoryLoadingPresenterTest: 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));
 
@@ -188,6 +189,12 @@ class MDHWInMemoryLoadingPresenterTest: public CxxTest::TestSuite
     TSM_ASSERT_EQUALS("Characterisation Test Failed", "", presenter.getWorkspaceTypeName());
   }
 
+  void testGetSpecialCoordinates()
+  {
+    MDHWInMemoryLoadingPresenter presenter(new MockMDLoadingView, new MockWorkspaceProvider, "_");
+    TSM_ASSERT_EQUALS("Characterisation Test Failed", -1, presenter.getSpecialCoordinates());
+  }
+
 };
 
 #endif