-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019 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
SetDisplayMode( 0 );
SetZLayer( Graphic3d_ZLayerId_Default );
SetAutoHide( Standard_True );
- SetHilightMode( HighlightAll );
SetMutable( Standard_True );
SetDepthCulling( Standard_True );
// =======================================================================
// function : SetHilightShape
-// purpose : Sets shape (annotated shape) that will be used for hilighting.
+// purpose : Sets shape (annotated shape) that will be used for highlighting.
// =======================================================================
void GEOM_Annotation::SetHilightShape( const TopoDS_Shape& theShape )
{
const Standard_Integer theTextHeight,
const OpenGl_GraphicDriver* theDriver )
: OpenGl_Element(),
- myDepthMode( 0 ),
myAISObject( theAnnotation ),
myText( theAnnotation->myText.ToExtString() ),
+ myDepthMode( 0 ),
myTextLineY( 0.f ),
myTextDPI( 0 )
{
return;
}
}
-
- const bool toHighlight = theWorkspace->ToHighlight();
-
- if (toHighlight && myAISObject->myHilightMode == HighlightLabel)
+ const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle();
+ if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel)
{
- theWorkspace->SetHighlight( false );
+ Handle(Graphic3d_PresentationAttributes) empty;
+ theWorkspace->SetHighlightStyle(empty);
theWorkspace->ApplyAspectLine();
}
-
+
GLint myOldDepthMode = 0;
if ( myDepthMode )
}
aContext->ApplyModelViewMatrix();
-
- if ( toHighlight != theWorkspace->ToHighlight() )
- {
- theWorkspace->SetHighlight( toHighlight );
- }
+
+ theWorkspace->SetHighlightStyle(aHighlightStyle);
}
// =======================================================================
// purpose : Perform highlighting of the presentation.
// =======================================================================
void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
- const Handle(Graphic3d_HighlightStyle)& theStyle,
+ const Handle(Prs3d_Drawer)& theStyle,
const Standard_Integer theMode )
{
if ( myPrsSh.IsNull() )
{
Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer;
- aDrawer->Link( Selectable()->HilightAttributes() );
-
+ aDrawer->Link( theStyle );
Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect(
aDrawer->UIsoAspect()->Aspect()->Color(),
aDrawer->UIsoAspect()->Aspect()->Type(),
}
myPrsSh->SetZLayer ( Selectable()->ZLayer() );
-
+
thePM->Color( Selectable(), theStyle, theMode, NULL, Graphic3d_ZLayerId_Topmost );
thePM->Color( myPrsSh, theStyle, theMode, Selectable(), Graphic3d_ZLayerId_Topmost );
const Standard_Integer theMode )
{
SelectMgr_EntityOwner::Unhilight( thePM, theMode );
-
- thePM->Unhighlight( myPrsSh, theMode );
+ thePM->Unhighlight( myPrsSh );
}
// =======================================================================