From 31873e6e23a37cffe1914aff593573395504dd13 Mon Sep 17 00:00:00 2001 From: dmv Date: Fri, 18 Dec 2009 13:14:54 +0000 Subject: [PATCH] in frame of 0020622: EDF 1194 SMESH: Merge nodes or elements --- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx index f2e235908..392ae1445 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx @@ -638,13 +638,17 @@ void SMESHGUI_EditMeshDlg::ClickOnOk() void SMESHGUI_EditMeshDlg::ClickOnCancel() { myIdPreview->SetPointsLabeled(false); + SMESH::SetPointRepresentation(false); + disconnect(mySelectionMgr, 0, this, 0); + disconnect(mySMESHGUI, 0, this, 0); + mySMESHGUI->ResetState(); + mySelectionMgr->clearFilters(); //mySelectionMgr->clearSelected(); - SMESH::SetPointRepresentation(false); + if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) aViewWindow->SetSelectionMode(ActorSelection); - disconnect(mySelectionMgr, 0, this, 0); - mySMESHGUI->ResetState(); + reject(); } @@ -862,7 +866,11 @@ void SMESHGUI_EditMeshDlg::onAddGroup() return; QString anIDs = ""; - SMESH::GetNameOfSelectedNodes(mySelector, myActor->getIO(), anIDs); + int aNbElements = 0; + aNbElements = SMESH::GetNameOfSelectedNodes(mySelector, myActor->getIO(), anIDs); + + if (aNbElements < 1) + return; ListCoincident->clearSelection(); ListCoincident->addItem(anIDs); -- 2.39.2