X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FVTKViewer%2FVTKViewer_ShrinkFilter.h;h=e8c3597156fe95dcda141c5742cee5b06d75e339;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=4d2a416bb546aadbf515953d45a14368a8d7deb6;hpb=399155730966dfc225fbb24f66204b05664385f2;p=modules%2Fgui.git diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.h b/src/VTKViewer/VTKViewer_ShrinkFilter.h index 4d2a416bb..e8c359715 100755 --- a/src/VTKViewer/VTKViewer_ShrinkFilter.h +++ b/src/VTKViewer/VTKViewer_ShrinkFilter.h @@ -1,21 +1,25 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// // 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. -// -// 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 +// 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 +// 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 // + #ifndef VTKVIEWER_SHRINKFILTER_H #define VTKVIEWER_SHRINKFILTER_H @@ -25,6 +29,10 @@ #include +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*!Shrink cells composing an arbitrary data set. *\warning It is possible to turn cells inside out or cause self intersection in special cases. */ @@ -33,7 +41,7 @@ class VTKVIEWER_EXPORT VTKViewer_ShrinkFilter : public vtkShrinkFilter public: /*!Create new instance of VTKViewer_ShrinkFilter.*/ static VTKViewer_ShrinkFilter *New(); - vtkTypeRevisionMacro(VTKViewer_ShrinkFilter, vtkShrinkFilter); + vtkTypeMacro(VTKViewer_ShrinkFilter, vtkShrinkFilter); void SetStoreMapping(int theStoreMapping); /*!Gets store mapping flag.*/ @@ -47,7 +55,7 @@ protected: VTKViewer_ShrinkFilter(); ~VTKViewer_ShrinkFilter(); - void Execute(); + virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *); /*!Not implemented.*/ void UnstructuredGridExecute(); @@ -57,4 +65,8 @@ private: TVectorId myVTK2ObjIds; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif