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 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ShowHideOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
index d754a33a9d55c336e3d4853a085a768f5537bd7f..066d0190f2bb90ba836c3c300cc40785c31fce2f 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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) 2014-2015 EDF-R&D
// 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
@@
-147,7
+143,11
@@
void HYDROGUI_ShowHideOp::startOperation()
}
else if ( anObject->GetKind() == KIND_BATHYMETRY && aVisibility )
{
}
else if ( anObject->GetKind() == KIND_BATHYMETRY && aVisibility )
{
- if ( !(anUpdateFlags & UF_VTKViewer) )
+ if ( anUpdateFlags & UF_OCCViewer )
+ {
+ aModule->setObjectVisible( aViewId, anObject, aVisibility );
+ }
+ else if ( !(anUpdateFlags & UF_VTKViewer) )
{
// Activate VTK viewer if show a bathymetry
aVTKMgr = aModule->getApp()->viewManager( SVTK_Viewer::Type() );
{
// Activate VTK viewer if show a bathymetry
aVTKMgr = aModule->getApp()->viewManager( SVTK_Viewer::Type() );