ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

020697: EDF 1248 SMESH: Sub-mesh on group of face not taken into account

Browse Source 
* Correct adding geom groups into map of ansestors
This commit is contained in:
eap 2010-02-18 08:29:00 +00:00
parent b3a24eca49
commit a710674f83
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SMESH/SMESH_Mesh.cxx
View File

@ -520,7 +520,7 @@ SMESH_Hypothesis::Hypothesis_Status
if (ret2 > ret) if (ret2 > ret)
ret = ret2; ret = ret2;
// check concurent hypotheses on ansestors // check concurent hypotheses on ancestors
if (ret < SMESH_Hypothesis::HYP_CONCURENT && !isGlobalHyp ) if (ret < SMESH_Hypothesis::HYP_CONCURENT && !isGlobalHyp )
{ {
SMESH_subMeshIteratorPtr smIt = subMesh->getDependsOnIterator(false,false); SMESH_subMeshIteratorPtr smIt = subMesh->getDependsOnIterator(false,false);
@ -591,7 +591,7 @@ SMESH_Hypothesis::Hypothesis_Status
if (ret2 > ret) // more severe if (ret2 > ret) // more severe
ret = ret2; ret = ret2;
// check concurent hypotheses on ansestors // check concurent hypotheses on ancestors
if (ret < SMESH_Hypothesis::HYP_CONCURENT && !IsMainShape( aSubShape ) ) if (ret < SMESH_Hypothesis::HYP_CONCURENT && !IsMainShape( aSubShape ) )
{ {
SMESH_subMeshIteratorPtr smIt = subMesh->getDependsOnIterator(false,false); SMESH_subMeshIteratorPtr smIt = subMesh->getDependsOnIterator(false,false);
@ -1578,14 +1578,31 @@ const TListOfListOfInt& SMESH_Mesh::GetMeshOrder() const
//============================================================================= //=============================================================================
/*! /*!
* \brief fillAncestorsMap * \brief fill _mapAncestors
*/ */
//============================================================================= //=============================================================================
void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape)
{ {
// fill _mapAncestors
int desType, ancType; int desType, ancType;
if ( !theShape.IsSame( GetShapeToMesh()) && theShape.ShapeType() == TopAbs_COMPOUND )
{
// a geom group is added. Insert it into lists of ancestors before
// the first ancestor more complex than group members
int memberType = TopoDS_Iterator( theShape ).Value().ShapeType();
for ( desType = TopAbs_VERTEX; desType >= memberType; desType-- )
for (TopExp_Explorer des( theShape, TopAbs_ShapeEnum( desType )); des.More(); des.Next())
{
TopTools_ListOfShape& ancList = _mapAncestors.ChangeFromKey( des.Current() );
TopTools_ListIteratorOfListOfShape ancIt (ancList);
while ( ancIt.More() && ancIt.Value().ShapeType() >= memberType )
ancIt.Next();
if ( ancIt.More() )
ancList.InsertBefore( theShape, ancIt );
}
}
{
for ( desType = TopAbs_VERTEX; desType > TopAbs_COMPOUND; desType-- ) for ( desType = TopAbs_VERTEX; desType > TopAbs_COMPOUND; desType-- )
for ( ancType = desType - 1; ancType >= TopAbs_COMPOUND; ancType-- ) for ( ancType = desType - 1; ancType >= TopAbs_COMPOUND; ancType-- )
TopExp::MapShapesAndAncestors ( theShape, TopExp::MapShapesAndAncestors ( theShape,
@ -1593,6 +1610,7 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape)
(TopAbs_ShapeEnum) ancType, (TopAbs_ShapeEnum) ancType,
_mapAncestors ); _mapAncestors );
} }
}
//============================================================================= //=============================================================================
/*! /*!