X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESHGUI%2FSMESHGUI_SmoothingDlg.cxx;h=d752a128aa14b55783e5f57f20407b43f4966511;hb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e;hp=bf7057ddccf29e0fd52ddeceb213b622112f62e6;hpb=5c19bc1e1684ec6a466423361949ed7b60556968;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx index bf7057ddc..d752a128a 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx @@ -406,10 +406,11 @@ bool SMESHGUI_SmoothingDlg::ClickOnApply() if (aResult) { SMESH::Update(myIO, SMESH::eDisplay); + SMESH::RepaintCurrentView(); SMESHGUI::Modified(); - Init(); + //Init(); - mySelectedObject = SMESH::SMESH_IDSource::_nil(); + //mySelectedObject = SMESH::SMESH_IDSource::_nil(); } } @@ -560,7 +561,7 @@ void SMESHGUI_SmoothingDlg::onTextChange (const QString& theNewText) //================================================================================= // function : SelectionIntoArgument() -// purpose : Called when selection as changed or other case +// purpose : Called when selection has changed or other cases //================================================================================= void SMESHGUI_SmoothingDlg::SelectionIntoArgument() { @@ -594,44 +595,44 @@ void SMESHGUI_SmoothingDlg::SelectionIntoArgument() SALOME_ListIO aList; mySelectionMgr->selectedObjects(aList); int nbSel = aList.Extent(); - if (nbSel != 1) - return; - - Handle(SALOME_InteractiveObject) IO = aList.First(); - - if (myEditCurrentArgument == LineEditElements) { - myMesh = SMESH::GetMeshByIO(IO); - if (myMesh->_is_nil()) - return; - myIO = IO; - myActor = SMESH::FindActorByObject(myMesh); - - if (CheckBoxMesh->isChecked()) { - SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString); + if (nbSel == 1) + { + Handle(SALOME_InteractiveObject) IO = aList.First(); - SMESH::SMESH_IDSource_var obj = SMESH::IObjectToInterface( myIO ); - if ( !CORBA::is_nil( obj ) ) - mySelectedObject = obj; - else + if (myEditCurrentArgument == LineEditElements) { + myMesh = SMESH::GetMeshByIO(IO); + if (myMesh->_is_nil()) return; - myNbOkElements = true; - } else { - // get indices of selected elements - TColStd_IndexedMapOfInteger aMapIndex; - mySelector->GetIndex(IO,aMapIndex); - myNbOkElements = aMapIndex.Extent(); + myIO = IO; + myActor = SMESH::FindActorByObject(myMesh); - if (myNbOkElements < 1) - return; + if (CheckBoxMesh->isChecked()) { + SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString); - QStringList elements; - for ( int i = 0; i < myNbOkElements; ++i ) - elements << QString::number( aMapIndex( i+1 ) ); - aString = elements.join(" "); + SMESH::SMESH_IDSource_var obj = SMESH::IObjectToInterface( myIO ); + if ( !CORBA::is_nil( obj ) ) + mySelectedObject = obj; + else + return; + myNbOkElements = true; + } else { + // get indices of selected elements + TColStd_IndexedMapOfInteger aMapIndex; + mySelector->GetIndex(IO,aMapIndex); + myNbOkElements = aMapIndex.Extent(); + + 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->isSame(IO) ) + { + myNbOkNodes = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString); } - } else if (myEditCurrentArgument == LineEditNodes && !myMesh->_is_nil() && myIO->isSame(IO) ) - { - myNbOkNodes = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString); } myEditCurrentArgument->setText(aString);