ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-13 17:18:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Regression of bugs_13/N9

Browse Source
This commit is contained in:
eap 2014-10-24 18:01:50 +04:00
parent 70a8be5273
commit 7432636e86
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -658,7 +658,6 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopoDS_Shape F1, F2; TopoDS_Shape F1, F2;
// get a face sharing edge1 (F1) // get a face sharing edge1 (F1)
TopoDS_Shape FF2[2];
TopTools_ListIteratorOfListOfShape ancestIt1( edgeToFace1.FindFromKey( edge1 )); TopTools_ListIteratorOfListOfShape ancestIt1( edgeToFace1.FindFromKey( edge1 ));
for ( ; F1.IsNull() && ancestIt1.More(); ancestIt1.Next() ) for ( ; F1.IsNull() && ancestIt1.More(); ancestIt1.Next() )
if ( ancestIt1.Value().ShapeType() == TopAbs_FACE ) if ( ancestIt1.Value().ShapeType() == TopAbs_FACE )
@ -668,6 +667,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
RETURN_BAD_RESULT(" Face1 not found"); RETURN_BAD_RESULT(" Face1 not found");
// get 2 faces sharing edge2 (one of them is F2) // get 2 faces sharing edge2 (one of them is F2)
TopoDS_Shape FF2[2];
TopTools_ListIteratorOfListOfShape ancestIt2( edgeToFace2.FindFromKey( edge2 )); TopTools_ListIteratorOfListOfShape ancestIt2( edgeToFace2.FindFromKey( edge2 ));
for ( int i = 0; FF2[1].IsNull() && ancestIt2.More(); ancestIt2.Next() ) for ( int i = 0; FF2[1].IsNull() && ancestIt2.More(); ancestIt2.Next() )
if ( ancestIt2.Value().ShapeType() == TopAbs_FACE ) if ( ancestIt2.Value().ShapeType() == TopAbs_FACE )

10
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
View File

@ -179,13 +179,13 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// ---------------------------------- // ----------------------------------
ProjectionUtils::TShapeShapeMap shape2ShapeMaps[2]; ProjectionUtils::TShapeShapeMap shape2ShapeMaps[2];
if ( !ProjectionUtils::FindSubShapeAssociation( innerShell, &aMesh, bool mapOk1 = ProjectionUtils::FindSubShapeAssociation( innerShell, &aMesh,
outerShell, &aMesh, outerShell, &aMesh,
shape2ShapeMaps[0]) shape2ShapeMaps[0]);
&& bool mapOk2 = ProjectionUtils::FindSubShapeAssociation( innerShell.Reversed(), &aMesh,
!ProjectionUtils::FindSubShapeAssociation( innerShell.Reversed(), &aMesh,
outerShell, &aMesh, outerShell, &aMesh,
shape2ShapeMaps[1])) shape2ShapeMaps[1]);
if ( !mapOk1 && !mapOk2 )
return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" ); return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" );
int iMap; int iMap;