X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ZLayers2.cxx;h=c3f547667a4c0d3fe40068d51426e40c427e08fa;hb=796af79e8134a985ea1b3bbf9997797615ad7e16;hp=1d59e75b274ac62d033273e8b9789b817e0ac4e8;hpb=b2b21a9b49f0df8f53c3a1bcb459a4ec081a84ec;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ZLayers2.cxx b/src/HYDROGUI/HYDROGUI_ZLayers2.cxx index 1d59e75b..c3f54766 100644 --- a/src/HYDROGUI/HYDROGUI_ZLayers2.cxx +++ b/src/HYDROGUI/HYDROGUI_ZLayers2.cxx @@ -21,9 +21,11 @@ #include #include #include +#include #include +#include -void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_InteractiveContext& theContext, +void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle(AIS_InteractiveContext)& theContext, int theLayer ) { AIS_ListOfInteractive aDisplayedObjects; @@ -33,10 +35,15 @@ void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_Int for ( ; aListIter.More(); aListIter.Next() ) { Handle(AIS_InteractiveObject) aPrsObj = aListIter.Value(); - if( !aPrsObj.IsNull() ) + if( !aPrsObj.IsNull() && !aPrsObj->IsKind( STANDARD_TYPE(AIS_Trihedron) ) ) { int aMode = aPrsObj->HasHilightMode() ? aPrsObj->HilightMode() : 0; - theContext->MainPrsMgr()->Color( aPrsObj, Quantity_NOC_YELLOW, aMode ); +#if OCC_VERSION_LARGE < 0x07010000 + Quantity_NameOfColor aStyle = Quantity_NOC_YELLOW; +#else + Handle(Graphic3d_HighlightStyle) aStyle = new Graphic3d_HighlightStyle( Aspect_TOHM_COLOR, Quantity_NOC_YELLOW ); +#endif + theContext->MainPrsMgr()->Color( aPrsObj, aStyle, aMode ); SetPrsZLayer( aPrsObj, aMode, theLayer ); theContext->MainPrsMgr()->Unhighlight( aPrsObj, aMode ); }