OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-06 18:26:22 +03:00
Code Packages Releases Activity

0027988: Visualization, AIS_InteractiveContext - fix inconsistent methods for setting highlight styles

Browse Source 
Methods ::ChangeHighlightStyle() and ::ChangeSelectionStyle() have been
replaced by ::SetHighlightStyle() and ::SetSelectionStyle().
This commit is contained in:
kgv 2016-10-21 12:51:26 +03:00 committed by apn
parent 0b622d670d
commit d94bed0e26
5 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dox/dev_guides/upgrade/upgrade.md
View File

@ -1058,8 +1058,8 @@ Method AIS_InteractiveContext::Hilight is now deprecated and highlights interact
Group of methods AIS_InteractiveContext::IsHilighted changed behavior - now they only check object's or owner's highlight flags in global status. If highlight color is required on application level, overloaded methods AIS_InteractiveContext::HighlightStyle for owner and object must be used instead. Group of methods AIS_InteractiveContext::IsHilighted changed behavior - now they only check object's or owner's highlight flags in global status. If highlight color is required on application level, overloaded methods AIS_InteractiveContext::HighlightStyle for owner and object must be used instead.
The following methods were replaced in AIS_InteractiveContext API: The following methods were replaced in AIS_InteractiveContext API:
- *HilightColor*, *SetHilightColor* were replaced by *HighlightStyle*, *ChangeHighlightStyle*; - *HilightColor*, *SetHilightColor* were replaced by *HighlightStyle*, *SetHighlightStyle*;
- *SelectionColor* setter and getter were replaced by *SelectionStyle*, *ChangeSelectionStyle*. - *SelectionColor* setter and getter were replaced by *SelectionStyle*, *SetSelectionStyle*.
API of Prs3d_Drawer was extended to allow setting up styles for both dynamic selection and highlighting. Therefore, on application level changing highlight style for particular object must be implemented via SelectMgr_SelectableObject::HilightAttributes() and processed in entity owner. API of Prs3d_Drawer was extended to allow setting up styles for both dynamic selection and highlighting. Therefore, on application level changing highlight style for particular object must be implemented via SelectMgr_SelectableObject::HilightAttributes() and processed in entity owner.

4
src/AIS/AIS_InteractiveContext.cxx
View File

@ -14,12 +14,12 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <AIS_ConnectedInteractive.hxx> #include <AIS_InteractiveContext.hxx>
#include <AIS_DataMapIteratorOfDataMapOfILC.hxx> #include <AIS_DataMapIteratorOfDataMapOfILC.hxx>
#include <AIS_DataMapIteratorOfDataMapOfIOStatus.hxx> #include <AIS_DataMapIteratorOfDataMapOfIOStatus.hxx>
#include <AIS_ConnectedInteractive.hxx>
#include <AIS_GlobalStatus.hxx> #include <AIS_GlobalStatus.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_InteractiveObject.hxx> #include <AIS_InteractiveObject.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx> #include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_LocalContext.hxx> #include <AIS_LocalContext.hxx>

22
src/AIS/AIS_InteractiveContext.hxx
View File

@ -638,15 +638,8 @@ public:
return myHiStyle; return myHiStyle;
} }
//! Allows to manage the style of dynamic highlighting. //! Setup the style of dynamic highlighting.
//! By default: void SetHighlightStyle (const Handle(Graphic3d_HighlightStyle)& theStyle) { myHiStyle = theStyle; }
//! - the color of dynamic highlight is Quantity_NOC_CYAN1;
//! - the presentation for dynamic highlight is completely opaque;
//! - the type of highlight is Aspect_TOHM_COLOR.
Handle(Graphic3d_HighlightStyle)& ChangeHighlightStyle()
{
return myHiStyle;
}
//! Returns current selection style settings. //! Returns current selection style settings.
//! By default: //! By default:
@ -658,15 +651,8 @@ public:
return mySelStyle; return mySelStyle;
} }
//! Allows to manage the style of selection highlighting. //! Setup the style of selection highlighting.
//! By default: void SetSelectionStyle (const Handle(Graphic3d_HighlightStyle)& theStyle) { mySelStyle = theStyle; }
//! - the color of selection is Quantity_NOC_GRAY80;
//! - the presentation for selection is completely opaque;
//! - the type of highlight is Aspect_TOHM_COLOR.
Handle(Graphic3d_HighlightStyle)& ChangeSelectionStyle()
{
return mySelStyle;
}
//! Returns the name of the color used to show preselection. //! Returns the name of the color used to show preselection.
//! By default, this is Quantity_NOC_GREEN. //! By default, this is Quantity_NOC_GREEN.

2
src/QABugs/QABugs_16.cxx
View File

@ -156,7 +156,7 @@ static Standard_Integer BUC60814(Draw_Interpretor& di, Standard_Integer argc, c
Handle(AIS_InteractiveObject) aCircle=new AIS_Circle(ahCircle); Handle(AIS_InteractiveObject) aCircle=new AIS_Circle(ahCircle);
myAISContext->Display(aCircle); myAISContext->Display(aCircle);
Handle(Graphic3d_HighlightStyle)& aSelStyle = myAISContext->ChangeSelectionStyle(); const Handle(Graphic3d_HighlightStyle)& aSelStyle = myAISContext->SelectionStyle();
aSelStyle->SetColor (Quantity_NOC_BLUE1); aSelStyle->SetColor (Quantity_NOC_BLUE1);
myAISContext->AddOrRemoveSelected(aTrihedron); myAISContext->AddOrRemoveSelected(aTrihedron);

4
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -9292,8 +9292,8 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
aCtx->SetPixelTolerance (aCmd.ArgInt ("pixTol")); aCtx->SetPixelTolerance (aCmd.ArgInt ("pixTol"));
} }
Handle(Graphic3d_HighlightStyle)& aHiStyle = aCtx->ChangeHighlightStyle(); const Handle(Graphic3d_HighlightStyle)& aHiStyle = aCtx->HighlightStyle();
Handle(Graphic3d_HighlightStyle)& aSelStyle = aCtx->ChangeSelectionStyle(); const Handle(Graphic3d_HighlightStyle)& aSelStyle = aCtx->SelectionStyle();
Standard_Boolean toRedraw = Standard_False; Standard_Boolean toRedraw = Standard_False;
if (aCmd.HasOption ("selColor")) if (aCmd.HasOption ("selColor"))
{ {