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_LAND_COVER_MAP' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ZLayers2.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ZLayers2.cxx
b/src/HYDROGUI/HYDROGUI_ZLayers2.cxx
index bacb4db1146dbaa8cd284794da27d6a786c2772e..76bd41b06414b7c0802b1b98727aaf4775d4a6a0 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ZLayers2.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ZLayers2.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
@@
-25,6
+21,7
@@
#include <AIS_InteractiveObject.hxx>
#include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
+#include <AIS_Trihedron.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_InteractiveContext& theContext,
#include <PrsMgr_PresentationManager3d.hxx>
void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_InteractiveContext& theContext,
@@
-37,10
+34,10
@@
void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_Int
for ( ; aListIter.More(); aListIter.Next() )
{
Handle(AIS_InteractiveObject) aPrsObj = aListIter.Value();
for ( ; aListIter.More(); aListIter.Next() )
{
Handle(AIS_InteractiveObject) aPrsObj = aListIter.Value();
- if( !aPrsObj.IsNull() )
+ if( !aPrsObj.IsNull()
&& !aPrsObj->IsKind( STANDARD_TYPE(AIS_Trihedron) )
)
{
{
- theContext->MainPrsMgr()->Color( aPrsObj );
int aMode = aPrsObj->HasHilightMode() ? aPrsObj->HilightMode() : 0;
int aMode = aPrsObj->HasHilightMode() ? aPrsObj->HilightMode() : 0;
+ theContext->MainPrsMgr()->Color( aPrsObj, Quantity_NOC_YELLOW, aMode );
SetPrsZLayer( aPrsObj, aMode, theLayer );
theContext->MainPrsMgr()->Unhighlight( aPrsObj, aMode );
}
SetPrsZLayer( aPrsObj, aMode, theLayer );
theContext->MainPrsMgr()->Unhighlight( aPrsObj, aMode );
}