#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_DataObject.h"
+#include "HYDROGUI_DataOwner.h"
#include "HYDROGUI_Module.h"
#include <AIS_ListOfInteractive.hxx>
for ( AIS_ListIteratorOfListOfInteractive anIt( aSelList ); anIt.More(); anIt.Next() )
if ( !anIt.Value().IsNull() )
{
- if ( !isLocalContext )
- aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( entry( anIt.Value() ) ) ) );
+ if ( !isLocalContext ) {
+ QString anEntry = entry( anIt.Value() );
+ if ( !anEntry.isEmpty() ) {
+ aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( entry( anIt.Value() ) ) ) );
+ } else {
+ aList.append( SUIT_DataOwnerPtr( new HYDROGUI_DataOwner( anIt.Value() ) ) );
+ }
+ }
}
// add externally selected objects
SUIT_DataOwnerPtrList::const_iterator anExtIter;
return;
Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
- if ( aContext->HasOpenedContext() ) {
+ if ( aContext.IsNull() || aContext->HasOpenedContext() ) {
return;
}
- LightApp_OCCSelector::setSelection( aList );
+ QMap<QString, Handle(AIS_InteractiveObject)> aDisplayed;
+ AIS_ListOfInteractive aDispList, aSelList;
+ aContext->DisplayedObjects( aDispList );
+
+ for ( AIS_ListIteratorOfListOfInteractive it( aDispList ); it.More(); it.Next() )
+ {
+ QString entryStr = entry( it.Value() );
+ if ( !entryStr.isEmpty() )
+ aDisplayed.insert( entryStr, it.Value() );
+ }
+
+ mySelectedExternals.clear();
+
+ for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr )
+ {
+ const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>( (*itr).operator->() );
+ if ( owner && aDisplayed.contains( owner->entry() ) )
+ aSelList.Append( aDisplayed[owner->entry()] );
+ else {
+ const HYDROGUI_DataOwner* hydroOwner = dynamic_cast<const HYDROGUI_DataOwner*>( (*itr).operator->() );
+ if ( hydroOwner && !hydroOwner->IO().IsNull() ) {
+ aSelList.Append( hydroOwner->IO() );
+ } else
+ mySelectedExternals.append(*itr);
+ }
+ }
+
+ aViewer->unHighlightAll( false );
+ aViewer->setObjectsSelected( aSelList );
}
QString HYDROGUI_OCCSelector::entry( const Handle(AIS_InteractiveObject)& anAIS ) const