X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCSelector.cxx;h=a3582ed2592ab000bb047701059c36a1a0c419d2;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=3abc6754e1b23a83c62d5cc3108eaac288a347d0;hpb=84f8b4a57d3cdad820bc1333a5066699cd1c8ae3;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx index 3abc6754..a3582ed2 100644 --- a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx +++ b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx @@ -49,12 +49,16 @@ void HYDROGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const if ( !aViewer ) return; + Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); + bool isLocalContext = aContext->HasOpenedContext(); + AIS_ListOfInteractive aSelList; aViewer->getSelectedObjects( aSelList ); for ( AIS_ListIteratorOfListOfInteractive anIt( aSelList ); anIt.More(); anIt.Next() ) if ( !anIt.Value().IsNull() ) { - aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( entry( anIt.Value() ) ) ) ); + if ( !isLocalContext ) + aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( entry( anIt.Value() ) ) ) ); } // add externally selected objects SUIT_DataOwnerPtrList::const_iterator anExtIter; @@ -63,6 +67,20 @@ void HYDROGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const } } +void HYDROGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) +{ + OCCViewer_Viewer* aViewer = viewer(); + if ( !aViewer ) + return; + + Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext(); + if ( aContext->HasOpenedContext() ) { + return; + } + + LightApp_OCCSelector::setSelection( aList ); +} + QString HYDROGUI_OCCSelector::entry( const Handle(AIS_InteractiveObject)& anAIS ) const { QString aRes;