X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddMeshElementDlg.cxx;h=263758674743da0150dcd5bab341b388efbd2d5e;hp=a15542896d3dc1096a00767baafa98bea2f529b3;hb=0e020f2e93a8acfb51faccf221116530c23871ad;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80 diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx index a15542896..263758674 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx @@ -268,8 +268,8 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule, QString caption = tr(QString("SMESH_ADD_%1_TITLE").arg(elemName)); QString grBoxTitle = tr(QString("SMESH_ADD_%1").arg(elemName)); - QPixmap image0 (SMESHGUI::resourceMgr()->loadPixmap("SMESH", iconName)); - QPixmap image1 (SMESHGUI::resourceMgr()->loadPixmap("SMESH", tr("ICON_SELECT"))); + QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", iconName)); + QPixmap image1 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT"))); if (!name) setName("SMESHGUI_AddMeshElementDlg"); @@ -524,28 +524,20 @@ void SMESHGUI_AddMeshElementDlg::onTextChange (const QString& theNewText) aMesh = myActor->GetObject()->GetMesh(); if (aMesh) { - SALOME_ListIO aList; aList.Append( myActor->getIO() ); - mySelectionMgr->setSelectedObjects( aList, false ); - - TColStd_IndexedMapOfInteger selectedIndices; TColStd_MapOfInteger newIndices; - mySelector->GetIndex(myActor->getIO(), selectedIndices); - + QStringList aListId = QStringList::split(" ", theNewText, false); for (int i = 0; i < aListId.count(); i++) { if( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) ) { - if( selectedIndices.Add( n->GetID() ) ) - newIndices.Add( n->GetID() ); + newIndices.Add( n->GetID() ); myNbOkNodes++; } } - if( newIndices.Extent()>0 ) - { - mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, true ); - myViewWindow->highlight( myActor->getIO(), true, true ); - } + mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, false ); + myViewWindow->highlight( myActor->getIO(), true, true ); + bool aNodesOK = false; if (myIsPoly && myElementType == SMDSAbs_Face && aListId.count() >=3 ){ myNbOkNodes = aListId.count();