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
Nommage des maillags intermédiaires
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_Delaunay.cxx
diff --git
a/src/SMESHUtils/SMESH_Delaunay.cxx
b/src/SMESHUtils/SMESH_Delaunay.cxx
index e2a4a99b6eedbddc9f205e4b2823178d1ee8d421..bc5576797f0ba94bb15c793d9bc249a7c8fa88dc 100644
(file)
--- a/
src/SMESHUtils/SMESH_Delaunay.cxx
+++ b/
src/SMESHUtils/SMESH_Delaunay.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-225,11
+225,8
@@
const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
gp_XY seg = uv - gc;
tria->Edges( linkIDs, ori );
gp_XY seg = uv - gc;
tria->Edges( linkIDs, ori );
-#if OCC_VERSION_LARGE <= 0x07030000
- int triaID = _triaDS->IndexOf( *tria );
-#else
- int triaID = tria - & ( _triaDS->GetElement( 0 ));
-#endif
+
+ const BRepMesh_Triangle* prevTria = tria;
tria = 0;
for ( int i = 0; i < 3; ++i )
tria = 0;
for ( int i = 0; i < 3; ++i )
@@
-252,7
+249,9
@@
const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
double uSeg = ( uv1 - gc ) ^ lin / crossSegLin;
if ( 0. <= uSeg && uSeg <= 1. )
{
double uSeg = ( uv1 - gc ) ^ lin / crossSegLin;
if ( 0. <= uSeg && uSeg <= 1. )
{
- tria = & _triaDS->GetElement( triIDs.Index( 1 + ( triIDs.Index(1) == triaID )));
+ tria = & _triaDS->GetElement( triIDs.Index( 1 ));
+ if ( tria == prevTria )
+ tria = & _triaDS->GetElement( triIDs.Index( 2 ));
if ( tria->Movability() != BRepMesh_Deleted )
break;
}
if ( tria->Movability() != BRepMesh_Deleted )
break;
}
@@
-388,5
+387,5
@@
void SMESH_Delaunay::ToPython() const
file.remove();
file.openForWriting();
file.write( text.c_str(), text.size() );
file.remove();
file.openForWriting();
file.write( text.c_str(), text.size() );
- cout << "exec(open('" << fileName << "', 'rb').read())";
+
std::
cout << "exec(open('" << fileName << "', 'rb').read())";
}
}