From: ana Date: Tue, 6 Mar 2012 15:16:18 +0000 (+0000) Subject: Fix for the bug IPAL22807:"TC6.4.0: input objects are not highlighted in 3D viewer" X-Git-Tag: V6_5_0a1~41 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c6fb7e57b2d7a0265df2fa9f97a763066b3c0155;p=modules%2Fgeom.git Fix for the bug IPAL22807:"TC6.4.0: input objects are not highlighted in 3D viewer" --- diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index 207a66339..6bbc7b0f4 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -251,24 +251,24 @@ void PrimitiveGUI_BoxDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( aSelectedObject.get() ); myEditCurrentArgument->setText(aName); - - // clear selection - disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); - myGeomGUI->getApp()->selectionMgr()->clearSelected(); - connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); - + if (myEditCurrentArgument == GroupPoints->LineEdit1) { myPoint1 = aSelectedObject; if (myPoint1 && !myPoint2) - GroupPoints->PushButton2->click(); + GroupPoints->PushButton2->click(); } else if (myEditCurrentArgument == GroupPoints->LineEdit2) { myPoint2 = aSelectedObject; if (myPoint2 && !myPoint1) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); + } + if ((myPoint1 && !myPoint2) || (myPoint2 && !myPoint1)) { + // clear selection + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + myGeomGUI->getApp()->selectionMgr()->clearSelected(); + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); } - } displayPreview(true); }