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

fix leaks of SALOMEDS_UseCaseBuilder_i

Browse Source
This commit is contained in:
eap 2013-08-28 12:10:59 +00:00
parent 6428930b1f
commit bbcc474cc2
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -260,22 +260,25 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy,
const bool theSelectable = true) const bool theSelectable = true)
{ {
SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR ); SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR );
SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
SALOMEDS::UseCaseBuilder_var useCaseBuilder = theStudy->GetUseCaseBuilder(); SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
SALOMEDS::SObject_wrap objAfter; SALOMEDS::SObject_wrap objAfter;
if ( SO->_is_nil() ) { if ( SO->_is_nil() )
{
if ( theTag == 0 ) { if ( theTag == 0 ) {
SO = aStudyBuilder->NewObject( theFatherObject ); SO = aStudyBuilder->NewObject( theFatherObject );
} else if ( !theFatherObject->FindSubObject( theTag, SO.inout() )) { }
else if ( !theFatherObject->FindSubObject( theTag, SO.inout() ))
{
SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag ); SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag );
// define the next tag after given one in the data tree to insert SOobject // define the next tag after given one in the data tree to insert SObject
std::string anEntry; std::string anEntry;
int last2Pnt_pos = -1; int last2Pnt_pos = -1;
int tagAfter = -1; int tagAfter = -1;
CORBA::String_var entry; CORBA::String_var entry;
SALOMEDS::SObject_wrap curObj; SALOMEDS::SObject_wrap curObj;
SALOMEDS::UseCaseIterator_var anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject); SALOMEDS::UseCaseIterator_wrap anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject);
for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) { for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) {
curObj = anUseCaseIter->Value(); curObj = anUseCaseIter->Value();
entry = curObj->GetID(); entry = curObj->GetID();
@ -413,7 +416,8 @@ static void addReference (SALOMEDS::Study_ptr theStudy,
aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
// add reference to the use case tree // add reference to the use case tree
// (to support tree representation customization and drag-n-drop) // (to support tree representation customization and drag-n-drop)
theStudy->GetUseCaseBuilder()->AppendTo( aReferenceSO->GetFather(), aReferenceSO ); SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
useCaseBuilder->AppendTo( aReferenceSO->GetFather(), aReferenceSO );
} }
} }
@ -478,8 +482,8 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt
return SALOMEDS::SComponent::_nil(); return SALOMEDS::SComponent::_nil();
if(MYDEBUG) MESSAGE("PublishComponent"); if(MYDEBUG) MESSAGE("PublishComponent");
SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
SALOMEDS::UseCaseBuilder_var useCaseBuilder = theStudy->GetUseCaseBuilder(); SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
CORBA::String_var compDataType = ComponentDataType(); CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() ); SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() );