X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2Fplugin%2FMEDReaderIO%2FvtkExtractCellType.h;h=f92584c6e876663ac1325c22753ad6c316999a00;hb=4d938e8d5d8bfe3c350d9e7d6b579d3b4a3a13cc;hp=3d556ef74be808f22b37e4fc715b10f8ed461f22;hpb=2957581f3994d40c3b89e4aa1da2149ad299534c;p=modules%2Fparavis.git

diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h
index 3d556ef7..f92584c6 100644
--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h
+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.h
@@ -1,71 +1,44 @@
-// Copyright (C) 2010-2021  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, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// Author : Anthony Geay
-
-#ifndef vtkExtractCellType_h__
-#define vtkExtractCellType_h__
+#ifndef vtkExtractCellType_h
+#define vtkExtractCellType_h
 
+#include "MEDReaderIOModule.h" // for export macro
 #include "vtkDataSetAlgorithm.h"
+#include "vtkExtractSelection.h"
+#include "vtkNew.h"
 
-class vtkMutableDirectedGraph;
+class vtkDataArraySelection;
+class vtkIdTypeArray;
 
-class VTK_EXPORT vtkExtractCellType : public vtkDataSetAlgorithm
+class MEDREADERIO_EXPORT vtkExtractCellType : public vtkExtractSelection
 {
 public:
   static vtkExtractCellType* New();
-  vtkTypeMacro(vtkExtractCellType, vtkDataSetAlgorithm)
-  void PrintSelf(ostream& os, vtkIndent indent);
+  vtkTypeMacro(vtkExtractCellType, vtkExtractSelection);
+  void PrintSelf(ostream& os, vtkIndent indent) override;
+
   virtual int GetNumberOfGeoTypesArrays();
   const char *GetGeoTypesArrayName(int index);
   int GetGeoTypesArrayStatus(const char *name);
   virtual void SetGeoTypesStatus(const char *name, int status);
-  void SetInsideOut(int val);
-  // Description:
-  // Every time the SIL is updated a this will return a different value.
-  virtual int GetSILUpdateStamp();
+  
+  vtkSetMacro(InsideOut, bool);
 
 protected:
   vtkExtractCellType();
   ~vtkExtractCellType();
 
-  int RequestInformation(vtkInformation * request,
-      vtkInformationVector **inputVector, vtkInformationVector *outputVector);
+  int RequestInformation(vtkInformation* req, vtkInformationVector** inInfo, vtkInformationVector* outInfo) override;
+  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
+
+  void AppendToGeoTypes(vtkDataSet* dataset);
+  void SelectIds(vtkDataSet* dataset, vtkIdTypeArray* selArr);
 
-  int RequestData(vtkInformation * request, vtkInformationVector **inputVector,
-      vtkInformationVector *outputVector);
-  // Description:
-  // This SIL stores the structure of the mesh/groups/cell types
-  // that can be selected.
-  virtual void SetSIL(vtkMutableDirectedGraph*);
-  vtkGetObjectMacro(SIL, vtkMutableDirectedGraph);
-protected:
-  vtkMutableDirectedGraph *SIL;
-  vtkTimeStamp SILTime;
 private:
-  vtkExtractCellType(const vtkExtractCellType&);
-  void operator=(const vtkExtractCellType&); // Not implemented.
- private:
-  //BTX
-  //ETX
-  class vtkExtractCellTypeInternal;
-  vtkExtractCellTypeInternal *Internal;
-  int InsideOut;
+  vtkExtractCellType(const vtkExtractCellType&) = delete;
+  void operator=(const vtkExtractCellType&) = delete;
+  
+  vtkNew<vtkDataArraySelection> FieldSelection;
+  int InsideOut = false;
 };
 
 #endif