ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 18:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Prepare OCCT version 7.1.0+ for SALOME-8.2.0

Browse Source
This commit is contained in:
rnv 2017-03-13 18:00:59 +03:00
parent 0c782492c0
commit 8abb46fb59
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/OBJECT/GEOM_Annotation.cxx
View File

@ -66,7 +66,7 @@ GEOM_Annotation::GEOM_Annotation() : AIS_InteractiveObject()
SetDisplayMode( 0 ); SetDisplayMode( 0 );
SetZLayer( Graphic3d_ZLayerId_Default ); SetZLayer( Graphic3d_ZLayerId_Default );
SetAutoHide( Standard_True ); SetAutoHide( Standard_True );
#if OCC_VERSION_LARGE <= 0x07010000 #if OCC_VERSION_LARGE <= 0x07010001
SetHilightMode( HighlightAll ); SetHilightMode( HighlightAll );
#endif #endif
SetMutable( Standard_True ); SetMutable( Standard_True );
@ -749,7 +749,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)&
return; return;
} }
} }
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle(); const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle();
if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel) if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel)
{ {
@ -879,7 +879,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)&
aContext->ApplyModelViewMatrix(); aContext->ApplyModelViewMatrix();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
theWorkspace->SetHighlightStyle(aHighlightStyle); theWorkspace->SetHighlightStyle(aHighlightStyle);
#else #else
if ( toHighlight != theWorkspace->ToHighlight() ) if ( toHighlight != theWorkspace->ToHighlight() )
@ -895,7 +895,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)&
// purpose : Perform highlighting of the presentation. // purpose : Perform highlighting of the presentation.
// ======================================================================= // =======================================================================
void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
const Handle(Prs3d_Drawer)& theStyle, const Handle(Prs3d_Drawer)& theStyle,
#else #else
const Handle(Graphic3d_HighlightStyle)& theStyle, const Handle(Graphic3d_HighlightStyle)& theStyle,
@ -905,7 +905,7 @@ void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMg
if ( myPrsSh.IsNull() ) if ( myPrsSh.IsNull() )
{ {
Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer; Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer;
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
aDrawer->Link( theStyle ); aDrawer->Link( theStyle );
#else #else
aDrawer->Link( Selectable()->HilightAttributes() ); aDrawer->Link( Selectable()->HilightAttributes() );
@ -943,7 +943,7 @@ void GEOM_Annotation::GEOM_AnnotationOwner::Unhilight ( const Handle(PrsMgr_Pres
{ {
SelectMgr_EntityOwner::Unhilight( thePM, theMode ); SelectMgr_EntityOwner::Unhilight( thePM, theMode );
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
thePM->Unhighlight( myPrsSh ); thePM->Unhighlight( myPrsSh );
#else #else
thePM->Unhighlight( myPrsSh, theMode ); thePM->Unhighlight( myPrsSh, theMode );

2
src/OBJECT/GEOM_Annotation.hxx
View File

@ -363,7 +363,7 @@ public:
//! \param theMode [in] the display mode. //! \param theMode [in] the display mode.
virtual void virtual void
HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
const Handle(Prs3d_Drawer)& theStyle, const Handle(Prs3d_Drawer)& theStyle,
#else #else
const Handle(Graphic3d_HighlightStyle)& theStyle, const Handle(Graphic3d_HighlightStyle)& theStyle,