Merge from master to omu/insitu.

[modules/paravis.git] / src / Plugins / MEDReader / IO / vtkMEDReader.h

diff --git a/src/Plugins/MEDReader/IO/vtkMEDReader.h b/src/Plugins/MEDReader/IO/vtkMEDReader.h
index f8ba0598df86dc7f2e6c151979e37839f6c041bc..b907583aa3510deeae96b84c979bf62338414dbd 100644 (file)
--- a/src/Plugins/MEDReader/IO/vtkMEDReader.h
+++ b/src/Plugins/MEDReader/IO/vtkMEDReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
 #include "vtkMultiBlockDataSetAlgorithm.h"
 
 class vtkMutableDirectedGraph;
+class vtkInformationDataObjectMetaDataKey;
 
 class VTK_EXPORT vtkMEDReader : public vtkMultiBlockDataSetAlgorithm
 {
@@ -52,22 +53,34 @@ class VTK_EXPORT vtkMEDReader : public vtkMultiBlockDataSetAlgorithm
   virtual const char *GetTimesFlagsArrayName(int index);
   //! Build the graph used to pass information to the client on the supports
   virtual std::string BuildSIL(vtkMutableDirectedGraph*);
-  virtual void Reload(int);
+
+  // Description
+  // Reload will delete the internal reader and recreate it with default properties
+  virtual void Reload();
+
+  virtual int GetServerModifTime();
+  //
   virtual void GenerateVectors(int);
   virtual void ChangeMode(int);
-  virtual const char *GetSeparator();
+  static const char *GetSeparator();
+
+  // Description
+  // Static information key used to transfer the meta data graph along the pipeline
+  static vtkInformationDataObjectMetaDataKey* META_DATA();
+
  protected:
   vtkMEDReader();
   virtual ~vtkMEDReader();
   virtual int RequestInformation(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
   virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
  private:
-  void UpdateSIL(vtkInformation *info);
+  void UpdateSIL(vtkInformation *request, vtkInformation *info);
   virtual double PublishTimeStepsIfNeeded(vtkInformation*, bool& isUpdated);
   virtual void FillMultiBlockDataSetInstance(vtkMultiBlockDataSet *output, double reqTS);
  private:
   //BTX
   //ETX
+
   class vtkMEDReaderInternal;
   vtkMEDReaderInternal* Internal;
 };