X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClosePolyData.h;h=37f8cde17c26cc5223262a826a6cebee59cb1d6b;hb=f9901e756bb82bd333310b47607875331616bb29;hp=c6623fdeca71ab710820d27ecf54d7c0995651d0;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h index c6623fd..37f8cde 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h @@ -1,10 +1,35 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + /*========================================================================= Program: Visualization Toolkit Module: $RCSfile: vtkClosePolyData.h,v $ Language: C++ - Date: $Date: 2009/05/14 13:54:34 $ - Version: $Revision: 1.2 $ + Date: $Date: 2012/11/15 14:14:35 $ + Version: $Revision: 1.3 $ Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. @@ -30,22 +55,47 @@ #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 RequestData( vtkInformation *vtkNotUsed(request), vtkInformationVector **inputVector, vtkInformationVector *outputVector); +#endif + private: vtkClosePolyData(const vtkClosePolyData&); // Not implemented.