#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / Kernel / VTKObjects / SurfaceRenderer / surfacerenderingimagestencilexport.h

diff --git a/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h b/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
index 86d4f7d9347bd0e9125385948f8d371fb8c74548..5548f5263fbbc7e75530e0c1a0cf1fbad28d0d06 100644 (file)
--- a/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
+++ b/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
@@ -26,32 +26,54 @@
 #ifndef SURFACERENDERINGIMAGESTENCILEXPORT_H
 #define SURFACERENDERINGIMAGESTENCILEXPORT_H
 
+#include "vtkObjectFactory.h"
 
-#include <vtkImageData.h>
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
   #include <vtkDataSetToImageFilter.h>
 #else
-  // ..
+  #include "vtkPolyDataAlgorithm.h"
+  #include "vtkDataObject.h"
+  #include "vtkInformation.h"
+  #include "vtkDemandDrivenPipeline.h"
+  #include "vtkInformationVector.h"
 #endif
 
 #include <vtkSmartPointer.h>
 #include <vtkPolyDataToImageStencil.h>
 #include <vtkImageStencil.h>
+#include <vtkImageData.h>
 #include <vtkPolyData.h>
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 class SurfaceRenderingImageStencilExport : public vtkDataSetToImageFilter
+#else
+class SurfaceRenderingImageStencilExport : public vtkPolyDataAlgorithm
+#endif
 {
 public:
     static SurfaceRenderingImageStencilExport *New();
 
-    vtkTypeMacro(SurfaceRenderingImageStencilExport,vtkDataSetToImageFilter)
+    vtkTypeMacro(SurfaceRenderingImageStencilExport,vtkPolyDataAlgorithm)
 
+#if VTK_MAJOR_VERSION <= 5
     virtual void Update();
-    vtkImageData* GetOutput();
+#else
+       // ..
+#endif
+
+
+    virtual vtkImageData* GetOutputData();
 protected:
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+  // Usual data generation method
     virtual void Execute(vtkImageData *data);
+#else
+  virtual int RequestData(  vtkInformation *vtkNotUsed(request),  vtkInformationVector **inputVector,  vtkInformationVector *outputVector);    
+#endif
 
 private: