Bug 9193:

Only nodes mode in "Display mode" popup in SMESH

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index e3d8df78712a71c96f9a8da371ae57cde8fec782..1688eb8bd481694a490cfacc9dfb2e0545f5eeb3 100644 (file)
--- 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 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;
   
   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 2a763c298d2dfea20ad7b6b201b0fb70e03f9270..a77ff9a407146f775b2884cf1da1aa480f7fbb8b 100644 (file)
--- 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() ) {
 SMESH_Actor* SMESHGUI_Selection::getActor( int ind ) const
 {
   if ( ind >= 0 && ind < myDataOwners.count() ) {

-    const SalomeApp_DataOwner* owner = 
-      dynamic_cast<const SalomeApp_DataOwner*> ( myDataOwners[ ind ].get() );
-    if ( owner )
-      {
-       Handle( SALOME_InteractiveObject ) anObj = owner->IO();
-       QString entry = anObj->getEntry();
-       return dynamic_cast<SMESH_Actor*>( SMESH::FindActorByEntry( entry ) );
-      }
-      //return dynamic_cast<SMESH_Actor*>( owner->GetActor() );
+    const SalomeApp_SVTKDataOwner* owner = 
+      dynamic_cast<const SalomeApp_SVTKDataOwner*> ( myDataOwners[ ind ].get() );
+    if ( owner )    
+      return dynamic_cast<SMESH_Actor*>( owner->GetActor() );

   }
   return 0;
 }
   }
   return 0;
 }