Adjust to HEAD modifications

src/SMESHGUI/SMESHGUI_Selection.cxx

@@ -49,23 +49,25 @@ void SMESHGUI_Selection::init( const QString& client, SalomeApp_SelectionMgr* mg
   {
     _PTR(Study) aStudy = study()->studyDS();
 
-    SUIT_DataOwnerPtrList sel;
+    for( int i=0, n=count(); i<n; i++ )
-    mgr->selected( sel, client );
+      myTypes.append( typeName( type( entry( i ), aStudy ) ) );
-    myDataOwners = sel;
-    SUIT_DataOwnerPtrList::const_iterator anIt = sel.begin(),
-                                          aLast = sel.end();
-    for( ; anIt!=aLast; anIt++ )
-    {
-      SUIT_DataOwner* owner = ( SUIT_DataOwner* )( (*anIt ).get() );
-      SalomeApp_DataOwner* sowner = dynamic_cast<SalomeApp_DataOwner*>( owner );
-      if( sowner )
-        myTypes.append( typeName( type( sowner, aStudy ) ) );
-      else
-        myTypes.append( "Unknown" );
-    }
   }
 }
 
+//=======================================================================
+//function : processOwner
+//purpose  : 
+//=======================================================================
+void SMESHGUI_Selection::processOwner( const SalomeApp_DataOwner* ow )
+{
+  const SalomeApp_SVTKDataOwner* owner = 
+    dynamic_cast<const SalomeApp_SVTKDataOwner*> ( ow );
+  if( owner )
+    myActors.append( dynamic_cast<SMESH_Actor*>( owner->GetActor() ) );
+  else
+    myActors.append( 0 );
+}
+
 //=======================================================================
 //function : param
 //purpose  : 
@@ -103,13 +105,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() ) {
+  if( ind >= 0 && ind < count() )
-    const SalomeApp_SVTKDataOwner* owner = 
+    return ((QPtrList<SMESH_Actor>&)myActors).at( ind );
-      dynamic_cast<const SalomeApp_SVTKDataOwner*> ( myDataOwners[ ind ].get() );
+  else
-    if ( owner )    
+    return 0;
-      return dynamic_cast<SMESH_Actor*>( owner->GetActor() );
-  }
-  return 0;
 }
 
 //=======================================================================
@@ -218,6 +217,7 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
     case SMESH_Actor::eMultiConnection:   return "eMultiConnection";
     case SMESH_Actor::eMultiConnection2D: return "eMultiConnection2D";
     case SMESH_Actor::eArea:              return "eArea";
+    case SMESH_Actor::eVolume3D:          return "eVolume3D";
     case SMESH_Actor::eTaper:             return "eTaper";
     case SMESH_Actor::eAspectRatio:       return "eAspectRatio";
     case SMESH_Actor::eAspectRatio3D:     return "eAspectRatio3D";
@@ -239,8 +239,9 @@ int SMESHGUI_Selection::numberOfNodes( int ind ) const
 {
   if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
   {
-    CORBA::Object_var obj =
+    _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).latin1() );
-      SMESH::DataOwnerToObject( static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() ));
+    CORBA::Object_var obj = SMESH::SObjectToObject( sobj, SMESH::GetActiveStudyDocument() );
+
     if ( ! CORBA::is_nil( obj )) {
       SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( obj );
       if ( ! mesh->_is_nil() )
@@ -265,18 +266,19 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
 {
   if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
   {
-    Handle(SALOME_InteractiveObject) io =
+/*    Handle(SALOME_InteractiveObject) io =
       static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->IO();
     if ( !io.IsNull() ) {
       SMESH::SMESH_Mesh_var mesh = SMESH::GetMeshByIO(io) ; // m,sm,gr->m
-      if ( !mesh->_is_nil() ) {
+      if ( !mesh->_is_nil() ) {*/
-        _PTR(SObject) so = SMESH::FindSObject( mesh );
+        _PTR(SObject) so = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ) );
+	//FindSObject( mesh );
         if ( so ) {
           GEOM::GEOM_Object_var shape = SMESH::GetShapeOnMeshOrSubMesh( so );
           return QVariant( !shape->_is_nil(), 0 );
         }
-      }
+//      }
-    }
+//    }
   }
   return QVariant( false, 0 );
 }
@@ -288,16 +290,7 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
 
 QVariant SMESHGUI_Selection::hasReference( int ind ) const
 {
-  if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
+  return QVariant( isReference( ind ), 0 );
-  {
-    SalomeApp_DataOwner* owner = dynamic_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].operator->() );
-    if( owner )
-    {
-      _PTR(SObject) obj ( study()->studyDS()->FindObjectID( owner->entry().latin1() ) ), ref;
-      return QVariant( obj->ReferencedObject( ref ), 0 );
-    }
-  }
-  return QVariant( false, 0 );
 }
 
 //=======================================================================
@@ -309,8 +302,8 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
 {
   if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
   {
-    QString entry = static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->entry();
+    QString ent = entry( ind );
-    SMESH_Actor* actor = SMESH::FindActorByEntry( entry.latin1() );
+    SMESH_Actor* actor = SMESH::FindActorByEntry( ent.latin1() );
     if ( actor && actor->hasIO() ) {
       if(SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView())
 	return QVariant( aViewWindow->isVisible( actor->getIO() ), 0 );
@@ -319,16 +312,6 @@ 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  :