X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCSelector.cxx;h=7f8eab8c2f3b50d77690c088dbe606991b6d2d2d;hb=cd6ea20d9a76665a24a533d0340385a335961f05;hp=24d8975b400479ec392eba562dd2b6658f671015;hpb=f67a557992493d2ec9508689e3cb8fa3b2227cf1;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
index 24d8975b..7f8eab8c 100644
--- a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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;
@@ -70,8 +88,8 @@ QString HYDROGUI_OCCSelector::entry( const Handle(AIS_InteractiveObject)& anAIS
   if ( anAIS.IsNull() || !anAIS->HasOwner() )
     return aRes;
 
-  Handle(HYDROData_Object) anObj = 
-    Handle(HYDROData_Object)::DownCast( anAIS->GetOwner() );
+  Handle(HYDROData_Entity) anObj = 
+    Handle(HYDROData_Entity)::DownCast( anAIS->GetOwner() );
   if ( !anObj.IsNull() )
     aRes = HYDROGUI_DataObject::dataObjectEntry( anObj );