From: mpa <mpa@opencascade.com>
Date: Fri, 25 Apr 2014 06:52:26 +0000 (+0400)
Subject: 0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge... 
X-Git-Tag: V7_4_0rc1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1176e29a2cdc54f8fc8971ee5c02539fb4cbdb1d;p=modules%2Fsmesh.git

0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge nodes" in manual mode
---

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index f5b7754c2..99c7d49ed 100644
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@ -682,6 +682,8 @@ bool SMESHGUI_MergeDlg::ClickOnApply()
   
   ListCoincident->clear();
   
+  myEditCurrentArgument = (QWidget*)LineEditMesh;
+
   SMESH::UpdateView();
   SMESHGUI::Modified();
   
@@ -1139,7 +1141,7 @@ void SMESHGUI_MergeDlg::SelectionIntoArgument()
     if (!myActor)
       myActor = SMESH::FindActorByObject(myMesh);
     
-    if ( myActor && myTypeId ==1 ) {
+    if ( myActor && myTypeId == 1 && mySelector->IsSelectionEnabled() ) {
       mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
       mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);