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

fix bug 11757. Use free labels when publishing a reference

Browse Source
This commit is contained in:
eap 2006-05-03 14:53:45 +00:00
parent 7d8a3a8516
commit b28dc98b3a
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -309,25 +309,32 @@ static void addReference (SALOMEDS::Study_ptr theStudy,
SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
SALOMEDS::SObject_var aReferenceSO; SALOMEDS::SObject_var aReferenceSO;
if ( !theTag ) { if ( !theTag ) {
// check if the reference to theToObject already exists
// and find a free label for the reference object
bool isReferred = false; bool isReferred = false;
int tag = 1;
SALOMEDS::ChildIterator_var anIter = theStudy->NewChildIterator( theSObject ); SALOMEDS::ChildIterator_var anIter = theStudy->NewChildIterator( theSObject );
for ( ; !isReferred && anIter->More(); anIter->Next() ) { for ( ; !isReferred && anIter->More(); anIter->Next(), ++tag ) {
if ( anIter->Value()->ReferencedObject( aReferenceSO ) && if ( anIter->Value()->ReferencedObject( aReferenceSO )) {
strcmp( aReferenceSO->GetID(), aToObjSO->GetID() ) == 0 ) if ( strcmp( aReferenceSO->GetID(), aToObjSO->GetID() ) == 0 )
isReferred = true; isReferred = true;
} }
if ( !isReferred ) { else if ( !theTag ) {
aReferenceSO = aStudyBuilder->NewObject( theSObject ); SALOMEDS::GenericAttribute_var anAttr;
aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); if ( !anIter->Value()->FindAttribute( anAttr, "AttributeIOR" ))
theTag = tag;
} }
} }
else { if ( isReferred )
return;
if ( !theTag )
theTag = tag;
}
if ( !theSObject->FindSubObject( theTag, aReferenceSO )) if ( !theSObject->FindSubObject( theTag, aReferenceSO ))
aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag ); aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag );
aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
} }
} }
}
//============================================================================= //=============================================================================
/*! /*!