ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 10:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021058: EDF 1674 SMESH: SetTriangleVertex ends in error with strange message

Browse Source 
prevent problems with TopAbs_INTERNAL shapes
This commit is contained in:
eap 2010-10-29 13:24:11 +00:00
parent 9048c261d7
commit a4e82b3769
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -475,6 +475,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
RETURN_BAD_RESULT("Wrong map extent " << theMap.Extent() ); RETURN_BAD_RESULT("Wrong map extent " << theMap.Extent() );
TopoDS_Edge edge1 = TopoDS::Edge( theShape1 ); TopoDS_Edge edge1 = TopoDS::Edge( theShape1 );
TopoDS_Edge edge2 = TopoDS::Edge( theShape2 ); TopoDS_Edge edge2 = TopoDS::Edge( theShape2 );
if ( edge1.Orientation() >= TopAbs_INTERNAL ) edge1.Orientation( TopAbs_FORWARD );
if ( edge2.Orientation() >= TopAbs_INTERNAL ) edge2.Orientation( TopAbs_FORWARD );
TopoDS_Vertex VV1[2], VV2[2]; TopoDS_Vertex VV1[2], VV2[2];
TopExp::Vertices( edge1, VV1[0], VV1[1] ); TopExp::Vertices( edge1, VV1[0], VV1[1] );
TopExp::Vertices( edge2, VV2[0], VV2[1] ); TopExp::Vertices( edge2, VV2[0], VV2[1] );
@ -490,6 +492,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
TopoDS_Face face1 = TopoDS::Face( theShape1 ); TopoDS_Face face1 = TopoDS::Face( theShape1 );
TopoDS_Face face2 = TopoDS::Face( theShape2 ); TopoDS_Face face2 = TopoDS::Face( theShape2 );
if ( face1.Orientation() >= TopAbs_INTERNAL ) face1.Orientation( TopAbs_FORWARD );
if ( face2.Orientation() >= TopAbs_INTERNAL ) face2.Orientation( TopAbs_FORWARD );
TopoDS_Vertex VV1[2], VV2[2]; TopoDS_Vertex VV1[2], VV2[2];
// find a not closed edge of face1 both vertices of which are associated // find a not closed edge of face1 both vertices of which are associated
@ -537,6 +541,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopExp_Explorer exp ( theShape1, TopAbs_EDGE ); TopExp_Explorer exp ( theShape1, TopAbs_EDGE );
for ( ; VV2[ 1 ].IsNull() && exp.More(); exp.Next() ) { for ( ; VV2[ 1 ].IsNull() && exp.More(); exp.Next() ) {
edge1 = TopoDS::Edge( exp.Current() ); edge1 = TopoDS::Edge( exp.Current() );
if ( edge1.Orientation() >= TopAbs_INTERNAL ) edge1.Orientation( TopAbs_FORWARD );
TopExp::Vertices( edge1 , VV1[0], VV1[1] ); TopExp::Vertices( edge1 , VV1[0], VV1[1] );
if ( theMap.IsBound( VV1[0] )) { if ( theMap.IsBound( VV1[0] )) {
VV2[ 0 ] = TopoDS::Vertex( theMap( VV1[0] )); VV2[ 0 ] = TopoDS::Vertex( theMap( VV1[0] ));
@ -700,7 +705,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
if ( !initAssocOK ) { if ( !initAssocOK ) {
// for shell association there must be an edge with both vertices bound // for shell association there must be an edge with both vertices bound
TopoDS_Vertex v1, v2; TopoDS_Vertex v1, v2;
TopExp::Vertices( TopoDS::Edge( it1.Value()), v1, v2 ); TopExp::Vertices( TopoDS::Edge( it1.Value().Oriented(TopAbs_FORWARD)), v1, v2 );
initAssocOK = ( theMap.IsBound( v1 ) && theMap.IsBound( v2 )); initAssocOK = ( theMap.IsBound( v1 ) && theMap.IsBound( v2 ));
} }
} }
@ -949,6 +954,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
{ {
TopoDS_Face face1 = TopoDS::Face(theShape1); TopoDS_Face face1 = TopoDS::Face(theShape1);
TopoDS_Face face2 = TopoDS::Face(theShape2); TopoDS_Face face2 = TopoDS::Face(theShape2);
if ( face1.Orientation() >= TopAbs_INTERNAL ) face1.Orientation( TopAbs_FORWARD );
if ( face2.Orientation() >= TopAbs_INTERNAL ) face2.Orientation( TopAbs_FORWARD );
TopoDS_Edge edge1, edge2; TopoDS_Edge edge1, edge2;
// get outer edge of theShape1 // get outer edge of theShape1
edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE )); edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE ));
@ -1132,7 +1139,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE ) if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE )
RETURN_BAD_RESULT("Edge not found"); RETURN_BAD_RESULT("Edge not found");
TopExp::Vertices( TopoDS::Edge( edge ), VV1[0], VV1[1]); TopExp::Vertices( TopoDS::Edge( edge.Oriented(TopAbs_FORWARD)), VV1[0], VV1[1]);
if ( VV1[0].IsSame( VV1[1] )) if ( VV1[0].IsSame( VV1[1] ))
RETURN_BAD_RESULT("Only closed edges"); RETURN_BAD_RESULT("Only closed edges");

3
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -757,7 +757,8 @@ FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMes
const TopoDS_Shape & aShape) const TopoDS_Shape & aShape)
//throw(SALOME_Exception) //throw(SALOME_Exception)
{ {
const TopoDS_Face & F = TopoDS::Face(aShape); TopoDS_Face F = TopoDS::Face(aShape);
if ( F.Orientation() >= TopAbs_INTERNAL ) F.Orientation( TopAbs_FORWARD );
const bool ignoreMediumNodes = _quadraticMesh; const bool ignoreMediumNodes = _quadraticMesh;
// verify 1 wire only, with 4 edges // verify 1 wire only, with 4 edges