Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6428930
)
fix leaks of SALOMEDS_UseCaseBuilder_i
author
eap
<eap@opencascade.com>
Wed, 28 Aug 2013 12:10:59 +0000
(12:10 +0000)
committer
eap
<eap@opencascade.com>
Wed, 28 Aug 2013 12:10:59 +0000
(12:10 +0000)
src/SMESH_I/SMESH_Gen_i_1.cxx
patch
|
blob
|
history
diff --git
a/src/SMESH_I/SMESH_Gen_i_1.cxx
b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 9cf0613dff73f59633c48f1550da87b1aeaf2ed7..2dc8b31bbea2c7c8902fb5c69e48a96c503e12b5 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/
src/SMESH_I/SMESH_Gen_i_1.cxx
@@
-260,22
+260,25
@@
static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy,
const bool theSelectable = true)
{
SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR );
const bool theSelectable = true)
{
SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR );
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
- SALOMEDS::UseCaseBuilder_
var
useCaseBuilder = theStudy->GetUseCaseBuilder();
+ SALOMEDS::StudyBuilder_var
aStudyBuilder = theStudy->NewBuilder();
+ 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 ) {
SO = aStudyBuilder->NewObject( theFatherObject );
if ( theTag == 0 ) {
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 SO
o
bject
+ // define the next tag after given one in the data tree to insert SObject
std::string anEntry;
int last2Pnt_pos = -1;
int tagAfter = -1;
CORBA::String_var entry;
SALOMEDS::SObject_wrap curObj;
std::string anEntry;
int last2Pnt_pos = -1;
int tagAfter = -1;
CORBA::String_var entry;
SALOMEDS::SObject_wrap curObj;
- SALOMEDS::UseCaseIterator_
var
anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject);
+ SALOMEDS::UseCaseIterator_
wrap
anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject);
for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) {
curObj = anUseCaseIter->Value();
entry = curObj->GetID();
for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) {
curObj = anUseCaseIter->Value();
entry = curObj->GetID();
@@
-413,7
+416,8
@@
static void addReference (SALOMEDS::Study_ptr theStudy,
aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
// add reference to the use case tree
// (to support tree representation customization and drag-n-drop)
aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
// add reference to the use case tree
// (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();
if(MYDEBUG) MESSAGE("PublishComponent");
return SALOMEDS::SComponent::_nil();
if(MYDEBUG) MESSAGE("PublishComponent");
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
- SALOMEDS::UseCaseBuilder_
var
useCaseBuilder = theStudy->GetUseCaseBuilder();
+ SALOMEDS::StudyBuilder_var
aStudyBuilder = theStudy->NewBuilder();
+ SALOMEDS::UseCaseBuilder_
wrap
useCaseBuilder = theStudy->GetUseCaseBuilder();
CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() );
CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() );