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

22599: EDF 8159 SMESH: Bad groups created by extrusion

Browse Source
This commit is contained in:
eap 2014-05-29 17:34:47 +04:00
parent 440a39776f
commit a4f4aea846
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
idl/SMESH_Gen.idl
View File

@ -363,7 +363,7 @@ module SMESH
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
* Return indeces of faces, edges and vertices of given sub-shapes * Return indices of faces, edges and vertices of given sub-shapes
* within theMainObject * within theMainObject
*/ */
long_array GetSubShapesId( in GEOM::GEOM_Object theMainObject, long_array GetSubShapesId( in GEOM::GEOM_Object theMainObject,

36
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -6453,7 +6453,9 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
// Sort existing groups by types and collect their names // Sort existing groups by types and collect their names
// to store an old group and a generated new ones // containers to store an old group and generated new ones;
// 1st new group is for result elems of different type than a source one;
// 2nd new group is for same type result elems ("top" group at extrusion)
using boost::tuple; using boost::tuple;
using boost::make_tuple; using boost::make_tuple;
typedef tuple< SMESHDS_GroupBase*, SMESHDS_Group*, SMESHDS_Group* > TOldNewGroup; typedef tuple< SMESHDS_GroupBase*, SMESHDS_Group*, SMESHDS_Group* > TOldNewGroup;
@ -6483,6 +6485,11 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
// Loop on nodes and elements to add them in new groups // Loop on nodes and elements to add them in new groups
// is there elements of different types generated from one source element;
// it is false for transformations and true for sweeping
bool isTwoTypesResult = false;
vector< const SMDS_MeshElement* > resultElems;
for ( int isNodes = 0; isNodes < 2; ++isNodes ) for ( int isNodes = 0; isNodes < 2; ++isNodes )
{ {
const SMESH_SequenceOfElemPtr& gens = isNodes ? nodeGens : elemGens; const SMESH_SequenceOfElemPtr& gens = isNodes ? nodeGens : elemGens;
@ -6505,7 +6512,7 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
continue; continue;
} }
// collect all elements made by the iElem-th sourceElem // collect all elements made by the iElem-th sourceElem
list< const SMDS_MeshElement* > resultElems; resultElems.clear();
if ( const SMDS_MeshElement* resElem = elems( iElem )) if ( const SMDS_MeshElement* resElem = elems( iElem ))
if ( resElem != sourceElem ) if ( resElem != sourceElem )
resultElems.push_back( resElem ); resultElems.push_back( resElem );
@ -6523,12 +6530,12 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
} }
else else
{ {
list< const SMDS_MeshElement* >::reverse_iterator resElemIt = resultElems.rbegin(); vector< const SMDS_MeshElement* >::reverse_iterator resElemIt = resultElems.rbegin();
for ( ; resElemIt != resultElems.rend() ; ++resElemIt ) for ( ; resElemIt != resultElems.rend() ; ++resElemIt )
if ( (*resElemIt)->GetType() == sourceElem->GetType() ) if ( (*resElemIt)->GetType() == sourceElem->GetType() )
{ {
topElem = *resElemIt; topElem = *resElemIt;
resultElems.erase( --(resElemIt.base()) ); // erase *resElemIt *resElemIt = 0; // erase *resElemIt
break; break;
} }
} }
@ -6542,15 +6549,19 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
{ {
// fill in a new group // fill in a new group
SMDS_MeshGroup & newGroup = gOldNew->get<1>()->SMDSGroup(); SMDS_MeshGroup & newGroup = gOldNew->get<1>()->SMDSGroup();
list< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt; vector< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt;
for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt ) for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt )
newGroup.Add( *resElemIt ); if ( *resElemIt )
newGroup.Add( *resElemIt );
// fill a "top" group // fill a "top" group
if ( topElem ) if ( topElem )
{ {
SMDS_MeshGroup & newTopGroup = gOldNew->get<2>()->SMDSGroup(); SMDS_MeshGroup & newTopGroup = gOldNew->get<2>()->SMDSGroup();
newTopGroup.Add( topElem ); newTopGroup.Add( topElem );
if ( !newGroup.IsEmpty() )
isTwoTypesResult = true;
} }
} }
} }
@ -6565,7 +6576,6 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
SMESHDS_GroupBase* oldGroupDS = orderedOldNewGroups[i]->get<0>(); SMESHDS_GroupBase* oldGroupDS = orderedOldNewGroups[i]->get<0>();
SMESHDS_Group* newGroups[2] = { orderedOldNewGroups[i]->get<1>(), SMESHDS_Group* newGroups[2] = { orderedOldNewGroups[i]->get<1>(),
orderedOldNewGroups[i]->get<2>() }; orderedOldNewGroups[i]->get<2>() };
const int nbNewGroups = !newGroups[0]->IsEmpty() + !newGroups[1]->IsEmpty();
for ( int is2nd = 0; is2nd < 2; ++is2nd ) for ( int is2nd = 0; is2nd < 2; ++is2nd )
{ {
SMESHDS_Group* newGroupDS = newGroups[ is2nd ]; SMESHDS_Group* newGroupDS = newGroups[ is2nd ];
@ -6579,11 +6589,21 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
newGroupDS->SetType( newGroupDS->GetElements()->next()->GetType() ); newGroupDS->SetType( newGroupDS->GetElements()->next()->GetType() );
// make a name // make a name
const bool isTop = ( nbNewGroups == 2 && const bool isTop = ( isTwoTypesResult &&
newGroupDS->GetType() == oldGroupDS->GetType() && newGroupDS->GetType() == oldGroupDS->GetType() &&
is2nd ); is2nd );
string name = oldGroupDS->GetStoreName(); string name = oldGroupDS->GetStoreName();
{ // remove trailing whitespaces (issue 22599)
size_t size = name.size();
while ( size > 1 && isspace( name[ size-1 ]))
--size;
if ( size != name.size() )
{
name.resize( size );
oldGroupDS->SetStoreName( name.c_str() );
}
}
if ( !targetMesh ) { if ( !targetMesh ) {
string suffix = ( isTop ? "top": postfix.c_str() ); string suffix = ( isTop ? "top": postfix.c_str() );
name += "_"; name += "_";