From ec99ba3232d12dc921fa7a3871236e5a219b024d Mon Sep 17 00:00:00 2001 From: GKA <> Date: Fri, 17 Feb 2012 12:20:39 +0000 Subject: [PATCH] 0022982: Generic color is overriden in STEPCAFControl_Writer::WriteColors --- src/STEPCAFControl/STEPCAFControl_Writer.cxx | 9 +++++---- src/XCAFDoc/XCAFDoc.cdl | 8 +++++++- src/XCAFDoc/XCAFDoc_ColorTool.cdl | 7 ++++++- src/XDEDRAW/XDEDRAW_Colors.cxx | 3 ++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 2e71c3fa6b..4e985fca5b 100755 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -1039,13 +1039,14 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work } } if ( CTool->GetColor ( lab, XCAFDoc_ColorGen, C ) ) { - style.SetColorCurv ( C ); - style.SetColorSurf ( C ); + style.SetColorCurv ( C ); + style.SetColorSurf ( C ); } if ( CTool->GetColor ( lab, XCAFDoc_ColorSurf, C ) ) - style.SetColorSurf ( C ); + style.SetColorSurf ( C ); if ( CTool->GetColor ( lab, XCAFDoc_ColorCurv, C ) ) - style.SetColorCurv ( C ); + style.SetColorCurv ( C ); + // commented, cause we are need to take reference from // if ( isComponent && lab == L && !isVisible) // if ( !style.IsSetColorSurf() && !style.IsSetColorCurv() ) { diff --git a/src/XCAFDoc/XCAFDoc.cdl b/src/XCAFDoc/XCAFDoc.cdl index 7157774873..7c6fc462de 100755 --- a/src/XCAFDoc/XCAFDoc.cdl +++ b/src/XCAFDoc/XCAFDoc.cdl @@ -38,7 +38,13 @@ is enumeration ColorType is ---Purpose: Defines types of color assignments - ColorGen, -- simple color + -- Color of shape is defined following way + -- in dependance with type of color. + -- If type of color is XCAFDoc_ColorGen - then this color + -- defines default color for surfaces and curves. + -- If for shape color with types XCAFDoc_ColorSurf or XCAFDoc_ColorCurv is specified + -- then such color overrides generic color. + ColorGen, -- simple color ColorSurf, -- color of surfaces ColorCurv -- color of curves end ColorType; diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cdl b/src/XCAFDoc/XCAFDoc_ColorTool.cdl index ca1ebfd8c4..4d22765efa 100755 --- a/src/XCAFDoc/XCAFDoc_ColorTool.cdl +++ b/src/XCAFDoc/XCAFDoc_ColorTool.cdl @@ -84,7 +84,12 @@ is type : ColorType from XCAFDoc); ---Purpose: Sets a link with GUID defined by (see -- XCAFDoc::ColorRefGUID()) from label to color - -- defined by + -- defined by . Color of shape is defined following way + -- in dependance with type of color. + -- If type of color is XCAFDoc_ColorGen - then this color + -- defines default color for surfaces and curves. + -- If for shape color with types XCAFDoc_ColorSurf or XCAFDoc_ColorCurv is specified + -- then such color overrides generic color. SetColor (me; L: Label from TDF; Color: Color from Quantity; diff --git a/src/XDEDRAW/XDEDRAW_Colors.cxx b/src/XDEDRAW/XDEDRAW_Colors.cxx index 601ee54a3a..1a3fd42492 100755 --- a/src/XDEDRAW/XDEDRAW_Colors.cxx +++ b/src/XDEDRAW/XDEDRAW_Colors.cxx @@ -360,7 +360,8 @@ void XDEDRAW_Colors::InitCommands(Draw_Interpretor& di) Standard_CString g = "XDE color's commands"; - di.Add ("XSetColor","Doc {Label|Shape} R G B \t: Set color [R G B] to shape given by Label", + di.Add ("XSetColor","Doc {Label|Shape} R G B [c|s]\t: Set color [R G B] to shape given by Label, " + "type of color 's' - for surface, 'c' - for curve (default generic)", __FILE__, setColor, g); di.Add ("XGetColor","Doc label \t: Return color defined on label in colortable",