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

PR: fix Transform method with orphan nodes

Browse Source
This commit is contained in:
prascle 2010-12-01 22:56:36 +00:00
parent 1c99b370e3
commit 45ed5d9a93
1 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -5345,38 +5345,29 @@ SMESH_MeshEditor::Transform (TIDSortedElemSet & theElems,
// source elements for each generated one // source elements for each generated one
SMESH_SequenceOfElemPtr srcElems, srcNodes; SMESH_SequenceOfElemPtr srcElems, srcNodes;
// // issue 021015: EDF 1578 SMESH: Free nodes are removed when translating a mesh // issue 021015: EDF 1578 SMESH: Free nodes are removed when translating a mesh
// list<SMDS_MeshNode> orphanCopy; // copies of orphan nodes TIDSortedElemSet orphanNode;
// vector<const SMDS_MeshNode*> orphanNode; // original orphan nodes
// if ( theElems.empty() ) // transform the whole mesh
// if ( theElems.empty() ) // transform the whole mesh {
// { // add all elements
// // add all elements SMDS_ElemIteratorPtr eIt = aMesh->elementsIterator();
// SMDS_ElemIteratorPtr eIt = aMesh->elementsIterator(); while ( eIt->more() ) theElems.insert( eIt->next() );
// while ( eIt->more() ) theElems.insert( eIt->next() ); // add orphan nodes
// // add orphan nodes SMDS_NodeIteratorPtr nIt = aMesh->nodesIterator();
// SMDS_MeshElementIDFactory idFactory; while ( nIt->more() )
// SMDS_NodeIteratorPtr nIt = aMesh->nodesIterator(); {
// while ( nIt->more() ) const SMDS_MeshNode* node = nIt->next();
// { if ( node->NbInverseElements() == 0)
// const SMDS_MeshNode* node = nIt->next(); orphanNode.insert( node );
// if ( node->NbInverseElements() == 0 && !theElems.insert( node ).second ) }
// { }
// // node was not inserted into theElems because an element with the same ID
// // is already there. As a work around we insert a copy of node with // loop on elements to transform nodes : first orphan nodes then elems
// // an ID = -<index in orphanNode>
// orphanCopy.push_back( *node ); // copy node
// SMDS_MeshNode* nodeCopy = &orphanCopy.back();
// int uniqueID = -orphanNode.size();
// orphanNode.push_back( node );
// idFactory.BindID( uniqueID, nodeCopy );
// theElems.insert( nodeCopy );
// }
// }
// }
// loop on theElems to transorm nodes
TIDSortedElemSet::iterator itElem; TIDSortedElemSet::iterator itElem;
for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { TIDSortedElemSet *elements[] = {&orphanNode, &theElems };
for (int i=0; i<2; i++)
for ( itElem = elements[i]->begin(); itElem != elements[i]->end(); itElem++ ) {
const SMDS_MeshElement* elem = *itElem; const SMDS_MeshElement* elem = *itElem;
if ( !elem ) if ( !elem )
continue; continue;
@ -5386,8 +5377,6 @@ SMESH_MeshEditor::Transform (TIDSortedElemSet & theElems,
while ( itN->more() ) { while ( itN->more() ) {
const SMDS_MeshNode* node = cast2Node( itN->next() ); const SMDS_MeshNode* node = cast2Node( itN->next() );
// if ( node->GetID() < 0 )
// node = orphanNode[ -node->GetID() ];
// check if a node has been already transformed // check if a node has been already transformed
pair<TNodeNodeMap::iterator,bool> n2n_isnew = pair<TNodeNodeMap::iterator,bool> n2n_isnew =
nodeMap.insert( make_pair ( node, node )); nodeMap.insert( make_pair ( node, node ));