Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mantis issue 0020894: EDF 1421 GEOM: Partition Bug with big geometrical objects....
[modules/geom.git]
/
src
/
BooleanGUI
/
BooleanGUI_Dialog.cxx
diff --git
a/src/BooleanGUI/BooleanGUI_Dialog.cxx
b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 7b1e3df5a01ac59c2125bb47baaf2d248364a406..36575066affb2bb8aec362aa4699d9c9fe8e28de 100644
(file)
--- a/
src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/
src/BooleanGUI/BooleanGUI_Dialog.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
//
// 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
//
//
// 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.
// GEOM GEOMGUI : GUI for Geometry component
// File : BooleanGUI_Dialog.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@
-283,7
+284,7
@@
void BooleanGUI_Dialog::ActivateThisDialog()
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
- this, SLOT( SelectionIntoArgument() ) );
+
this, SLOT( SelectionIntoArgument() ) );
displayPreview();
}
displayPreview();
}
@@
-329,8
+330,8
@@
bool BooleanGUI_Dialog::execute (ObjectList& objects)
{
GEOM::GEOM_Object_var anObj;
{
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());
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
@@
-348,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
// 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
}
}
}
}