X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBooleanGUI%2FBooleanGUI_Dialog.cxx;h=36575066affb2bb8aec362aa4699d9c9fe8e28de;hb=ccaa4673b9493057cce545295f1d9023024eb72d;hp=85e1f19902c4a0b7eb08b2f5041040dd25bd91ad;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx index 85e1f1990..36575066a 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.cxx +++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // GEOM GEOMGUI : GUI for Geometry component // File : BooleanGUI_Dialog.cxx // Author : Lucien PIGNOLONI, Open CASCADE S.A.S. @@ -161,6 +162,7 @@ void BooleanGUI_Dialog::Init() myGroup->PushButton1->click(); SelectionIntoArgument(); + resize(100,100); } //================================================================================= @@ -282,7 +284,7 @@ void BooleanGUI_Dialog::ActivateThisDialog() GEOMBase_Skeleton::ActivateThisDialog(); connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), - this, SLOT( SelectionIntoArgument() ) ); + this, SLOT( SelectionIntoArgument() ) ); displayPreview(); } @@ -328,8 +330,8 @@ bool BooleanGUI_Dialog::execute (ObjectList& objects) { GEOM::GEOM_Object_var anObj; - anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())-> - MakeBoolean(myObject1, myObject2, myOperation); + GEOM::GEOM_IBooleanOperations_var anOper = GEOM::GEOM_IBooleanOperations::_narrow(getOperation()); + anObj = anOper->MakeBoolean(myObject1, myObject2, myOperation); if (!anObj->_is_nil()) objects.push_back(anObj._retn()); @@ -347,6 +349,7 @@ void BooleanGUI_Dialog::restoreSubShapes (SALOMEDS::Study_ptr theStudy, // empty list of arguments means that all arguments should be restored getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(), /*theFindMethod=*/GEOM::FSM_GetInPlace, // ? GEOM::FSM_GetSame - /*theInheritFirstArg=*/myOperation == BooleanGUI::CUT); // ? false + /*theInheritFirstArg=*/myOperation == BooleanGUI::CUT, + mainFrame()->CheckBoxAddPrefix->isChecked()); // ? false } }