Merge from master to omu/insitu.

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

diff --git a/src/Plugins/MEDReader/IO/vtkExtractGroup.h b/src/Plugins/MEDReader/IO/vtkExtractGroup.h
index c13ed1b1a1930b5b8be12e824fb21c705948c44c..28f454d6fed39240302906ee5cad5ca20dd9e7a4 100644 (file)
--- a/src/Plugins/MEDReader/IO/vtkExtractGroup.h
+++ b/src/Plugins/MEDReader/IO/vtkExtractGroup.h
@@ -1,9 +1,9 @@
-// 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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,15 +21,15 @@
 #ifndef vtkExtractGroup_h__
 #define vtkExtractGroup_h__
 
-#include "vtkDataSetAlgorithm.h"
+#include "vtkMultiBlockDataSetAlgorithm.h"
 
 class vtkMutableDirectedGraph;
 
-class VTK_EXPORT vtkExtractGroup: public vtkDataSetAlgorithm
+class VTK_EXPORT vtkExtractGroup: public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkExtractGroup* New();
-  vtkTypeMacro(vtkExtractGroup, vtkDataSetAlgorithm)
+  vtkTypeMacro(vtkExtractGroup, vtkMultiBlockDataSetAlgorithm)
   void PrintSelf(ostream& os, vtkIndent indent);
   virtual int GetNumberOfGroupsFlagsArrays();
   const char *GetGroupsFlagsArrayName(int index);
@@ -40,6 +40,8 @@ public:
   // Every time the SIL is updated a this will return a different value.
   virtual int GetSILUpdateStamp();
   const char *GetMeshName();
+  static const char* GetGrpStart();
+  static const char* GetFamStart();
 protected:
   vtkExtractGroup();
   ~vtkExtractGroup();
@@ -49,6 +51,7 @@ protected:
 
   int RequestData(vtkInformation *request, vtkInformationVector **inputVector,
       vtkInformationVector *outputVector);
+
   // Description:
   // This SIL stores the structure of the mesh/groups/cell types
   // that can be selected.