Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_PolygonPerFace_2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
b/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
index 37054e80ec3c706467dc9918b7a1d221676ce03e..3e59c3b28342b1c27cb83e299a0bc3090dc1bbd0 100644
(file)
--- a/
src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
+++ b/
src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-37,15
+37,15
@@
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
+#include <TopoDS.hxx>
#include <vector>
#include <vector>
-#include <TopoDS.hxx>
using namespace std;
//=======================================================================
//function : StdMeshers_PolygonPerFace_2D
using namespace std;
//=======================================================================
//function : StdMeshers_PolygonPerFace_2D
-//purpose :
+//purpose :
//=======================================================================
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
//=======================================================================
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
@@
-60,8
+60,8
@@
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh&
theMesh
,
- const TopoDS_Shape&
theShape
,
+bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh&
/*theMesh*/
,
+ const TopoDS_Shape&
/*theShape*/
,
SMESH_Hypothesis::Hypothesis_Status& theStatus)
{
theStatus = HYP_OK;
SMESH_Hypothesis::Hypothesis_Status& theStatus)
{
theStatus = HYP_OK;
@@
-136,7
+136,7
@@
bool StdMeshers_PolygonPerFace_2D::Evaluate(SMESH_Mesh& theMesh,
nbQuadSegs += sm2vec->second.at( SMDSEntity_Quad_Edge );
}
nbQuadSegs += sm2vec->second.at( SMDSEntity_Quad_Edge );
}
- std::vector<
int
> aVec( SMDSEntity_Last, 0 );
+ std::vector<
smIdType
> aVec( SMDSEntity_Last, 0 );
switch ( nbLinSegs + nbQuadSegs ) {
case 3:
aVec[ nbQuadSegs ? SMDSEntity_Quad_Triangle : SMDSEntity_Triangle ] = 1;
switch ( nbLinSegs + nbQuadSegs ) {
case 3:
aVec[ nbQuadSegs ? SMDSEntity_Quad_Triangle : SMDSEntity_Triangle ] = 1;