Re #11386 Added old commits into new branch

mantidproject · Aug 18, 2016 · 775a8c5 · 775a8c5
1 parent 6bd025c
commit 775a8c5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/Framework/DataObjects/src/MDBoxFlatTree.cpp b/Framework/DataObjects/src/MDBoxFlatTree.cpp
@@ -766,6 +766,7 @@ void MDBoxFlatTree::saveWSGenericInfo(::NeXus::File *const file,
   // because those cannot be resized).
   file->putAttr("definition", ws->id());
   file->putAttr("title", ws->getTitle());
+  file->putAttr("comment", ws->getComment());
   // Save each dimension, as their XML representation
   size_t nDim = ws->getNumDims();
   for (size_t d = 0; d < nDim; d++) {

diff --git a/Framework/MDAlgorithms/src/LoadMD.cpp b/Framework/MDAlgorithms/src/LoadMD.cpp
@@ -311,6 +311,26 @@ void LoadMD::loadHisto() {
   // Coordinate system
   ws->setCoordinateSystem(m_coordSystem);
 
+  std::string title;
+  try {
+    m_file->getAttr("title", title);
+  }
+  catch (std::exception&)
+  {
+    //Leave the title blank if error on loading
+  }
+  ws->setTitle(title);
+
+  std::string comment;
+  try {
+    m_file->getAttr("comment", comment);
+  }
+  catch (std::exception&)
+  {
+    //Leave the comment blank if error on loading
+  }
+  ws->setComment(comment);
+
   // Load the WorkspaceHistory "process"
   if (this->getProperty("LoadHistory")) {
     ws->history().loadNexus(m_file.get());
@@ -500,6 +520,16 @@ void LoadMD::doLoad(typename MDEventWorkspace<MDE, nd>::sptr ws) {
   }
   ws->setTitle(title);
 
+  std::string comment;
+  try {
+    m_file->getAttr("comment", comment);
+  }
+  catch (std::exception&)
+  {
+    //Leave the comment blank if error on loading
+  }
+  ws->setComment(comment);
+
   // Load the WorkspaceHistory "process"
   if (this->getProperty("LoadHistory")) {
     ws->history().loadNexus(m_file.get());

diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -283,6 +283,9 @@ void SaveMD::doSaveHisto(Mantid::DataObjects::MDHistoWorkspace_sptr ws) {
   MDBoxFlatTree::saveAffineTransformMatricies(
       file, boost::dynamic_pointer_cast<const IMDWorkspace>(ws));
 
+  file->putAttr("title", ws->getTitle());
+  file->putAttr("comment", ws->getComment());
+
   // Check that the typedef has not been changed. The NeXus types would need
   // changing if it does!
   static_assert(sizeof(signal_t) == sizeof(double),

diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -119,6 +119,9 @@ void SaveMD2::doSaveHisto(Mantid::DataObjects::MDHistoWorkspace_sptr ws) {
   MDBoxFlatTree::saveAffineTransformMatricies(
       file, boost::dynamic_pointer_cast<const IMDWorkspace>(ws));
 
+  file->putAttr("title", ws->getTitle());
+  file->putAttr("comment", ws->getComment());
+
   // Check that the typedef has not been changed. The NeXus types would need
   // changing if it does!
   assert(sizeof(signal_t) == sizeof(double));