ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-22 02:35:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaks

Browse Source
This commit is contained in:
vsr 2009-09-21 12:21:38 +00:00
parent 7b409949c0
commit ba2aa33a1e
6 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

@ -477,11 +477,12 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
switch (getConstructorId()) { switch (getConstructorId()) {
case 0: case 0:
if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) { if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeHexa2Faces(myFace1, myFace2);
MakeHexa2Faces(myFace1, myFace2);
res = true; res = true;
} }
break; break;
@ -489,8 +490,7 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) && if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) &&
!CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) && !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
!CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) { !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
res = true; res = true;
} }
break; break;

23
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -332,11 +332,11 @@ void BlocksGUI_ExplodeDlg::updateButtonState()
myGrp1->TextBrowser1->setText( "" ); myGrp1->TextBrowser1->setText( "" );
} }
else { else {
bool isOnlyBlocks = GEOM::GEOM_IBlocksOperations::_narrow GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
( getOperation() )->IsCompoundOfBlocks( myObject, bool isOnlyBlocks = anOper->IsCompoundOfBlocks( myObject,
myGrp1->SpinBox1->value(), myGrp1->SpinBox1->value(),
myGrp1->SpinBox2->value(), myGrp1->SpinBox2->value(),
myNbBlocks ); myNbBlocks );
if ( isOnlyBlocks ) if ( isOnlyBlocks )
myGrp1->TextBrowser1->setText( tr( "GEOM_NB_BLOCKS_NO_OTHERS" ).arg( myNbBlocks ) ); myGrp1->TextBrowser1->setText( tr( "GEOM_NB_BLOCKS_NO_OTHERS" ).arg( myNbBlocks ) );
else else
@ -401,12 +401,13 @@ bool BlocksGUI_ExplodeDlg::execute( ObjectList& objects )
{ {
GEOM::ListOfGO_var aList; GEOM::ListOfGO_var aList;
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
switch ( getConstructorId() ) { switch ( getConstructorId() ) {
case 0: case 0:
aList = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->ExplodeCompoundOfBlocks aList = anOper->ExplodeCompoundOfBlocks( myObject,
( myObject, myGrp1->SpinBox1->value(),
myGrp1->SpinBox1->value(), myGrp1->SpinBox2->value() );
myGrp1->SpinBox2->value() );
break; break;
} }
@ -452,7 +453,7 @@ bool BlocksGUI_ExplodeDlg::execute( ObjectList& objects )
if ( selected.contains( QString( objStr.in() ) ) ) if ( selected.contains( QString( objStr.in() ) ) )
{ {
if ( !IsPreview() ) if ( !IsPreview() )
(*anIter)->SetParameters(GeometryGUI::JoinObjectParameters(aParameters)); (*anIter)->SetParameters(aParameters.join(":").toLatin1().constData());
objects.push_back( *anIter ); objects.push_back( *anIter );
} }
else else
@ -472,7 +473,7 @@ bool BlocksGUI_ExplodeDlg::execute( ObjectList& objects )
{ {
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate( aList[i] ); GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate( aList[i] );
if ( !IsPreview() ) if ( !IsPreview() )
anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters)); anObj->SetParameters(aParameters.join(":").toLatin1().constData());
objects.push_back( anObj._retn() ); objects.push_back( anObj._retn() );
} }
} }

3
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
View File

@ -239,7 +239,8 @@ bool BlocksGUI_PropagateDlg::isValid( QString& )
//================================================================================= //=================================================================================
bool BlocksGUI_PropagateDlg::execute( ObjectList& objects ) bool BlocksGUI_PropagateDlg::execute( ObjectList& objects )
{ {
GEOM::ListOfGO_var aList = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->Propagate( myObject ); GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
GEOM::ListOfGO_var aList = anOper->Propagate( myObject );
mainFrame()->ResultName->setText( "" ); mainFrame()->ResultName->setText( "" );
if ( !aList->length() ) if ( !aList->length() )

11
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
View File

@ -532,20 +532,19 @@ bool BlocksGUI_QuadFaceDlg::execute (ObjectList& objects)
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
switch (getConstructorId()) { switch (getConstructorId()) {
case 0: case 0:
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeQuad4Vertices(myShape1, myShape2, myShape3, myShape4);
MakeQuad4Vertices(myShape1, myShape2, myShape3, myShape4);
res = true; res = true;
break; break;
case 1: case 1:
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeQuad2Edges(myShape1, myShape2);
MakeQuad2Edges(myShape1, myShape2);
res = true; res = true;
break; break;
case 2: case 2:
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeQuad(myShape1, myShape2, myShape3, myShape4);
MakeQuad(myShape1, myShape2, myShape3, myShape4);
res = true; res = true;
break; break;
default: default:

24
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

@ -576,28 +576,28 @@ bool BlocksGUI_TrsfDlg::execute (ObjectList& objects)
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
switch (getConstructorId()) { switch (getConstructorId()) {
case 0: case 0:
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeMultiTransformation1D(myShape,
MakeMultiTransformation1D(myShape, myFaces[Face1], myFaces[Face2],
myFaces[Face1], myFaces[Face2], mySpinBox[SpinBox1]->value());
mySpinBox[SpinBox1]->value());
if (!anObj->_is_nil() && !IsPreview()) if (!anObj->_is_nil() && !IsPreview())
{ {
QStringList aParameters; QStringList aParameters;
aParameters << "" << ""; aParameters << "" << "";
aParameters << mySpinBox[SpinBox1]->text(); aParameters << mySpinBox[SpinBox1]->text();
anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters)); anObj->SetParameters(aParameters.join(":").toLatin1().constData());
} }
res = true; res = true;
break; break;
case 1: case 1:
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())-> anObj = anOper->MakeMultiTransformation2D (myShape,
MakeMultiTransformation2D (myShape, myFaces[Face1U], myFaces[Face2U],
myFaces[Face1U], myFaces[Face2U], mySpinBox[SpinBox2U]->value(),
mySpinBox[SpinBox2U]->value(), myFaces[Face1V], myFaces[Face2V],
myFaces[Face1V], myFaces[Face2V], mySpinBox[SpinBox2V]->value());
mySpinBox[SpinBox2V]->value());
if (!anObj->_is_nil() && !IsPreview()) if (!anObj->_is_nil() && !IsPreview())
{ {
QStringList aParameters; QStringList aParameters;
@ -605,7 +605,7 @@ bool BlocksGUI_TrsfDlg::execute (ObjectList& objects)
aParameters << mySpinBox[SpinBox2U]->text(); aParameters << mySpinBox[SpinBox2U]->text();
aParameters << "" << ""; aParameters << "" << "";
aParameters << mySpinBox[SpinBox2V]->text(); aParameters << mySpinBox[SpinBox2V]->text();
anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters)); anObj->SetParameters(aParameters.join(":").toLatin1().constData());
} }
res = true; res = true;
break; break;

4
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -329,8 +329,8 @@ bool BooleanGUI_Dialog::execute (ObjectList& objects)
{ {
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())-> GEOM::GEOM_IBooleanOperations_var anOper = GEOM::GEOM_IBooleanOperations::_narrow(getOperation());
MakeBoolean(myObject1, myObject2, myOperation); anObj = anOper->MakeBoolean(myObject1, myObject2, myOperation);
if (!anObj->_is_nil()) if (!anObj->_is_nil())
objects.push_back(anObj._retn()); objects.push_back(anObj._retn());