X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClosePolyData.h;h=a11f8b858c5128310241ca584a1b45cedf43b7fa;hb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;hp=85e4ad0cebb53d36fbd2a82d3896488c8a4f343d;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h index 85e4ad0..a11f8b8 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h @@ -55,22 +55,54 @@ #ifndef __vtkClosePolyData_h #define __vtkClosePolyData_h +#include "vtkObjectFactory.h" + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 #include "vtkPolyDataToPolyDataFilter.h" +#else +#include "vtkPolyDataAlgorithm.h" +#endif + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 class vtkClosePolyData : public vtkPolyDataToPolyDataFilter +#else +class vtkClosePolyData : public vtkPolyDataAlgorithm +#endif { public: static vtkClosePolyData *New(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 vtkTypeRevisionMacro(vtkClosePolyData,vtkPolyDataToPolyDataFilter); +#else + vtkTypeMacro(vtkClosePolyData,vtkPolyDataAlgorithm); +#endif void PrintSelf(ostream& os, vtkIndent indent); protected: vtkClosePolyData(); ~vtkClosePolyData(); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 // Usual data generation method void Execute(); +#else +/* + int ProcessRequest( vtkInformation *request, + vtkInformationVector **inputVector, + vtkInformationVector *outputVector); +*/ +int RequestData( vtkInformation *vtkNotUsed(request), vtkInformationVector **inputVector, vtkInformationVector *outputVector); + + +#endif + private: vtkClosePolyData(const vtkClosePolyData&); // Not implemented.