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

0022756: [EDF] Intersection operation

Browse Source 
Fix a bug with improper selection processing
This commit is contained in:
vsr 2014-12-23 18:46:41 +03:00
parent 045908212e
commit 404066ead7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -187,7 +187,7 @@ void BooleanGUI_Dialog::Init()
} }
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()), Qt::UniqueConnection);
initName(mainFrame()->GroupConstructors->title()); initName(mainFrame()->GroupConstructors->title());
@ -204,7 +204,6 @@ void BooleanGUI_Dialog::Init()
localSelection(GEOM::GEOM_Object::_nil(), needTypes ); localSelection(GEOM::GEOM_Object::_nil(), needTypes );
myGroup->PushButton1->click(); myGroup->PushButton1->click();
SelectionIntoArgument();
resize(100,100); resize(100,100);
} }
@ -261,7 +260,7 @@ void BooleanGUI_Dialog::singleSelection()
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
myGeomGUI->getApp()->selectionMgr()->clearSelected(); myGeomGUI->getApp()->selectionMgr()->clearSelected();
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
this, SLOT(SelectionIntoArgument())); this, SLOT(SelectionIntoArgument()), Qt::UniqueConnection);
if (myEditCurrentArgument == myGroup->LineEdit1) { if (myEditCurrentArgument == myGroup->LineEdit1) {
myObject1 = aSelectedObject; myObject1 = aSelectedObject;
@ -269,6 +268,7 @@ void BooleanGUI_Dialog::singleSelection()
myGroup->PushButton2->click(); myGroup->PushButton2->click();
} }
else if (myEditCurrentArgument == myGroup->LineEdit2) { else if (myEditCurrentArgument == myGroup->LineEdit2) {
myObjects.clear();
myObjects << aSelectedObject; myObjects << aSelectedObject;
if (!myObject1) if (!myObject1)
myGroup->PushButton1->click(); myGroup->PushButton1->click();
@ -364,7 +364,7 @@ void BooleanGUI_Dialog::ActivateThisDialog()
GEOMBase_Skeleton::ActivateThisDialog(); GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
this, SLOT( SelectionIntoArgument() ) ); this, SLOT( SelectionIntoArgument() ), Qt::UniqueConnection );
processPreview(); processPreview();
} }