From 08b183fe0b846bcc2510ad0f4d18aa7ab7302b90 Mon Sep 17 00:00:00 2001 From: anv Date: Thu, 29 Dec 2016 11:48:16 +0300 Subject: [PATCH] 0028188: Improving layer color storage mechanism for DXF Import/Export Attribute ColorByLayer was added for shapes that should be colored by the color of their layer or, if it's absent, by the parent component's layer color. Fixing inconsistency of iterating through the map of Styles Improving ColorByLayer mechanism Fix for Map/IndexedMad differences. Renaming according to convention of naming collection typedefs --- src/IGESCAFControl/IGESCAFControl_Writer.cxx | 8 +- src/IGESCAFControl/IGESCAFControl_Writer.hxx | 4 +- src/STEPCAFControl/STEPCAFControl_Writer.cxx | 16 ++-- src/XCAFDoc/XCAFDoc.cxx | 12 +++ src/XCAFDoc/XCAFDoc.hxx | 2 + src/XCAFDoc/XCAFDoc_ColorTool.cxx | 29 ++++++++ src/XCAFDoc/XCAFDoc_ColorTool.hxx | 9 ++- src/XCAFPrs/FILES | 4 +- src/XCAFPrs/XCAFPrs.cxx | 73 +++++++++++++++---- src/XCAFPrs/XCAFPrs.hxx | 4 +- src/XCAFPrs/XCAFPrs_AISObject.cxx | 20 +++-- ...pIteratorOfIndexedDataMapOfShapeStyle.hxx} | 6 +- ...=> XCAFPrs_IndexedDataMapOfShapeStyle.hxx} | 10 +-- src/XDEDRAW/XDEDRAW.cxx | 40 ++++++++-- 14 files changed, 182 insertions(+), 55 deletions(-) rename src/XCAFPrs/{XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx => XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle.hxx} (77%) rename src/XCAFPrs/{XCAFPrs_DataMapOfShapeStyle.hxx => XCAFPrs_IndexedDataMapOfShapeStyle.hxx} (65%) diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cxx b/src/IGESCAFControl/IGESCAFControl_Writer.cxx index 65aa2b97c0..027df6bfd7 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.cxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.cxx @@ -236,7 +236,7 @@ Standard_Boolean IGESCAFControl_Writer::WriteAttributes (const TDF_LabelSequence TDF_Label L = labels.Value(i); // collect color settings - XCAFPrs_DataMapOfShapeStyle settings; + XCAFPrs_IndexedDataMapOfShapeStyle settings; TopLoc_Location loc; XCAFPrs::CollectStyleSettings ( L, loc, settings ); if ( settings.Extent() <=0 ) continue; @@ -262,7 +262,7 @@ Standard_Boolean IGESCAFControl_Writer::WriteAttributes (const TDF_LabelSequence //======================================================================= void IGESCAFControl_Writer::MakeColors (const TopoDS_Shape &S, - const XCAFPrs_DataMapOfShapeStyle &settings, + const XCAFPrs_IndexedDataMapOfShapeStyle &settings, XCAFPrs_DataMapOfStyleTransient &colors, TopTools_MapOfShape &Map, const XCAFPrs_Style &inherit) @@ -272,8 +272,8 @@ void IGESCAFControl_Writer::MakeColors (const TopoDS_Shape &S, // check if shape has its own style (or inherits from ancestor) XCAFPrs_Style style = inherit; - if ( settings.IsBound(S) ) { - XCAFPrs_Style own = settings.Find(S); + if ( settings.Contains(S) ) { + XCAFPrs_Style own = settings.FindFromKey(S); if ( own.IsSetColorCurv() ) style.SetColorCurv ( own.GetColorCurv() ); if ( own.IsSetColorSurf() ) style.SetColorSurf ( own.GetColorSurf() ); } diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.hxx b/src/IGESCAFControl/IGESCAFControl_Writer.hxx index ff725bc285..a8cdeb915a 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.hxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include class XSControl_WorkSession; @@ -125,7 +125,7 @@ private: //! Recursively iterates on subshapes and assigns colors //! to faces and edges (if set) - Standard_EXPORT void MakeColors (const TopoDS_Shape& S, const XCAFPrs_DataMapOfShapeStyle& settings, XCAFPrs_DataMapOfStyleTransient& colors, TopTools_MapOfShape& Map, const XCAFPrs_Style& inherit); + Standard_EXPORT void MakeColors (const TopoDS_Shape& S, const XCAFPrs_IndexedDataMapOfShapeStyle& settings, XCAFPrs_DataMapOfStyleTransient& colors, TopTools_MapOfShape& Map, const XCAFPrs_Style& inherit); Standard_Boolean myColorMode; diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 270e98b807..67ac7f2993 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -233,7 +233,7 @@ #include #include #include -#include +#include #include #include #include @@ -1031,7 +1031,7 @@ static Standard_Boolean setDefaultInstanceColor (const Handle(StepVisual_StyledI //======================================================================= static void MakeSTEPStyles (STEPConstruct_Styles &Styles, const TopoDS_Shape &S, - const XCAFPrs_DataMapOfShapeStyle &settings, + const XCAFPrs_IndexedDataMapOfShapeStyle &settings, Handle(StepVisual_StyledItem) &override, TopTools_MapOfShape &Map, const MoniTool_DataMapOfShapeTransient& myMapCompMDGPR, @@ -1047,8 +1047,8 @@ static void MakeSTEPStyles (STEPConstruct_Styles &Styles, // check if shape has its own style (r inherits from ancestor) XCAFPrs_Style style; if ( inherit ) style = *inherit; - if ( settings.IsBound(S) ) { - XCAFPrs_Style own = settings.Find(S); + if ( settings.Contains(S) ) { + XCAFPrs_Style own = settings.FindFromKey(S); if ( !own.IsVisible() ) style.SetVisibility ( Standard_False ); if ( own.IsSetColorCurv() ) style.SetColorCurv ( own.GetColorCurv() ); if ( own.IsSetColorSurf() ) style.SetColorSurf ( own.GetColorSurf() ); @@ -1199,7 +1199,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work continue; // collect settings set on that label - XCAFPrs_DataMapOfShapeStyle settings; + XCAFPrs_IndexedDataMapOfShapeStyle settings; TDF_LabelSequence seq; seq.Append ( L ); XCAFDoc_ShapeTool::GetSubShapes ( L, seq ); @@ -1232,7 +1232,11 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work if ( ! style.IsSetColorCurv() && ! style.IsSetColorSurf() && isVisible ) continue; TopoDS_Shape sub = XCAFDoc_ShapeTool::GetShape ( lab ); - settings.Bind ( sub, style ); + XCAFPrs_Style* aMapStyle = settings.ChangeSeek (sub); + if (aMapStyle == NULL) + settings.Add ( sub, style ); + else + *aMapStyle = style; } if ( settings.Extent() <=0 ) continue; diff --git a/src/XCAFDoc/XCAFDoc.cxx b/src/XCAFDoc/XCAFDoc.cxx index e92b36227e..222fb7aa92 100644 --- a/src/XCAFDoc/XCAFDoc.cxx +++ b/src/XCAFDoc/XCAFDoc.cxx @@ -195,6 +195,18 @@ Standard_GUID XCAFDoc::InvisibleGUID () } +//======================================================================= +//function : ColorByLayerGUID +//purpose : +//======================================================================= + +Standard_GUID XCAFDoc::ColorByLayerGUID () +{ + static Standard_GUID ID ("279e8c1e-70af-4130-b626-9cc52a537db8"); + return ID; +} + + //======================================================================= //function : SHUORefGUID //purpose : diff --git a/src/XCAFDoc/XCAFDoc.hxx b/src/XCAFDoc/XCAFDoc.hxx index 3a6ae88366..7f09f721ac 100644 --- a/src/XCAFDoc/XCAFDoc.hxx +++ b/src/XCAFDoc/XCAFDoc.hxx @@ -102,6 +102,8 @@ public: Standard_EXPORT static Standard_GUID NoteRefGUID(); Standard_EXPORT static Standard_GUID InvisibleGUID(); + + Standard_EXPORT static Standard_GUID ColorByLayerGUID(); //! Returns GUID for UAttribute identifying external reference on no-step file Standard_EXPORT static Standard_GUID ExternRefGUID(); diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cxx b/src/XCAFDoc/XCAFDoc_ColorTool.cxx index 6e6402e707..0c98aa410d 100644 --- a/src/XCAFDoc/XCAFDoc_ColorTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ColorTool.cxx @@ -558,6 +558,35 @@ void XCAFDoc_ColorTool::SetVisibility (const TDF_Label& L, else L.ForgetAttribute( XCAFDoc::InvisibleGUID() ); } +//======================================================================= +//function : IsColorByLayer +//purpose : +//======================================================================= + +Standard_Boolean XCAFDoc_ColorTool::IsColorByLayer (const TDF_Label& L) const +{ + Handle(TDataStd_UAttribute) aUAttr; + return L.FindAttribute(XCAFDoc::ColorByLayerGUID(), aUAttr); +} + +//======================================================================= +//function : SetColorByLayer +//purpose : +//======================================================================= + +void XCAFDoc_ColorTool::SetColorByLayer (const TDF_Label& L, + const Standard_Boolean isColorByLayer) +{ + Handle(TDataStd_UAttribute) aUAttr; + if ( isColorByLayer ) { + Handle(XCAFDoc_GraphNode) aSHUO; + if (ShapeTool()->IsShape(L) || ShapeTool()->GetSHUO( L, aSHUO ) ) + if (!L.FindAttribute(XCAFDoc::ColorByLayerGUID(), aUAttr)) + aUAttr->Set( L, XCAFDoc::ColorByLayerGUID() ); + } + else L.ForgetAttribute( XCAFDoc::ColorByLayerGUID() ); +} + //======================================================================= //function : SetInstanceColor //purpose : diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.hxx b/src/XCAFDoc/XCAFDoc_ColorTool.hxx index 0ef9cee73e..8a582ed574 100644 --- a/src/XCAFDoc/XCAFDoc_ColorTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ColorTool.hxx @@ -198,7 +198,14 @@ public: //! Set the visibility of object on label. Do nothing if there no any object. //! Set UAttribute with corresponding GUID. Standard_EXPORT void SetVisibility (const TDF_Label& shapeLabel, const Standard_Boolean isvisible = Standard_True); - + + //! Return TRUE if object color defined by its Layer, FALSE if not. + Standard_EXPORT Standard_Boolean IsColorByLayer (const TDF_Label& L) const; + + //! Set the Color defined by Layer flag on label. Do nothing if there no any object. + //! Set UAttribute with corresponding GUID. + Standard_EXPORT void SetColorByLayer (const TDF_Label& shapeLabel, const Standard_Boolean isColorByLayer = Standard_False); + //! Sets the color of component that styled with SHUO structure //! Returns FALSE if no sush component found //! NOTE: create SHUO structeure if it is necessary and if diff --git a/src/XCAFPrs/FILES b/src/XCAFPrs/FILES index fd493ba490..a0185927e8 100644 --- a/src/XCAFPrs/FILES +++ b/src/XCAFPrs/FILES @@ -2,10 +2,10 @@ XCAFPrs.cxx XCAFPrs.hxx XCAFPrs_AISObject.cxx XCAFPrs_AISObject.hxx -XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx +XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle.hxx XCAFPrs_DataMapIteratorOfDataMapOfStyleShape.hxx XCAFPrs_DataMapIteratorOfDataMapOfStyleTransient.hxx -XCAFPrs_DataMapOfShapeStyle.hxx +XCAFPrs_IndexedDataMapOfShapeStyle.hxx XCAFPrs_DataMapOfStyleShape.hxx XCAFPrs_DataMapOfStyleTransient.hxx XCAFPrs_Driver.cxx diff --git a/src/XCAFPrs/XCAFPrs.cxx b/src/XCAFPrs/XCAFPrs.cxx index 151e1b2ff7..762eb4405a 100644 --- a/src/XCAFPrs/XCAFPrs.cxx +++ b/src/XCAFPrs/XCAFPrs.cxx @@ -86,16 +86,29 @@ static Standard_Boolean getShapesOfSHUO (TopLoc_IndexedMapOfLocation& theaPrevLo //======================================================================= void XCAFPrs::CollectStyleSettings (const TDF_Label& theLabel, - const TopLoc_Location& theLoc, - XCAFPrs_DataMapOfShapeStyle& theSettings) + const TopLoc_Location& theLoc, + XCAFPrs_IndexedDataMapOfShapeStyle& theSettings, + const Quantity_ColorRGBA& theLayerColor) { // for references, first collect colors of referred shape { TDF_Label aLabelRef; if (XCAFDoc_ShapeTool::GetReferredShape (theLabel, aLabelRef)) { + Quantity_ColorRGBA aLayerColor = theLayerColor; + Handle(XCAFDoc_LayerTool) aLayerTool = XCAFDoc_DocumentTool::LayerTool (theLabel); + Handle(TColStd_HSequenceOfExtendedString) aLayerNames = new TColStd_HSequenceOfExtendedString(); + aLayerTool->GetLayers (theLabel, aLayerNames); + if (aLayerNames->Length() == 1) + { + TDF_Label aLayer = aLayerTool->FindLayer (aLayerNames->First()); + Handle(XCAFDoc_ColorTool) aColorTool = XCAFDoc_DocumentTool::ColorTool(theLabel); + Quantity_ColorRGBA aColor; + if (aColorTool->GetColor (aLayer, XCAFDoc_ColorGen, aColor)) + aLayerColor = aColor; + } TopLoc_Location aLocSub = theLoc.Multiplied (XCAFDoc_ShapeTool::GetLocation (theLabel)); - CollectStyleSettings (aLabelRef, aLocSub, theSettings); + CollectStyleSettings (aLabelRef, aLocSub, theSettings, aLayerColor); } } @@ -108,7 +121,7 @@ void XCAFPrs::CollectStyleSettings (const TDF_Label& theLabel, for (TDF_LabelSequence::Iterator aComponentIter (aComponentLabSeq); aComponentIter.More(); aComponentIter.Next()) { const TDF_Label& aComponentLab = aComponentIter.Value(); - CollectStyleSettings (aComponentLab, theLoc, theSettings); + CollectStyleSettings (aComponentLab, theLoc, theSettings, theLayerColor); } } } @@ -149,19 +162,39 @@ void XCAFPrs::CollectStyleSettings (const TDF_Label& theLabel, } else { - Quantity_ColorRGBA aColor; - if (aColorTool->GetColor (aLabel, XCAFDoc_ColorGen, aColor)) + if (aColorTool->IsColorByLayer(aLabel)) { - aStyle.SetColorCurv (aColor.GetRGB()); - aStyle.SetColorSurf (aColor); + Quantity_ColorRGBA aLayerColor = theLayerColor; + Handle(XCAFDoc_LayerTool) aLayerTool = XCAFDoc_DocumentTool::LayerTool (aLabel); + Handle(TColStd_HSequenceOfExtendedString) aLayerNames = new TColStd_HSequenceOfExtendedString(); + aLayerTool->GetLayers (aLabel, aLayerNames); + if (aLayerNames->Length() == 1) + { + TDF_Label aLayer = aLayerTool->FindLayer (aLayerNames->First()); + Quantity_ColorRGBA aColor; + if (aColorTool->GetColor (aLayer, XCAFDoc_ColorGen, aColor)) + aLayerColor = aColor; + } + + aStyle.SetColorCurv (aLayerColor.GetRGB()); + aStyle.SetColorSurf (aLayerColor); } - if (aColorTool->GetColor (aLabel, XCAFDoc_ColorSurf, aColor)) + else { - aStyle.SetColorSurf (aColor); - } - if (aColorTool->GetColor (aLabel, XCAFDoc_ColorCurv, aColor)) - { - aStyle.SetColorCurv (aColor.GetRGB()); + Quantity_ColorRGBA aColor; + if (aColorTool->GetColor (aLabel, XCAFDoc_ColorGen, aColor)) + { + aStyle.SetColorCurv (aColor.GetRGB()); + aStyle.SetColorSurf (aColor); + } + if (aColorTool->GetColor (aLabel, XCAFDoc_ColorSurf, aColor)) + { + aStyle.SetColorSurf (aColor); + } + if (aColorTool->GetColor (aLabel, XCAFDoc_ColorCurv, aColor)) + { + aStyle.SetColorCurv (aColor.GetRGB()); + } } } @@ -250,7 +283,11 @@ void XCAFPrs::CollectStyleSettings (const TDF_Label& theLabel, for (TopTools_SequenceOfShape::Iterator aShuoShapeIter (aShuoShapeSeq); aShuoShapeIter.More(); aShuoShapeIter.Next()) { const TopoDS_Shape& aShuoShape = aShuoShapeIter.Value(); - theSettings.Bind (aShuoShape, aShuoStyle); + XCAFPrs_Style* aMapStyle = theSettings.ChangeSeek (aShuoShape); + if (aMapStyle == NULL) + theSettings.Add (aShuoShape, aShuoStyle); + else + *aMapStyle = aShuoStyle; } continue; } @@ -273,7 +310,11 @@ void XCAFPrs::CollectStyleSettings (const TDF_Label& theLabel, } } aSubshape.Move (theLoc); - theSettings.Bind (aSubshape, aStyle); + XCAFPrs_Style* aMapStyle = theSettings.ChangeSeek (aSubshape); + if (aMapStyle == NULL) + theSettings.Add (aSubshape, aStyle); + else + *aMapStyle = aStyle; } } diff --git a/src/XCAFPrs/XCAFPrs.hxx b/src/XCAFPrs/XCAFPrs.hxx index 17591adb16..e349689193 100644 --- a/src/XCAFPrs/XCAFPrs.hxx +++ b/src/XCAFPrs/XCAFPrs.hxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include class TDF_Label; class TopLoc_Location; @@ -42,7 +42,7 @@ public: //! shape - style correspondence //! The location is for internal use, it //! should be Null location for external call - Standard_EXPORT static void CollectStyleSettings (const TDF_Label& L, const TopLoc_Location& loc, XCAFPrs_DataMapOfShapeStyle& settings); + Standard_EXPORT static void CollectStyleSettings (const TDF_Label& L, const TopLoc_Location& loc, XCAFPrs_IndexedDataMapOfShapeStyle& settings, const Quantity_ColorRGBA& theLayerColor = Quantity_ColorRGBA(Quantity_NOC_WHITE)); //! Set ViewNameMode for indicate display names or not. Standard_EXPORT static void SetViewNameMode (const Standard_Boolean viewNameMode); diff --git a/src/XCAFPrs/XCAFPrs_AISObject.cxx b/src/XCAFPrs/XCAFPrs_AISObject.cxx index 44d92c1e19..eb33f41910 100644 --- a/src/XCAFPrs/XCAFPrs_AISObject.cxx +++ b/src/XCAFPrs/XCAFPrs_AISObject.cxx @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include @@ -133,7 +133,7 @@ void XCAFPrs_AISObject::DispatchStyles (const Standard_Boolean theToSyncStyles) // Collecting information on colored subshapes TopLoc_Location aLoc; - XCAFPrs_DataMapOfShapeStyle aSettings; + XCAFPrs_IndexedDataMapOfShapeStyle aSettings; XCAFPrs::CollectStyleSettings (myLabel, aLoc, aSettings); // Getting default colors @@ -146,12 +146,12 @@ void XCAFPrs_AISObject::DispatchStyles (const Standard_Boolean theToSyncStyles) // collect sub-shapes with the same style into compounds BRep_Builder aBuilder; - NCollection_DataMap aStyleGroups; - for (XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle aStyledShapeIter (aSettings); + NCollection_IndexedDataMap aStyleGroups; + for (XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle aStyledShapeIter (aSettings); aStyledShapeIter.More(); aStyledShapeIter.Next()) { TopoDS_Compound aComp; - if (aStyleGroups.Find (aStyledShapeIter.Value(), aComp)) + if (aStyleGroups.FindFromKey (aStyledShapeIter.Value(), aComp)) { aBuilder.Add (aComp, aStyledShapeIter.Key()); continue; @@ -159,12 +159,16 @@ void XCAFPrs_AISObject::DispatchStyles (const Standard_Boolean theToSyncStyles) aBuilder.MakeCompound (aComp); aBuilder.Add (aComp, aStyledShapeIter.Key()); - aStyleGroups.Bind (aStyledShapeIter.Value(), aComp); + TopoDS_Compound* aMapShape = aStyleGroups.ChangeSeek (aStyledShapeIter.Value()); + if (aMapShape == NULL) + aStyleGroups.Add (aStyledShapeIter.Value(), aComp); + else + *aMapShape = aComp; } aSettings.Clear(); // assign custom aspects - for (NCollection_DataMap::Iterator aStyleGroupIter (aStyleGroups); + for (NCollection_IndexedDataMap::Iterator aStyleGroupIter (aStyleGroups); aStyleGroupIter.More(); aStyleGroupIter.Next()) { const TopoDS_Compound& aComp = aStyleGroupIter.Value(); diff --git a/src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx b/src/XCAFPrs/XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle.hxx similarity index 77% rename from src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx rename to src/XCAFPrs/XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle.hxx index 11c83b4f75..3dc79b7bdc 100644 --- a/src/XCAFPrs/XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle.hxx +++ b/src/XCAFPrs/XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle.hxx @@ -12,9 +12,9 @@ // commercial license or contractual agreement. -#ifndef XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle_HeaderFile -#define XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle_HeaderFile +#ifndef XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle_HeaderFile +#define XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle_HeaderFile -#include +#include #endif diff --git a/src/XCAFPrs/XCAFPrs_DataMapOfShapeStyle.hxx b/src/XCAFPrs/XCAFPrs_IndexedDataMapOfShapeStyle.hxx similarity index 65% rename from src/XCAFPrs/XCAFPrs_DataMapOfShapeStyle.hxx rename to src/XCAFPrs/XCAFPrs_IndexedDataMapOfShapeStyle.hxx index 91aef6b9bb..e3b48a28c2 100644 --- a/src/XCAFPrs/XCAFPrs_DataMapOfShapeStyle.hxx +++ b/src/XCAFPrs/XCAFPrs_IndexedDataMapOfShapeStyle.hxx @@ -13,16 +13,16 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef XCAFPrs_DataMapOfShapeStyle_HeaderFile -#define XCAFPrs_DataMapOfShapeStyle_HeaderFile +#ifndef XCAFPrs_IndexedDataMapOfShapeStyle_HeaderFile +#define XCAFPrs_IndexedDataMapOfShapeStyle_HeaderFile #include #include #include -#include +#include -typedef NCollection_DataMap XCAFPrs_DataMapOfShapeStyle; -typedef NCollection_DataMap::Iterator XCAFPrs_DataMapIteratorOfDataMapOfShapeStyle; +typedef NCollection_IndexedDataMap XCAFPrs_IndexedDataMapOfShapeStyle; +typedef NCollection_IndexedDataMap::Iterator XCAFPrs_DataMapIteratorOfIndexedDataMapOfShapeStyle; #endif diff --git a/src/XDEDRAW/XDEDRAW.cxx b/src/XDEDRAW/XDEDRAW.cxx index 53e003c83b..606a6118c8 100644 --- a/src/XDEDRAW/XDEDRAW.cxx +++ b/src/XDEDRAW/XDEDRAW.cxx @@ -304,21 +304,49 @@ static void StatAssembly(const TDF_Label L, NbAreaProp++; } Handle(XCAFDoc_ColorTool) CTool = XCAFDoc_DocumentTool::ColorTool(aDoc->Main()); + Handle(XCAFDoc_LayerTool) LTool = XCAFDoc_DocumentTool::LayerTool(aDoc->Main()); Quantity_ColorRGBA col; Standard_Boolean IsColor = Standard_False; + Standard_Boolean IsByLayer = Standard_False; if(CTool->GetColor(L,XCAFDoc_ColorGen,col)) IsColor = Standard_True; else if(CTool->GetColor(L,XCAFDoc_ColorSurf,col)) IsColor = Standard_True; else if(CTool->GetColor(L,XCAFDoc_ColorCurv,col)) IsColor = Standard_True; - if(IsColor) { - TCollection_AsciiString Entry1; - Entry1 = col.GetRGB().StringName(col.GetRGB().Name()); - if(PrintStructMode) di<<"Color("<IsColorByLayer(L)) + IsByLayer = Standard_True; + if(IsColor || IsByLayer) { + if(IsByLayer) + { + Handle(TColStd_HSequenceOfExtendedString) aLayerS; + LTool->GetLayers(L, aLayerS); + // Currently for DXF pnly, thus + // only 1 Layer should be. + if(aLayerS->Length() == 1) + { + TDF_Label aLayer = LTool->FindLayer (aLayerS->First()); + Quantity_ColorRGBA aColor; + if (CTool->GetColor (aLayer, XCAFDoc_ColorGen, aColor)) + { + TCollection_AsciiString aColorName = aColor.GetRGB().StringName(aColor.GetRGB().Name()); + di<<"Color(" << aColorName.ToCString() << ") "; + } + else + { + di<<"Color(ByLayer) "; + } + } + NbShapesWithColor++; + } + else + { + TCollection_AsciiString Entry1; + Entry1 = col.GetRGB().StringName(col.GetRGB().Name()); + if(PrintStructMode) di<<"Color("<Main()); Handle(TColStd_HSequenceOfExtendedString) aLayerS; LTool->GetLayers(L, aLayerS); if(!aLayerS.IsNull() && aLayerS->Length()>0) {