From 404066ead7ed09aea895ffc88d67679848c46238 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 23 Dec 2014 18:46:41 +0300 Subject: [PATCH] 0022756: [EDF] Intersection operation Fix a bug with improper selection processing --- src/BooleanGUI/BooleanGUI_Dialog.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx index 9cc8c4a59..377d8af84 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.cxx +++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx @@ -187,7 +187,7 @@ void BooleanGUI_Dialog::Init() } connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()), Qt::UniqueConnection); initName(mainFrame()->GroupConstructors->title()); @@ -204,7 +204,6 @@ void BooleanGUI_Dialog::Init() localSelection(GEOM::GEOM_Object::_nil(), needTypes ); myGroup->PushButton1->click(); - SelectionIntoArgument(); resize(100,100); } @@ -261,7 +260,7 @@ void BooleanGUI_Dialog::singleSelection() disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument()), Qt::UniqueConnection); if (myEditCurrentArgument == myGroup->LineEdit1) { myObject1 = aSelectedObject; @@ -269,6 +268,7 @@ void BooleanGUI_Dialog::singleSelection() myGroup->PushButton2->click(); } else if (myEditCurrentArgument == myGroup->LineEdit2) { + myObjects.clear(); myObjects << aSelectedObject; if (!myObject1) myGroup->PushButton1->click(); @@ -364,7 +364,7 @@ void BooleanGUI_Dialog::ActivateThisDialog() GEOMBase_Skeleton::ActivateThisDialog(); connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), - this, SLOT( SelectionIntoArgument() ) ); + this, SLOT( SelectionIntoArgument() ), Qt::UniqueConnection ); processPreview(); } -- 2.39.2