From da575f6710b0be8207acffc40e5e23f3e1a88a8d Mon Sep 17 00:00:00 2001
From: Michael Reuter <reuterma@ornl.gov>
Date: Mon, 8 Apr 2013 14:22:44 -0400
Subject: [PATCH] Refs #6842. ParaView recognizes file. Won't draw yet.
---
.../MDHWNexusReader/MDHWNexusReaderGUI.xml | 6 +++---
.../Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/MDHWNexusReaderGUI.xml b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/MDHWNexusReaderGUI.xml
index 684c65f87c0..0aef788910a 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/MDHWNexusReaderGUI.xml
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/MDHWNexusReaderGUI.xml
@@ -1,6 +1,6 @@
<ParaViewReaders>
- <Reader name="MDEWNexusReader"
+ <Reader name="MDHWNexusReader"
extensions="nxs"
- file_description="MDEW Nexus File">
+ file_description="MDHW Nexus File">
</Reader>
-</ParaViewReaders>
\ No newline at end of file
+</ParaViewReaders>
diff --git a/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp
index 2fe811a3e0b..1e2274bba43 100644
--- a/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp
@@ -45,11 +45,10 @@ bool MDHWNexusLoadingPresenter::canReadFile() const
{
return 0;
}
-
::NeXus::File * file = NULL;
file = new ::NeXus::File(this->m_filename);
- // MDEventWorkspace file has a different name for the entry
+ // MDHistoWorkspace file has a different name for the entry
try
{
file->openGroup("MDHistoWorkspace", "NXentry");
@@ -91,7 +90,7 @@ vtkDataSet* MDHWNexusLoadingPresenter::execute(vtkDataSetFactory* factory, Progr
alg->removeObserver(observer);
}
- Workspace_sptr result=AnalysisDataService::Instance().retrieve("MD_HISTO_WS_ID");
+ Workspace_sptr result = AnalysisDataService::Instance().retrieve("MD_HISTO_WS_ID");
Mantid::API::IMDHistoWorkspace_sptr histoWs = boost::dynamic_pointer_cast<Mantid::API::IMDHistoWorkspace>(result);
factory->setRecursionDepth(this->m_view->getRecursionDepth());
@@ -124,10 +123,10 @@ void MDHWNexusLoadingPresenter::executeLoadMetadata()
alg->setProperty("FileBackEnd", false); //Only require metadata, so do it in memory.
alg->execute();
- Workspace_sptr result=AnalysisDataService::Instance().retrieve("MD_HISTO_WS_ID");
+ Workspace_sptr result = AnalysisDataService::Instance().retrieve("MD_HISTO_WS_ID");
IMDHistoWorkspace_sptr histoWs = boost::dynamic_pointer_cast<Mantid::API::IMDHistoWorkspace>(result);
m_wsTypeName = histoWs->id();
- //Call base-class extraction method.
+ // Call base-class extraction method.
this->extractMetadata(histoWs);
AnalysisDataService::Instance().remove("MD_HISTO_WS_ID");
@@ -150,5 +149,6 @@ std::string MDHWNexusLoadingPresenter::getWorkspaceTypeName()
{
return m_wsTypeName;
}
+
}
}
--
GitLab