Change IProjectSerialisationInterface to ease further refactoring.

Refs #9970
mantidproject · Jul 31, 2014 · d399311 · d399311
1 parent daf1a90
commit d399311
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
@@ -4651,7 +4651,7 @@ void ApplicationWindow::openProjectFolder(Folder* curFolder, std::string lines,
       plot->setBirthDate(QString(birthDate.c_str()));
       setListViewDate(QString(caption.c_str()), QString(birthDate.c_str()));
 
-      plot->loadFromProject(multiLayerLines);
+      plot->loadFromProject(multiLayerLines, this, d_file_version);
     }
   }
 

diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp
@@ -6155,7 +6155,7 @@ void Graph::slotDragMouseMove(QPoint pos)
   emit dragMouseMove(pos);
 }
 
-void Graph::loadFromProject(const std::string& lines)
+void Graph::loadFromProject(const std::string& lines, ApplicationWindow* app, const int fileVersion)
 {
 }
 
diff --git a/Code/Mantid/MantidPlot/src/Graph.h b/Code/Mantid/MantidPlot/src/Graph.h
@@ -404,7 +404,7 @@ public slots:
 
   //! \name Loading from a project
   //@{
-  void loadFromProject(const std::string& lines);
+  void loadFromProject(const std::string& lines, ApplicationWindow* app, const int fileVersion);
   //@}
 
   //! \name Saving to File

diff --git a/Code/Mantid/MantidPlot/src/Mantid/IProjectSerialisable.h b/Code/Mantid/MantidPlot/src/Mantid/IProjectSerialisable.h
@@ -1,8 +1,11 @@
 #ifndef MANTID_API_IPROJECTSERIALISABLE_H_
 #define MANTID_API_IPROJECTSERIALISABLE_H_
 
+class ApplicationWindow;
+
 namespace Mantid
 {
+
   /**
   Defines an interface to a MantidPlot class that can be saved into or loaded from a project.
 
@@ -35,7 +38,7 @@ namespace Mantid
     /// Virtual destructor (required by linker on some versions of OS X/Intel compiler)
     virtual ~IProjectSerialisable() {}
     /// Loads the given lines from the project file and applies them.
-    virtual void loadFromProject(const std::string& lines) = 0;
+    virtual void loadFromProject(const std::string& lines, ApplicationWindow* app, const int fileVersion) = 0;
   };
 
 } // namespace Mantid

diff --git a/Code/Mantid/MantidPlot/src/MultiLayer.cpp b/Code/Mantid/MantidPlot/src/MultiLayer.cpp
@@ -1655,7 +1655,7 @@ void MultiLayer::setWaterfallFillColor(const QColor& c)
     active_graph->setWaterfallFillColor(c);
 }
 
-void MultiLayer::loadFromProject(const std::string& lines)
+void MultiLayer::loadFromProject(const std::string& lines, ApplicationWindow* app, const int fileVersion)
 {
   TSVSerialiser tsv(lines);
 
@@ -1724,7 +1724,7 @@ void MultiLayer::loadFromProject(const std::string& lines)
 
       if(g)
       {
-        g->loadFromProject(graphLines);
+        g->loadFromProject(graphLines, app, fileVersion);
       }
     }
   }

diff --git a/Code/Mantid/MantidPlot/src/MultiLayer.h b/Code/Mantid/MantidPlot/src/MultiLayer.h
@@ -97,7 +97,7 @@ class MultiLayer: public MdiSubWindow, public Mantid::IProjectSerialisable
 
   void setWaterfallLayout(bool on = true);
 
-  void loadFromProject(const std::string& lines);
+  void loadFromProject(const std::string& lines, ApplicationWindow* app, const int fileVersion);
 
 public slots:
 	Graph* addLayer(int x = 0, int y = 0, int width = 0, int height = 0);