OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0028726: Quantity_NameOfColor should be replaced by Quantity_Color in function input argument

Browse Source 
AIS_InteractiveObject, virtual methods ::SetColor(), ::Color()
returning/accepting Quantity_NameOfColor have been removed.
Virtual method ::SetMaterial() accepting Graphic3d_NameOfMaterial has been also removed.

V3d_View, V3d_Viewer, V3d_AmbientLight, V3d_DirectionalLight,
V3d_Light, V3d_PositionalLight, V3d_SpotLight, Aspect_Window,
methods accepting Quantity_NameOfColor have been removed (duplicates)
or color argument(s) replaced with Quantity_Color.
This commit is contained in:
kgv
2017-05-11 18:10:53 +03:00
committed by bugmaster
parent 5ecc46c08e
commit 87432b8278
71 changed files with 426 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/TPrsStd/TPrsStd_AISPresentation.cxx
View File

@@ -386,8 +386,17 @@ void TPrsStd_AISPresentation::SetColor(const Quantity_NameOfColor theColor)
{
Backup();
if ( getData()->HasOwnColor() && getData()->Color() == theColor )
if ( !myAIS.IsNull() && myAIS->HasColor() && myAIS->Color() == theColor )
return;
{
if (!myAIS.IsNull() && myAIS->HasColor())
{
Quantity_Color aColor;
myAIS->Color (aColor);
if (aColor.Name() == theColor)
{
return;
}
}
}
getData()->SetColor(theColor);
@@ -396,8 +405,15 @@ void TPrsStd_AISPresentation::SetColor(const Quantity_NameOfColor theColor)
if ( !myAIS.IsNull() )
{
if ( myAIS->HasColor() && myAIS->Color() == theColor )
return; // AIS has already had that color
if (myAIS->HasColor())
{
Quantity_Color aColor;
myAIS->Color (aColor);
if (aColor.Name() == theColor)
{
return; // AIS has already had that color
}
}
Handle(AIS_InteractiveContext) aContext = getAISContext();
@@ -801,7 +817,9 @@ void TPrsStd_AISPresentation::AISUpdate()
if ( HasOwnColor() )
{
Quantity_NameOfColor aColor = Color();
if ( !(myAIS->HasColor()) || (myAIS->HasColor() && myAIS->Color() != aColor) )
Quantity_Color aPrsColor;
myAIS->Color (aPrsColor);
if ( !(myAIS->HasColor()) || (myAIS->HasColor() && aPrsColor.Name() != aColor) )
{
if ( !aContext.IsNull() )
aContext->SetColor(myAIS, aColor, Standard_False);