refs #6449 presumably completed all new saveable logic

mantidproject · Apr 16, 2013 · 6d35b14 · 6d35b14
1 parent dd79a89
commit 6d35b14
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 186 deletions.
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h
@@ -72,6 +72,7 @@ namespace Kernel
     virtual void setFilePosition(uint64_t newPos,size_t newSize,bool wasSaved)=0;
     //-----------------------------------------------------------------------------------------------
 
+
     /// Save the data - to be overriden
     virtual void save()const =0;
 

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
@@ -13,7 +13,7 @@ namespace Mantid
 namespace MDEvents
 {
 
-
+  /**Destructor */ 
   TMDE(MDBox)::~MDBox()
   {
       if(m_Saveable)delete m_Saveable;
@@ -56,6 +56,11 @@ namespace MDEvents
       throw std::invalid_argument("MDBox::ctor(): controller passed has the wrong number of dimensions.");
 
     if(nBoxEvents!=UNDEF_SIZET) data.reserve(nBoxEvents);
+
+    if(splitter->isFileBacked())
+        this->setFileBacked();
+
+
   }
 
 
@@ -69,7 +74,12 @@ namespace MDEvents
      data(other.data),
      m_bIsMasked(other.m_bIsMasked)
   {
-      //TODO: inheriting Saveable logic on the basis of otherBC
+    if(otherBC) // may be absent in some tests but generally present
+    {
+        if(otherBC->isFileBacked())
+            this->setFileBacked();
+
+    }
   }
 
 

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBoxSaveable.cpp b/Code/Mantid/Framework/MDEvents/src/MDBoxSaveable.cpp
@@ -19,9 +19,8 @@ namespace MDEvents
    }
 
  //-----------------------------------------------------------------------------------------------
- /** Call to save the data (if needed) and release the memory used.
+ /** Physical save the whole data. Tries to load any previous data from HDD 
   *  Called from the DiskBuffer.
-  *  If called directly presumes to know its file location and [TODO: refactor this] needs the file to be open correctly on correct group 
   */
   void MDBoxSaveable::save()const 
   {
@@ -35,6 +34,23 @@ namespace MDEvents
 
       m_MDNode->saveAt(fileIO,this->getFilePosition());
 
+  }
+
+/** Loads the data from HDD if these data were not loaded before. */
+ void MDBoxSaveable::load()
+ {
+      API::IBoxControllerIO *fileIO = m_MDNode->getBoxController()->getFileIO(); 
+
+    // Is the data in memory right now (cached copy)?
+    if (!m_isLoaded)
+    {
+        m_MDNode->loadAndAddFrom(fileIO,this->m_fileIndexStart,this->m_fileNumEvents);
+        this->m_isLoaded = true;
+    }
+
+  }
+
+// old save parts
 //  //      std::cout << "MDBox ID " << this->getId() << " being saved." << std::endl;
 //
 //
@@ -59,22 +75,7 @@ namespace MDEvents
 //     if(data.size()>0)  throw std::runtime_error(" Attempt to save undefined event");
 //   
 //   
-  }
 
-//
- void MDBoxSaveable::load()
- {
-      API::IBoxControllerIO *fileIO = m_MDNode->getBoxController()->getFileIO(); 
-
-    // Is the data in memory right now (cached copy)?
-    if (!m_isLoaded)
-    {
-        m_MDNode->loadAndAddFrom(fileIO,this->m_fileIndexStart,this->m_fileNumEvents);
-        this->m_isLoaded = true;
-    }
-
-  }
-
 
 //
 //    //---------------------------------------------------------------------------------------------