Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_OCCSelector.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
b/src/HYDROGUI/HYDROGUI_OCCSelector.cxx
index 3abc6754e1b23a83c62d5cc3108eaac288a347d0..7f8eab8c2f3b50d77690c088dbe606991b6d2d2d 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_OCCSelector.cxx
+++ b/
src/HYDROGUI/HYDROGUI_OCCSelector.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// 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
// 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
//
// 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;
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() )
{
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;
}
// 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;
QString HYDROGUI_OCCSelector::entry( const Handle(AIS_InteractiveObject)& anAIS ) const
{
QString aRes;