X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeNodesDlg.cxx;h=d089d8cbd690d64ed7d242303135cadd85d1bb21;hp=e297b635c86841ff6f4d027038bd00db56066004;hb=4ff5bd61540272713e48de1eee75625028c32155;hpb=b33324fe602b1fe1158c14a866c3802df12370fa diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx index e297b635c..d089d8cbd 100644 --- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx @@ -243,6 +243,8 @@ SMESHGUI_MergeNodesDlg::SMESHGUI_MergeNodesDlg( SMESHGUI* theModule, const char* RadioButton1->setChecked(TRUE); + myEditCurrentArgument = (QWidget*)LineEditMesh; + myActor = 0; mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector(); @@ -271,15 +273,14 @@ SMESHGUI_MergeNodesDlg::SMESHGUI_MergeNodesDlg( SMESHGUI* theModule, const char* /* to close dialog if study change */ connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - /* Move widget on the botton right corner of main widget */ - int x, y; - mySMESHGUI->DefineDlgPosition(this, x, y); - this->move(x, y); this->show(); /* displays Dialog */ resize(0,0); buttonOk->setEnabled(false); buttonApply->setEnabled(false); + + // Init Mesh field from selection + SelectionIntoArgument(); } //================================================================================= @@ -330,7 +331,7 @@ bool SMESHGUI_MergeNodesDlg::ClickOnApply() } catch(...) { } - mySelectionMgr->clearSelected(); + //mySelectionMgr->clearSelected(); SMESH::UpdateView(); onDetect(); @@ -354,7 +355,7 @@ void SMESHGUI_MergeNodesDlg::ClickOnOk() void SMESHGUI_MergeNodesDlg::ClickOnCancel() { mySelectionMgr->clearFilters(); - mySelectionMgr->clearSelected(); + //mySelectionMgr->clearSelected(); SMESH::SetPointRepresentation(false); if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) aViewWindow->SetSelectionMode(ActorSelection);