OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +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

26
src/AIS/AIS_InteractiveContext.cxx
View File

@@ -1763,17 +1763,6 @@ void AIS_InteractiveContext::redisplayPrsModes (const Handle(AIS_InteractiveObje
}
}
//=======================================================================
//function : SetColor
//purpose :
//=======================================================================
void AIS_InteractiveContext::SetColor (const Handle(AIS_InteractiveObject)& theIObj,
const Quantity_NameOfColor theColor,
const Standard_Boolean theToUpdateViewer)
{
SetColor (theIObj, Quantity_Color(theColor), theToUpdateViewer);
}
//=======================================================================
//function : SetColor
//purpose :
@@ -2015,15 +2004,6 @@ Standard_Boolean AIS_InteractiveContext::HasColor (const Handle(AIS_InteractiveO
return theIObj->HasColor();
}
//=======================================================================
//function : Color
//purpose :
//=======================================================================
Quantity_NameOfColor AIS_InteractiveContext::Color (const Handle(AIS_InteractiveObject)& theIObj) const
{
return theIObj->Color();
}
//=======================================================================
//function : Color
//purpose :
@@ -2098,7 +2078,7 @@ void AIS_InteractiveContext::UnsetWidth (const Handle(AIS_InteractiveObject)& th
//purpose :
//=======================================================================
void AIS_InteractiveContext::SetMaterial (const Handle(AIS_InteractiveObject)& theIObj,
const Graphic3d_NameOfMaterial theName,
const Graphic3d_MaterialAspect& theMaterial,
const Standard_Boolean theToUpdateViewer)
{
if (theIObj.IsNull())
@@ -2107,7 +2087,7 @@ void AIS_InteractiveContext::SetMaterial (const Handle(AIS_InteractiveObject)& t
}
setContextToObject (theIObj);
theIObj->SetMaterial (theName);
theIObj->SetMaterial (theMaterial);
redisplayPrsRecModes (theIObj, theToUpdateViewer);
}
@@ -2735,7 +2715,7 @@ void AIS_InteractiveContext::InitAttributes()
Handle(Prs3d_DatumAspect) aTrihAspect = myDefaultDrawer->DatumAspect();
const Standard_Real aLength = 100.0;
aTrihAspect->SetAxisLength (aLength, aLength, aLength);
const Quantity_NameOfColor aColor = Quantity_NOC_LIGHTSTEELBLUE4;
const Quantity_Color aColor = Quantity_NOC_LIGHTSTEELBLUE4;
aTrihAspect->LineAspect(Prs3d_DP_XAxis)->SetColor (aColor);
aTrihAspect->LineAspect(Prs3d_DP_YAxis)->SetColor (aColor);
aTrihAspect->LineAspect(Prs3d_DP_ZAxis)->SetColor (aColor);