Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_GeometryFilter.h
diff --git
a/src/VTKViewer/VTKViewer_GeometryFilter.h
b/src/VTKViewer/VTKViewer_GeometryFilter.h
index e4ecab87d9b53a83a52f7f3e064d366c3362325b..e2420fef3748b9beac9a25c3b1664ddee1bd7e88 100755
(executable)
--- a/
src/VTKViewer/VTKViewer_GeometryFilter.h
+++ b/
src/VTKViewer/VTKViewer_GeometryFilter.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-59,23
+59,20
@@
public:
* \retval myShowInside
*/
int GetInside();
* \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.
*/
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);
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
void SetWireframeMode(int theIsWireframeMode);
/*! \fn int GetWireframeMode()
* \brief Return value of \a myIsWireframeMode
@@
-110,7
+107,8
@@
public:
virtual double GetQuadraticArcAngle() const;
typedef std::vector<vtkIdType> TVectorId;
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,
static void InsertId( const vtkIdType theCellId,
const vtkIdType theCellType,