From 656c73ce33943675389576c4b17446b18d530e1e Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 17 Jun 2005 04:57:03 +0000 Subject: [PATCH] Bug 9193: Only nodes mode in "Display mode" popup in SMESH --- src/SMESHGUI/SMESHGUI.cxx | 2 +- src/SMESHGUI/SMESHGUI_Selection.cxx | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index e3d8df787..1688eb8bd 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -2856,7 +2856,7 @@ void SMESHGUI::initialize( CAM_Application* app ) QString aSelCount = QString( "%1 = 1" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); QString lc = QtxPopupMgr::Selection::defEquality(); - QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer' 'ObjectBrowser'" ); + QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" ); QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() ).arg( mesh_group ); QString aMeshInVTK = aClient + "&&" + aType;// + "&&" + aSelCount; diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx index 2a763c298..a77ff9a40 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.cxx +++ b/src/SMESHGUI/SMESHGUI_Selection.cxx @@ -100,15 +100,10 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const SMESH_Actor* SMESHGUI_Selection::getActor( int ind ) const { if ( ind >= 0 && ind < myDataOwners.count() ) { - const SalomeApp_DataOwner* owner = - dynamic_cast ( myDataOwners[ ind ].get() ); - if ( owner ) - { - Handle( SALOME_InteractiveObject ) anObj = owner->IO(); - QString entry = anObj->getEntry(); - return dynamic_cast( SMESH::FindActorByEntry( entry ) ); - } - //return dynamic_cast( owner->GetActor() ); + const SalomeApp_SVTKDataOwner* owner = + dynamic_cast ( myDataOwners[ ind ].get() ); + if ( owner ) + return dynamic_cast( owner->GetActor() ); } return 0; }