mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0028726: Quantity_NameOfColor should be replaced by Quantity_Color in function input argument
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:
@@ -74,11 +74,6 @@ void Aspect_Window::SetBackground (const Aspect_Background& theBackground)
|
||||
SetBackground (theBackground.Color());
|
||||
}
|
||||
|
||||
void Aspect_Window::SetBackground (const Quantity_NameOfColor theNameOfColor)
|
||||
{
|
||||
MyBackground.SetColor (theNameOfColor);
|
||||
}
|
||||
|
||||
void Aspect_Window::SetBackground (const Quantity_Color& theColor)
|
||||
{
|
||||
MyBackground.SetColor (theColor);
|
||||
|
@@ -25,7 +25,7 @@
|
||||
#include <Aspect_FillMethod.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <MMgt_TShared.hxx>
|
||||
#include <Quantity_NameOfColor.hxx>
|
||||
#include <Quantity_Color.hxx>
|
||||
#include <Aspect_GradientFillMethod.hxx>
|
||||
#include <Aspect_TypeOfResize.hxx>
|
||||
#include <Quantity_Ratio.hxx>
|
||||
@@ -34,10 +34,8 @@
|
||||
class Aspect_WindowDefinitionError;
|
||||
class Aspect_WindowError;
|
||||
class Aspect_Background;
|
||||
class Quantity_Color;
|
||||
class Aspect_GradientBackground;
|
||||
|
||||
|
||||
class Aspect_Window;
|
||||
DEFINE_STANDARD_HANDLE(Aspect_Window, MMgt_TShared)
|
||||
|
||||
@@ -49,10 +47,7 @@ public:
|
||||
|
||||
//! Modifies the window background.
|
||||
Standard_EXPORT void SetBackground (const Aspect_Background& ABack);
|
||||
|
||||
//! Modifies the window background from a Named Color.
|
||||
Standard_EXPORT void SetBackground (const Quantity_NameOfColor theNameOfColor);
|
||||
|
||||
|
||||
//! Modifies the window background.
|
||||
Standard_EXPORT void SetBackground (const Quantity_Color& color);
|
||||
|
||||
@@ -117,27 +112,16 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
//! Initializes the datas of a Window.
|
||||
Standard_EXPORT Aspect_Window();
|
||||
|
||||
protected:
|
||||
|
||||
Aspect_Background MyBackground;
|
||||
Aspect_GradientBackground MyGradientBackground;
|
||||
Aspect_FillMethod MyBackgroundFillMethod;
|
||||
Standard_Boolean MyIsVirtual;
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _Aspect_Window_HeaderFile
|
||||
|
Reference in New Issue
Block a user