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

53099: 3D Extrusion algo refuses to work on an extruded solid with internal faces

Browse Source
This commit is contained in:
eap 2016-03-04 20:54:10 +03:00
parent d54b8e1c78
commit 5b62e4db7c
2 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH_SWIG/smeshBuilder.py
View File

@ -252,7 +252,7 @@ def TreatHypoStatus(status, hypName, geomName, isAlgo, mesh):
if mesh:
meshName = GetName( mesh )
if meshName and meshName != NO_NAME:
where = '"%s" in "%s"' % ( geomName, meshName )
where = '"%s" shape in "%s" mesh ' % ( geomName, meshName )
if status < HYP_UNKNOWN_FATAL and where:
print '"%s" was assigned to %s but %s' %( hypName, where, reason )
elif where:

94
src/StdMeshers/StdMeshers_Prism_3D.cxx
View File

@ -2509,8 +2509,10 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
_iL( SMESH_MesherHelper::WrapIndex( iE-1, nbE ) + shift ),
_iR( SMESH_MesherHelper::WrapIndex( iE+1, nbE ) + shift )
{
//_edge.Orientation( TopAbs_FORWARD ); // for operator==() to work
}
EdgeWithNeighbors() {}
bool IsInternal() const { return !_edge.IsNull() && _edge.Orientation() == TopAbs_INTERNAL; }
};
// PrismSide contains all FACEs linking a bottom EDGE with a top one.
struct PrismSide
@ -2524,6 +2526,7 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
int _nbCheckedEdges; // nb of EDGEs whose location is defined
PrismSide *_leftSide; // neighbor sides
PrismSide *_rightSide;
bool _isInternal; // whether this side raises from an INTERNAL EDGE
void SetExcluded() { _leftSide = _rightSide = NULL; }
bool IsExcluded() const { return !_leftSide; }
const TopoDS_Edge& Edge( int i ) const
@ -2536,10 +2539,15 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
if ( E.IsSame( Edge( i ))) return i;
return -1;
}
bool IsSideFace( const TopoDS_Shape& face ) const
bool IsSideFace( const TopoDS_Shape& face, const bool checkNeighbors ) const
{
if ( _faces->Contains( face )) // avoid returning true for a prism top FACE
return ( !_face.IsNull() || !( face.IsSame( _faces->FindKey( _faces->Extent() ))));
if ( checkNeighbors )
return (( _leftSide && _leftSide->IsSideFace ( face, false )) ||
( _rightSide && _rightSide->IsSideFace( face, false )));
return false;
}
};
@ -2551,15 +2559,19 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
vector< EdgeWithNeighbors > & edges,
const bool noHolesAllowed)
{
TopoDS_Face f = face;
if ( f.Orientation() != TopAbs_FORWARD &&
f.Orientation() != TopAbs_REVERSED )
f.Orientation( TopAbs_FORWARD );
list< TopoDS_Edge > ee;
list< int > nbEdgesInWires;
int nbW = SMESH_Block::GetOrderedEdges( face, ee, nbEdgesInWires );
int nbW = SMESH_Block::GetOrderedEdges( f, ee, nbEdgesInWires );
if ( nbW > 1 && noHolesAllowed )
return false;
int iE, nbTot = 0;
list< TopoDS_Edge >::iterator e = ee.begin();
list< int >::iterator nbE = nbEdgesInWires.begin();
list< TopoDS_Edge >::iterator e = ee.begin();
list< int >::iterator nbE = nbEdgesInWires.begin();
for ( ; nbE != nbEdgesInWires.end(); ++nbE )
for ( iE = 0; iE < *nbE; ++e, ++iE )
if ( SMESH_Algo::isDegenerated( *e ))
@ -2568,10 +2580,6 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
--(*nbE);
--iE;
}
else
{
e->Orientation( TopAbs_FORWARD ); // for operator==() to work
}
edges.clear();
e = ee.begin();
@ -2581,6 +2589,35 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
edges.push_back( EdgeWithNeighbors( *e, iE, *nbE, nbTot ));
nbTot += *nbE;
}
// IPAL53099. Set correct neighbors to INTERNAL EDGEs, which can be connected to
// EDGEs of the outer WIRE but this fact can't be detected by their order.
if ( nbW > 1 )
{
int iFirst = 0, iLast;
for ( nbE = nbEdgesInWires.begin(); nbE != nbEdgesInWires.end(); ++nbE )
{
iLast = iFirst + *nbE - 1;
TopoDS_Vertex vv[2] = { SMESH_MesherHelper::IthVertex( 0, edges[ iFirst ]._edge ),
SMESH_MesherHelper::IthVertex( 1, edges[ iLast ]._edge ) };
bool isConnectOk = ( vv[0].IsSame( vv[1] ));
if ( !isConnectOk )
{
// look for an EDGE of the outer WIRE connected to vv
TopoDS_Vertex v0, v1;
for ( iE = 0; iE < nbEdgesInWires.front(); ++iE )
{
v0 = SMESH_MesherHelper::IthVertex( 0, edges[ iE ]._edge );
v1 = SMESH_MesherHelper::IthVertex( 1, edges[ iE ]._edge );
if ( vv[0].IsSame( v0 ) || vv[0].IsSame( v1 ))
edges[ iFirst ]._iL = iE;
if ( vv[1].IsSame( v0 ) || vv[1].IsSame( v1 ))
edges[ iLast ]._iR = iE;
}
}
iFirst += *nbE;
}
}
return edges.size();
}
//--------------------------------------------------------------------------------
@ -2703,11 +2740,12 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA
sides.resize( botEdges.size() );
for ( size_t iS = 0; iS < botEdges.size(); ++iS )
{
sides[ iS ]._topEdge = botEdges[ iS ]._edge;
sides[ iS ]._face = botF;
sides[ iS ]._leftSide = & sides[ botEdges[ iS ]._iR ];
sides[ iS ]._rightSide = & sides[ botEdges[ iS ]._iL ];
sides[ iS ]._faces = & facesOfSide[ iS ];
sides[ iS ]._topEdge = botEdges[ iS ]._edge;
sides[ iS ]._face = botF;
sides[ iS ]._leftSide = & sides[ botEdges[ iS ]._iR ];
sides[ iS ]._rightSide = & sides[ botEdges[ iS ]._iL ];
sides[ iS ]._isInternal = botEdges[ iS ].IsInternal();
sides[ iS ]._faces = & facesOfSide[ iS ];
sides[ iS ]._faces->Clear();
}
@ -2736,8 +2774,9 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA
if ( side._isCheckedEdge[ iE ] ) continue;
const TopoDS_Edge& vertE = side.Edge( iE );
const TopoDS_Shape& neighborF = getAnotherFace( side._face, vertE, facesOfEdge );
bool isEdgeShared = adjSide->IsSideFace( neighborF );
if ( isEdgeShared ) // vertE is shared with adjSide
bool isEdgeShared = (( adjSide->IsSideFace( neighborF, side._isInternal )) ||
( adjSide == &side && neighborF.IsSame( side._face )) );
if ( isEdgeShared ) // vertE is shared with adjSide
{
isAdvanced = true;
side._isCheckedEdge[ iE ] = true;
@ -2778,20 +2817,19 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA
{
stop = true;
}
else if ( side._leftSide != & side ) // not closed side face
else if ( side._leftSide != & side && // not closed side face
side._leftSide->_faces->Contains( f ))
{
if ( side._leftSide->_faces->Contains( f ))
{
stop = true; // probably f is the prism top face
side._leftSide->_face.Nullify();
side._leftSide->_topEdge.Nullify();
}
if ( side._rightSide->_faces->Contains( f ))
{
stop = true; // probably f is the prism top face
side._rightSide->_face.Nullify();
side._rightSide->_topEdge.Nullify();
}
stop = true; // probably f is the prism top face
side._leftSide->_face.Nullify();
side._leftSide->_topEdge.Nullify();
}
else if ( side._rightSide != & side &&
side._rightSide->_faces->Contains( f ))
{
stop = true; // probably f is the prism top face
side._rightSide->_face.Nullify();
side._rightSide->_topEdge.Nullify();
}
if ( stop )
{