Copyright update 2021

[modules/gui.git] / src / VTKViewer / VTKViewer_GeometryFilter.h

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h
old mode 100755 (executable)
new mode 100644 (file)
index 53a36f4..c617dd5
--- a/src/VTKViewer/VTKViewer_GeometryFilter.h
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -45,10 +45,10 @@ public:
    */
   static VTKViewer_GeometryFilter *New();
   
-  /*! \fn vtkTypeRevisionMacro(VTKViewer_GeometryFilter, vtkGeometryFilter)
+  /*! \fn vtkTypeMacro(VTKViewer_GeometryFilter, vtkGeometryFilter)
    *  \brief VTK type revision macros.
    */
-  vtkTypeRevisionMacro(VTKViewer_GeometryFilter, vtkGeometryFilter);
+  vtkTypeMacro(VTKViewer_GeometryFilter, vtkGeometryFilter)
   /*! \fn void SetInside(int theShowInside)
    * \brief Sets \a myShowInside flag. \a myShowInside is changed, call this->Modified().
    * \param theShowInside - used for changing value of \a myShowInside variable.
@@ -59,23 +59,20 @@ public:
    * \retval myShowInside
    */
   int GetInside();
-  /*! \fn void SetWireframeMode(int theIsWireframeMode)
-   * \brief Sets \a myIsWireframeMode flag. \a myIsWireframeMode is changed, call this->Modified().
-   * \param theIsWireframeMode - used for changing value of \a myIsWireframeMode variable.
+  /*! \fn int GetAppendCoincident3D()
+   * \brief Return value of \a myAppendCoincident3D
+   * \retval myAppendCoincident3D
    */
-
   int GetAppendCoincident3D() const;
   /*! \fn void SetAppendCoincident3D()
    *  \brief Sets \a myAppendCoincident3D flag. If this flag is true, filter append to the 
       result data set coincident 3D elements.
    */
-
   void SetAppendCoincident3D(int theFlag);
-  /*! \fn int SetAppendCoincident3D()
-   * \brief Return value of \a myAppendCoincident3D
-   * \retval myAppendCoincident3D
+  /*! \fn void SetWireframeMode(int theIsWireframeMode)
+   * \brief Sets \a myIsWireframeMode flag. \a myIsWireframeMode is changed, call this->Modified().
+   * \param theIsWireframeMode - used for changing value of \a myIsWireframeMode variable.
    */
-
   void SetWireframeMode(int theIsWireframeMode);
   /*! \fn int GetWireframeMode()
    * \brief Return value of \a myIsWireframeMode
@@ -106,15 +103,16 @@ public:
   virtual void SetQuadraticArcMode(bool theFlag);
   virtual bool GetQuadraticArcMode() const;
 
-  virtual void   SetQuadraticArcAngle(vtkFloatingPointType theMaxAngle);
-  virtual vtkFloatingPointType GetQuadraticArcAngle() const;
+  virtual void   SetQuadraticArcAngle(double theMaxAngle);
+  virtual double GetQuadraticArcAngle() const;
 
   typedef std::vector<vtkIdType> TVectorId;
-  typedef std::map<vtkIdType, TVectorId> TMapOfVectorId;
+  //typedef std::map<vtkIdType, TVectorId> TMapOfVectorId;
+  typedef std::vector<TVectorId> TMapOfVectorId;
 
   static void InsertId( const vtkIdType theCellId,
                         const vtkIdType theCellType,
-                        TVectorId& theVTK2ObjIds,
+                        TVectorId& /*theVTK2ObjIds*/,
                         TMapOfVectorId& theDimension2VTK2ObjIds );
 
 protected:
@@ -150,7 +148,7 @@ private:
   int       myIsWireframeMode;
   int       myAppendCoincident3D;
 
-  vtkFloatingPointType    myMaxArcAngle;   // define max angle for mesh 2D quadratic element in the degrees
+  double    myMaxArcAngle;    // define max angle for mesh 2D quadratic element in the degrees
   bool      myIsBuildArc;     // flag for representation 2D quadratic element as arked polygon
 };