OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0022982: Generic color is overriden in STEPCAFControl_Writer::WriteColors

Browse Source
This commit is contained in:
GKA 2012-02-17 12:20:39 +00:00 committed by bugmaster
parent 974c25edb4
commit ec99ba3232
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/STEPCAFControl/STEPCAFControl_Writer.cxx
View File

@ -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() ) {

8
src/XCAFDoc/XCAFDoc.cdl
View File

@ -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;

7
src/XCAFDoc/XCAFDoc_ColorTool.cdl
View File

@ -84,7 +84,12 @@ is
type : ColorType from XCAFDoc);
---Purpose: Sets a link with GUID defined by <type> (see
-- XCAFDoc::ColorRefGUID()) from label <L> to color
-- defined by <colorL>
-- defined by <colorL>. 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;

3
src/XDEDRAW/XDEDRAW_Colors.cxx
View File

@ -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",