From: Kirill Gavrilov Date: Wed, 25 Oct 2023 12:53:18 +0000 (+0300) Subject: Data Exchange, XCAFDoc_ColorTool::AddColor() - fix generated HEX name of a color... X-Git-Tag: V7_9_0_beta1~21 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=104c5f4261a30d48a2ebb0aa2d97c474197a2bb3;p=occt.git Data Exchange, XCAFDoc_ColorTool::AddColor() - fix generated HEX name of a color #317 Quantity_ColorRGBA::ColorToHex() is now used for consistent HEX formatting of RGBA colors. --- diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cxx b/src/XCAFDoc/XCAFDoc_ColorTool.cxx index 9cbae40431..133b242390 100644 --- a/src/XCAFDoc/XCAFDoc_ColorTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ColorTool.cxx @@ -168,13 +168,9 @@ TDF_Label XCAFDoc_ColorTool::AddColor(const Quantity_ColorRGBA& theColor) const if (XCAFDoc_ColorTool_AutoNaming) { // set name according to color value - const NCollection_Vec4& anRgbaF = theColor; - const NCollection_Vec4 anRgba(anRgbaF * 255.0f); - char aColorHex[32]; - Sprintf(aColorHex, "%02X%02X%02X%02X", anRgba.r(), anRgba.g(), anRgba.b(), anRgba.a()); const TCollection_AsciiString aName = - TCollection_AsciiString(Quantity_Color::StringName(theColor.GetRGB().Name())) + " (#" - + aColorHex + ")"; + TCollection_AsciiString(Quantity_Color::StringName(theColor.GetRGB().Name())) + " (" + + Quantity_ColorRGBA::ColorToHex(theColor) + ")"; TDataStd_Name::Set(aLab, aName); }