refs #1457

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_OCCSelector.cxx

diff --git a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
index 432306627ff08164ce644a83d348cb9dca394d77..edd6effe38b9dd59a7e0596beaa675a48bfff421 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
@@ -22,6 +22,7 @@
 #include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_DataOwner.h"
 #include "HYDROGUI_Module.h"
+#include "HYDROGUI_Shape.h"
 
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
@@ -76,13 +77,17 @@ void HYDROGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
   if ( !aViewer )
     return;
 
+  int aViewerId = (size_t)aViewer;
+
   Handle(AIS_InteractiveContext) aContext = aViewer->getAISContext();
   if ( aContext.IsNull() || aContext->HasOpenedContext() ) {
     return;
   }
 
-  QMap<QString, Handle(AIS_InteractiveObject)> aDisplayed;
-  AIS_ListOfInteractive aDispList, aSelList;
+  AIS_ListOfInteractive aSelList;
+
+  /*QMap<QString, Handle(AIS_InteractiveObject)> aDisplayed;
+  AIS_ListOfInteractive aDispList;
   aContext->DisplayedObjects( aDispList );
 
   for ( AIS_ListIteratorOfListOfInteractive it( aDispList ); it.More(); it.Next() )
@@ -90,15 +95,27 @@ void HYDROGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
     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()] );
+    if ( owner )   //&& aDisplayed.contains( owner->entry() ) )
+    {
+      QString anEntry = owner->entry();
+      Handle(HYDROData_Entity) anEntity = myModule->getDataModel()->objectByEntry( anEntry );
+      if( !anEntity.IsNull() )
+      {
+        HYDROGUI_Shape* aShape = myModule->getObjectShape( aViewerId, anEntity );
+        if( aShape && aShape->isVisible() )
+        {
+          foreach( Handle(AIS_InteractiveObject) obj, aShape->getAISObjects() )
+            aSelList.Append( obj );
+        }
+      }
+    }
     else {
       const HYDROGUI_DataOwner* hydroOwner = dynamic_cast<const HYDROGUI_DataOwner*>( (*itr).operator->() );
       if ( hydroOwner && !hydroOwner->IO().IsNull() ) {
@@ -125,4 +142,4 @@ QString HYDROGUI_OCCSelector::entry( const Handle(AIS_InteractiveObject)& anAIS
     aRes = HYDROGUI_DataObject::dataObjectEntry( anObj );
 
   return aRes;
-}
\ No newline at end of file
+}