X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Selection.cxx;h=912d1a0d44426be93faacf7693cc7aa6b6c4ff2c;hb=617b2a610680aad0c1caa7801e83b1b42055da54;hp=73f961bea2a502751e214d4508c8528037e4efcf;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 73f961bea..912d1a0d4 100644
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -24,18 +24,30 @@
 //function : SMESHGUI_Selection
 //purpose  : 
 //=======================================================================
+SMESHGUI_Selection::SMESHGUI_Selection()
+: SalomeApp_Selection()
+{
+}
+
+//=======================================================================
+//function : ~SMESHGUI_Selection
+//purpose  : 
+//=======================================================================
+SMESHGUI_Selection::~SMESHGUI_Selection()
+{
+}
 
-SMESHGUI_Selection::SMESHGUI_Selection( const QString&          client,
-                                        SalomeApp_SelectionMgr* mgr )
+//=======================================================================
+//function : init
+//purpose  : 
+//=======================================================================
+void SMESHGUI_Selection::init( const QString& client, SalomeApp_SelectionMgr* mgr )
 {
-  myPopupClient = client;
-  
-  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
-    (SUIT_Session::session()->activeApplication()->activeStudy());
+  SalomeApp_Selection::init( client, mgr );
 
-  if( mgr && appStudy )
+  if( mgr && study() )
   {
-    _PTR(Study) study = appStudy->studyDS();
+    _PTR(Study) aStudy = study()->studyDS();
 
     SUIT_DataOwnerPtrList sel;
     mgr->selected( sel, client );
@@ -47,36 +59,21 @@ SMESHGUI_Selection::SMESHGUI_Selection( const QString&          client,
       SUIT_DataOwner* owner = ( SUIT_DataOwner* )( (*anIt ).get() );
       SalomeApp_DataOwner* sowner = dynamic_cast<SalomeApp_DataOwner*>( owner );
       if( sowner )
-        myTypes.append( typeName( type( sowner, study ) ) );
+        myTypes.append( typeName( type( sowner, aStudy ) ) );
       else
         myTypes.append( "Unknown" );
     }
   }
 }
 
-SMESHGUI_Selection::~SMESHGUI_Selection()
-{
-}
-
-//=======================================================================
-//function : count
-//purpose  : 
-//=======================================================================
-
-int SMESHGUI_Selection::count() const
-{
-  return myTypes.count();
-}
-
 //=======================================================================
 //function : param
 //purpose  : 
 //=======================================================================
-
 QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const
 {
   QtxValue val;
-  if      ( p=="client" )        val = QtxValue( myPopupClient );
+       if ( p=="client" )        val = QtxValue( globalParam( p ) );
   else if ( p=="type" )          val = QtxValue( myTypes[ind] );
   else if ( p=="elemTypes" )     val = QtxValue( elemTypes( ind ) );
   else if ( p=="numberOfNodes" ) val = QtxValue( numberOfNodes( ind ) );
@@ -89,9 +86,9 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const
   else if ( p=="hasReference" )  val = QtxValue( hasReference( ind ) );
   else if ( p=="isVisible" )     val = QtxValue( isVisible( ind ) );
 
-  printf( "--> param() : [%s] = %s (%s)\n", p.latin1(), val.toString().latin1(), val.typeName() );
-  if ( val.type() == QVariant::List )
-    cout << "size: " << val.toList().count() << endl;
+  // printf( "--> param() : [%s] = %s (%s)\n", p.latin1(), val.toString().latin1(), val.typeName() );
+  //if ( val.type() == QVariant::List )
+  //cout << "size: " << val.toList().count() << endl;
   return val;
 }
 
@@ -105,7 +102,7 @@ SMESH_Actor* SMESHGUI_Selection::getActor( int ind ) const
   if ( ind >= 0 && ind < myDataOwners.count() ) {
     const SalomeApp_SVTKDataOwner* owner = 
       dynamic_cast<const SalomeApp_SVTKDataOwner*> ( myDataOwners[ ind ].get() );
-    if ( owner )
+    if ( owner )    
       return dynamic_cast<SMESH_Actor*>( owner->GetActor() );
   }
   return 0;
@@ -316,17 +313,21 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
   return QVariant( false, 0 );
 }
 
+//=======================================================================
+//function : type
+//purpose  :
+//=======================================================================
+int SMESHGUI_Selection::type( SalomeApp_DataOwner* owner, _PTR(Study) study )
+{
+  return type( owner->entry(), study );
+}
 
 //=======================================================================
 //function : type
 //purpose  : 
 //=======================================================================
-
-int SMESHGUI_Selection::type( SalomeApp_DataOwner* owner,
-                              _PTR(Study) study )
+int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
 {
-  QString entry = owner->entry();
-
   _PTR(SObject) obj (study->FindObjectID(entry.latin1()));
   if( !obj )
     return -1;