ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 0016617: Regression in V5.1.1rc3: the groups are not generated.

Browse Source
This commit is contained in:
jfa 2009-03-19 14:41:11 +00:00
parent 9fd4726f74
commit 0556492614
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHDS/SMESHDS_Mesh.cxx
View File

@ -701,7 +701,7 @@ void SMESHDS_Mesh::RemoveNode(const SMDS_MeshNode * n)
else else
SubIt = myShapeIndexToSubMesh.begin(); SubIt = myShapeIndexToSubMesh.begin();
for ( ; !subMesh && SubIt != myShapeIndexToSubMesh.end(); SubIt++ ) for ( ; !subMesh && SubIt != myShapeIndexToSubMesh.end(); SubIt++ )
if ( SubIt->second->Contains( n )) if (!SubIt->second->IsComplexSubmesh() && SubIt->second->Contains( n ))
subMesh = SubIt->second; subMesh = SubIt->second;
RemoveFreeNode( n, subMesh, true); RemoveFreeNode( n, subMesh, true);
@ -764,7 +764,7 @@ void SMESHDS_Mesh::RemoveElement(const SMDS_MeshElement * elt)
SMESHDS_SubMesh* subMesh=0; SMESHDS_SubMesh* subMesh=0;
map<int,SMESHDS_SubMesh*>::iterator SubIt = myShapeIndexToSubMesh.begin(); map<int,SMESHDS_SubMesh*>::iterator SubIt = myShapeIndexToSubMesh.begin();
for ( ; !subMesh && SubIt != myShapeIndexToSubMesh.end(); SubIt++ ) for ( ; !subMesh && SubIt != myShapeIndexToSubMesh.end(); SubIt++ )
if ( SubIt->second->Contains( elt )) if (!SubIt->second->IsComplexSubmesh() && SubIt->second->Contains( elt ))
subMesh = SubIt->second; subMesh = SubIt->second;
RemoveFreeElement( elt, subMesh, true); RemoveFreeElement( elt, subMesh, true);

19
src/SMESHDS/SMESHDS_SubMesh.cxx
View File

@ -243,17 +243,18 @@ SMDS_NodeIteratorPtr SMESHDS_SubMesh::GetNodes() const
bool SMESHDS_SubMesh::Contains(const SMDS_MeshElement * ME) const bool SMESHDS_SubMesh::Contains(const SMDS_MeshElement * ME) const
{ {
// DO NOT TRY TO FIND A REMOVED ELEMENT !! // DO NOT TRY TO FIND A REMOVED ELEMENT !!
if ( IsComplexSubmesh() || !ME ) //if ( IsComplexSubmesh() || !ME )
if (!ME )
return false; return false;
// if ( IsComplexSubmesh() ) if ( IsComplexSubmesh() )
// { {
// set<const SMESHDS_SubMesh*>::const_iterator aSubIt = mySubMeshes.begin(); set<const SMESHDS_SubMesh*>::const_iterator aSubIt = mySubMeshes.begin();
// for ( ; aSubIt != mySubMeshes.end(); aSubIt++ ) for ( ; aSubIt != mySubMeshes.end(); aSubIt++ )
// if ( (*aSubIt)->Contains( ME )) if ( (*aSubIt)->Contains( ME ))
// return true; return true;
// return false; return false;
// } }
if ( ME->GetType() == SMDSAbs_Node ) if ( ME->GetType() == SMDSAbs_Node )
return ( myNodes.find( ME ) != myNodes.end() ); return ( myNodes.find( ME ) != myNodes.end() );