From c990c891226c83319eb2b921c9888ed942d1c1e3 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 1 Jun 2005 04:46:34 +0000 Subject: [PATCH] To adjust to new SalomeApp_DataOwner, which now holds SALOME_InteractiveObject --- src/SalomeApp/SalomeApp_SelectionMgr.cxx | 60 +----------------------- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/src/SalomeApp/SalomeApp_SelectionMgr.cxx b/src/SalomeApp/SalomeApp_SelectionMgr.cxx index 49a5b1584..aa2309818 100644 --- a/src/SalomeApp/SalomeApp_SelectionMgr.cxx +++ b/src/SalomeApp/SalomeApp_SelectionMgr.cxx @@ -40,17 +40,6 @@ void SalomeApp_SelectionMgr::selectedObjects( SALOME_ListIO& lst ) const { lst.Clear(); - if ( !application() ) - return; - - SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if ( !appStudy ) - return; - - _PTR(Study) aStudy ( appStudy->studyDS() ); - if ( !aStudy ) - return; - SUIT_DataOwnerPtrList aList; selected( aList ); @@ -59,63 +48,18 @@ void SalomeApp_SelectionMgr::selectedObjects( SALOME_ListIO& lst ) const const SalomeApp_DataOwner* owner = dynamic_cast( (*itr).operator->() ); if( owner ) lst.Append( owner->IO() ); -/* - - if ( owner && dynamic_cast( owner ) ) - { //get only subowners, insert into lst unique subowners (subowners with different entries) - if ( !anEntryList.contains( owner->entry() ) ) - { - anEntryList.append( owner->entry() ); - - //construct SALOME_InteractiveObject with predefined entry - _PTR(SObject) anObj ( aStudy->FindObjectID( owner->entry().latin1() ) ); - if ( anObj ) - { - _PTR(SComponent) aFC (anObj->GetFatherComponent()); - if ( aFC ) - { - anIO = new SALOME_InteractiveObject( anObj->GetID().c_str(), aFC->ComponentDataType().c_str(), anObj->GetName().c_str() ); - if ( anIO ) lst.Append( anIO ); - } - } - } - } - else if ( owner ) - { //get not subowners data owners - _PTR(SObject) anObj ( aStudy->FindObjectID( owner->entry().latin1() ) ); - if ( anObj ) - { - _PTR(SComponent) aFC (anObj->GetFatherComponent()); - if ( aFC ) - { - anIO = new SALOME_InteractiveObject( anObj->GetID().c_str(), aFC->ComponentDataType().c_str(), anObj->GetName().c_str() ); - if ( anIO ) lst.Append( anIO ); - } - } - } -*/ } } void SalomeApp_SelectionMgr::setSelectedObjects( const SALOME_ListIO& lst, const bool append ) { - if ( !application() ) - return; - - SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if ( !appStudy ) - return; - - _PTR(Study) aStudy ( appStudy->studyDS() ); - if ( !aStudy ) - return; - SUIT_DataOwnerPtrList owners; for ( SALOME_ListIteratorOfListIO it( lst ); it.More(); it.Next() ) { if ( it.Value()->hasEntry() ) - owners.append( new SalomeApp_DataOwner( it.Value()->getEntry() ) ); + owners.append( new SalomeApp_DataOwner( it.Value() ) ); } + setSelected( owners, append ); } -- 2.39.2