From ee4749bf4c09bcdf042d119912d8db447ece5a26 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 22 Oct 2014 16:15:00 +0400 Subject: [PATCH] 52539: TC7.5.0: Smoothing - impossible to select fixed nodes --- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 5 ++++- src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 7 ++++--- src/SMESH_SWIG/smeshBuilder.py | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index bed7c25fd..b54df5d96 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -387,8 +387,11 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const compSub, compSub->GetShapeType() ); geomGen->RemoveObject( compSub ); - if ( shared->length() > 0 ) + compSub->UnRegister(); + if ( shared->length() > 0 ) { geomGen->RemoveObject( shared[0] ); + shared[0]->UnRegister(); + } return ( shared->length() > 0 ); } } diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx index 7e1d8d051..6fcc47a41 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx @@ -596,20 +596,21 @@ void SMESHGUI_SmoothingDlg::SelectionIntoArgument() if (myNbOkElements < 1) return; - + QStringList elements; for ( int i = 0; i < myNbOkElements; ++i ) elements << QString::number( aMapIndex( i+1 ) ); aString = elements.join(" "); } - } else if (myEditCurrentArgument == LineEditNodes && !myMesh->_is_nil() && myIO == IO ) { + } else if (myEditCurrentArgument == LineEditNodes && !myMesh->_is_nil() && myIO->isSame(IO) ) + { myNbOkNodes = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString); } myEditCurrentArgument->setText(aString); myEditCurrentArgument->repaint(); myEditCurrentArgument->setEnabled(false); // to update lineedit IPAL 19809 - myEditCurrentArgument->setEnabled(true); + myEditCurrentArgument->setEnabled(true); if (myNbOkElements && (myNbOkNodes || LineEditNodes->text().trimmed().isEmpty())) { buttonOk->setEnabled(true); diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index 61c239b15..77481578f 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -3456,7 +3456,7 @@ class Mesh: ## # @brief Creates missing boundary elements around either the whole mesh or - # groups of 2D elements + # groups of elements # @param dimension - defines type of boundary elements to create # @param groupName - a name of group to store all boundary elements in, # "" means not to create the group @@ -3464,7 +3464,7 @@ class Mesh: # mesh + created boundary elements; "" means not to create the new mesh # @param toCopyAll - if true, the whole initial mesh will be copied into # the new mesh else only boundary elements will be copied into the new mesh - # @param groups - groups of 2D elements to make boundary around + # @param groups - groups of elements to make boundary around # @retval tuple( long, mesh, groups ) # long - number of added boundary elements # mesh - the mesh where elements were added to -- 2.30.2