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

28
src/AIS/AIS_Shape.cxx
View File

@@ -14,10 +14,10 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <AIS_Shape.hxx>
#include <AIS_GraphicTool.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_Shape.hxx>
#include <Aspect_TypeOfLine.hxx>
#include <Bnd_Box.hxx>
#include <BRep_Builder.hxx>
@@ -411,12 +411,6 @@ void AIS_Shape::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
StdSelect::SetDrawerForBRepOwner(aSelection,myDrawer);
}
Quantity_NameOfColor AIS_Shape::Color() const {
Quantity_Color aColor;
Color(aColor);
return aColor.Name();
}
void AIS_Shape::Color( Quantity_Color& aColor ) const {
aColor = myDrawer->ShadingAspect()->Color(myCurrentFacingModel);
}
@@ -429,16 +423,6 @@ Standard_Real AIS_Shape::Transparency() const {
return myDrawer->ShadingAspect()->Transparency(myCurrentFacingModel);
}
//=======================================================================
//function : SetColor
//purpose :
//=======================================================================
void AIS_Shape::SetColor(const Quantity_NameOfColor aCol)
{
SetColor(Quantity_Color(aCol));
}
//=======================================================================
//function : setColor
//purpose :
@@ -830,16 +814,6 @@ void AIS_Shape::setMaterial (const Handle(Prs3d_Drawer)& theDrawer,
}
}
//=======================================================================
//function : SetMaterial
//purpose :
//=======================================================================
void AIS_Shape::SetMaterial(const Graphic3d_NameOfMaterial aMat)
{
SetMaterial(Graphic3d_MaterialAspect(aMat));
}
//=======================================================================
//function : SetMaterial
//purpose :