diff --git a/src/STEPConstruct/STEPConstruct_Styles.cdl b/src/STEPConstruct/STEPConstruct_Styles.cdl index 9082f1be33..bd5f0a33a7 100644 --- a/src/STEPConstruct/STEPConstruct_Styles.cdl +++ b/src/STEPConstruct/STEPConstruct_Styles.cdl @@ -41,6 +41,7 @@ uses StyledItem from StepVisual, Colour from StepVisual, Color from Quantity, + IndexedMapOfTransient from TColStd, IndexedDataMapOfTransientTransient from TColStd, MechanicalDesignGeometricPresentationRepresentation from StepVisual, ContextDependentShapeRepresentation from StepShape, @@ -176,7 +177,7 @@ is fields myMapOfStyles : IndexedDataMapOfTransientTransient from TColStd; - myStyles : SequenceOfTransient from TColStd; + myStyles : IndexedMapOfTransient from TColStd; myPSA : SequenceOfTransient from TColStd; end Styles; diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx index 8a3f343e94..35e0ee78e6 100644 --- a/src/STEPConstruct/STEPConstruct_Styles.cxx +++ b/src/STEPConstruct/STEPConstruct_Styles.cxx @@ -116,7 +116,7 @@ Standard_Boolean STEPConstruct_Styles::Init (const Handle(XSControl_WorkSession) Standard_Integer STEPConstruct_Styles::NbStyles () const { - return myStyles.Length(); + return myStyles.Extent(); } @@ -127,7 +127,7 @@ Standard_Integer STEPConstruct_Styles::NbStyles () const Handle(StepVisual_StyledItem) STEPConstruct_Styles::Style (const Standard_Integer i) const { - return Handle(StepVisual_StyledItem)::DownCast ( myStyles.Value(i) ); + return Handle(StepVisual_StyledItem)::DownCast ( myStyles.FindKey(i) ); } @@ -150,7 +150,7 @@ void STEPConstruct_Styles::ClearStyles () void STEPConstruct_Styles::AddStyle (const Handle(StepVisual_StyledItem) &style) { - myStyles.Append ( style ); + myStyles.Add ( style ); } @@ -181,7 +181,7 @@ Handle(StepVisual_StyledItem) STEPConstruct_Styles::AddStyle (const Handle(StepR Style = OStyle; } - myStyles.Append ( Style ); + myStyles.Add ( Style ); // for future using myPSA.Append( PSA ); @@ -213,13 +213,13 @@ Handle(StepVisual_StyledItem) STEPConstruct_Styles::AddStyle (const TopoDS_Shape Standard_Boolean STEPConstruct_Styles::CreateMDGPR (const Handle(StepRepr_RepresentationContext) &Context, Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation)& Repr) { - if ( myStyles.Length() <1 ) return Standard_False; + if ( myStyles.Extent() <1 ) return Standard_False; // create MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION Handle(StepRepr_HArray1OfRepresentationItem) elems = - new StepRepr_HArray1OfRepresentationItem ( 1, myStyles.Length() ); - for ( Standard_Integer i=1; i <= myStyles.Length(); i++ ) - elems->SetValue ( i, Handle(StepRepr_RepresentationItem)::DownCast ( myStyles.Value(i) ) ); + new StepRepr_HArray1OfRepresentationItem ( 1, myStyles.Extent() ); + for ( Standard_Integer i=1; i <= myStyles.Extent(); i++ ) + elems->SetValue ( i, Handle(StepRepr_RepresentationItem)::DownCast ( myStyles.FindKey(i) ) ); // create new MDGPR Repr = new StepVisual_MechanicalDesignGeometricPresentationRepresentation; Handle(TCollection_HAsciiString) ReprName = new TCollection_HAsciiString ( "" ); @@ -356,21 +356,33 @@ Standard_Boolean STEPConstruct_Styles::LoadStyles () Standard_Integer nb = model->NbEntities(); Handle(Standard_Type) tMDGPR = STANDARD_TYPE(StepVisual_MechanicalDesignGeometricPresentationRepresentation); Handle(Standard_Type) tDM = STANDARD_TYPE(StepVisual_DraughtingModel); - for (Standard_Integer i = 1; i <= nb; i ++) { + Handle(Standard_Type) tSI = STANDARD_TYPE(StepVisual_StyledItem); + for (Standard_Integer i = 1; i <= nb; i ++) + { Handle(Standard_Transient) enti = model->Value(i); - if ( enti->DynamicType() != tMDGPR && enti->DynamicType() != tDM ) continue; + if ( enti->DynamicType() == tMDGPR || enti->DynamicType() == tDM ) + { + Handle(StepRepr_Representation) container = Handle(StepRepr_Representation)::DownCast ( enti ); - Handle(StepRepr_Representation) container = Handle(StepRepr_Representation)::DownCast ( enti ); - - Standard_Integer nbi = container->NbItems(); - for ( Standard_Integer j=1; j <= nbi; j++ ) { - Handle(StepVisual_StyledItem) style = - Handle(StepVisual_StyledItem)::DownCast ( container->ItemsValue(j) ); - if ( style.IsNull() ) continue; - myStyles.Append ( style ); + Standard_Integer nbi = container->NbItems(); + for ( Standard_Integer j=1; j <= nbi; j++ ) + { + Handle(StepVisual_StyledItem) style = + Handle(StepVisual_StyledItem)::DownCast ( container->ItemsValue(j) ); + if ( style.IsNull() ) continue; + myStyles.Add ( style ); + } + } + else if (enti->DynamicType() == tSI) + { + Handle(StepVisual_StyledItem) aStyledItem = Handle(StepVisual_StyledItem)::DownCast (enti); + if (!myStyles.Contains (aStyledItem)) + { + myStyles.Add (aStyledItem); + } } } - return myStyles.Length() >0; + return !myStyles.IsEmpty(); } diff --git a/tests/de/step_1/A1 b/tests/de/step_1/A1 index 46e95e0d14..0b02ed1498 100644 --- a/tests/de/step_1/A1 +++ b/tests/de/step_1/A1 @@ -12,10 +12,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 15 ( 0 ) Face = 15 ( 15 ) Summary = 187 ( 174 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 15 ( 0 ) Face = 15 ( 15 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 71 ( 71 ) TOLERANCE : MaxTol = 1e-007 ( 1.0001e-007 ) AvgTol = 1e-007 ( 1.000029825e-007 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 15 ( 15 ) N2Labels = 0 ( 0 ) TotalLabels = 16 ( 16 ) NameLabels = 1 ( 1 ) ColorLabels = 15 ( 15 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 1 ( 1 ) +COLORS : Colors = GREEN ( GREEN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/E3 b/tests/de/step_1/E3 index d8402942e5..4821abbdee 100644 --- a/tests/de/step_1/E3 +++ b/tests/de/step_1/E3 @@ -14,11 +14,11 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 21 ( 12 ) Summary = 21 ( 12 ) CHECKSHAPE : Wires = 2 ( 0 ) Faces = 2 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 4 ( 4 ) Shell = 4 ( 4 ) Face = 35 ( 35 ) Summary = 289 ( 266 ) STATSHAPE : Solid = 4 ( 4 ) Shell = 4 ( 4 ) Face = 35 ( 35 ) FreeWire = 0 ( 0 ) FreeEdge = 24 ( 24 ) SharedEdge = 103 ( 103 ) -TOLERANCE : MaxTol = 6.104502198e-006 ( 1e-005 ) AvgTol = 9.283366159e-007 ( 2.903661931e-006 ) -LABELS : N0Labels = 4 ( 4 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 35 ( 35 ) NameLabels = 7 ( 7 ) ColorLabels = 0 ( 0 ) LayerLabels = 28 ( 28 ) +TOLERANCE : MaxTol = 6.104502198e-006 ( 1e-005 ) AvgTol = 9.28336616e-007 ( 2.903661931e-006 ) +LABELS : N0Labels = 4 ( 4 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 35 ( 35 ) NameLabels = 7 ( 7 ) ColorLabels = 28 ( 28 ) LayerLabels = 28 ( 28 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 2 ( 2 ) +COLORS : Colors = CHOCOLATE1 RED ( CHOCOLATE1 RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = {} ( {} ) diff --git a/tests/de/step_1/J7 b/tests/de/step_1/J7 index 3374c153c5..b5dd7d683c 100644 --- a/tests/de/step_1/J7 +++ b/tests/de/step_1/J7 @@ -8,10 +8,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 6 ( 6 ) Summary = 84 ( 79 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 6 ( 6 ) FreeWire = 0 ( 0 ) FreeEdge = 5 ( 5 ) SharedEdge = 30 ( 30 ) TOLERANCE : MaxTol = 0.01960210989 ( 0.01960210989 ) AvgTol = 0.001506671037 ( 0.001506671037 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 16 ( 16 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 11 ( 11 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 5 ( 5 ) ColorLabels = 11 ( 11 ) LayerLabels = 11 ( 11 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 3 ( 3 ) +COLORS : Colors = CHOCOLATE1 LIGHTSEAGREEN TURQUOISE ( CHOCOLATE1 LIGHTSEAGREEN TURQUOISE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = {} ( {} ) diff --git a/tests/de/step_1/J8 b/tests/de/step_1/J8 index f036ffadaf..28a1f92617 100644 --- a/tests/de/step_1/J8 +++ b/tests/de/step_1/J8 @@ -12,10 +12,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 2 ( 2 ) Shell = 2 ( 2 ) Face = 99 ( 99 ) Summary = 655 ( 656 ) STATSHAPE : Solid = 2 ( 2 ) Shell = 2 ( 2 ) Face = 99 ( 99 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 266 ( 266 ) TOLERANCE : MaxTol = 3.000180002 ( 3.000180002 ) AvgTol = 0.1203601833 ( 0.1203606739 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 2 ( 2 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 1 ( 1 ) +COLORS : Colors = RED ( RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = {} ( {} ) diff --git a/tests/de/step_1/J9 b/tests/de/step_1/J9 index a67a81eea9..26dd39b404 100644 --- a/tests/de/step_1/J9 +++ b/tests/de/step_1/J9 @@ -8,10 +8,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 6 ( 6 ) Summary = 102 ( 96 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 6 ( 6 ) Face = 6 ( 6 ) FreeWire = 0 ( 0 ) FreeEdge = 6 ( 6 ) SharedEdge = 35 ( 35 ) TOLERANCE : MaxTol = 0.01889086606 ( 0.01889086606 ) AvgTol = 0.001105643981 ( 0.001105643981 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 14 ( 14 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 12 ( 12 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 20 ( 20 ) N2Labels = 0 ( 0 ) TotalLabels = 23 ( 23 ) NameLabels = 5 ( 5 ) ColorLabels = 12 ( 12 ) LayerLabels = 12 ( 12 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 2 ( 2 ) +COLORS : Colors = CHOCOLATE1 TURQUOISE ( CHOCOLATE1 TURQUOISE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = {} ( {} ) diff --git a/tests/de/step_1/N7 b/tests/de/step_1/N7 index dbd978b576..75dd8e9e99 100644 --- a/tests/de/step_1/N7 +++ b/tests/de/step_1/N7 @@ -11,10 +11,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 182 ( 182 ) Summary = 1237 ( 1237 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 182 ( 182 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 500 ( 500 ) TOLERANCE : MaxTol = 0.0006834695356 ( 0.0006834695356 ) AvgTol = 1.670011327e-005 ( 1.670011329e-005 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 0 ( 0 ) LayerLabels = 33 ( 33 ) +LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 4 ( 4 ) LayerLabels = 33 ( 33 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 3 ( 3 ) +COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = A_FLAECHEN ( A_FLAECHEN ) diff --git a/tests/de/step_2/K4 b/tests/de/step_2/K4 index 1c33794663..19cd4f8e25 100644 --- a/tests/de/step_2/K4 +++ b/tests/de/step_2/K4 @@ -8,10 +8,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 492 ( 492 ) Summary = 3576 ( 3576 ) STATSHAPE : Solid = 57 ( 57 ) Shell = 57 ( 57 ) Face = 1894 ( 1894 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1450 ( 1450 ) TOLERANCE : MaxTol = 1.000100003e-007 ( 1.000100003e-007 ) AvgTol = 1.000093704e-007 ( 1.000093704e-007 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 3 ( 3 ) +COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/K5 b/tests/de/step_2/K5 index 35c86184f1..85f7e16f03 100644 --- a/tests/de/step_2/K5 +++ b/tests/de/step_2/K5 @@ -8,10 +8,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 492 ( 492 ) Summary = 3576 ( 3576 ) STATSHAPE : Solid = 57 ( 57 ) Shell = 57 ( 57 ) Face = 1894 ( 1894 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1450 ( 1450 ) TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 3 ( 3 ) +COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/K8 b/tests/de/step_2/K8 index 53e4fb9370..1b4fb52f5d 100644 --- a/tests/de/step_2/K8 +++ b/tests/de/step_2/K8 @@ -11,10 +11,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 182 ( 182 ) Summary = 1239 ( 1237 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 182 ( 182 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 502 ( 500 ) TOLERANCE : MaxTol = 0.0006834695394 ( 0.000683469539 ) AvgTol = 1.66821616e-005 ( 1.671509331e-005 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 0 ( 0 ) LayerLabels = 33 ( 33 ) +LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 4 ( 4 ) LayerLabels = 33 ( 33 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 3 ( 3 ) +COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = A_FLAECHEN_1 ( A_FLAECHEN_1 ) diff --git a/tests/de/step_3/C9 b/tests/de/step_3/C9 index 45206c69db..56c4c60f35 100644 --- a/tests/de/step_3/C9 +++ b/tests/de/step_3/C9 @@ -11,10 +11,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) Summary = 12742 ( 12742 ) STATSHAPE : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 2117 ( 2117 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 5273 ( 5273 ) TOLERANCE : MaxTol = 0.2515134963 ( 0.2065786276 ) AvgTol = 0.0008034861324 ( 0.0008522149265 ) -LABELS : N0Labels = 9 ( 9 ) N1Labels = 8 ( 8 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 17 ( 17 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 9 ( 9 ) N1Labels = 1311 ( 1311 ) N2Labels = 0 ( 0 ) TotalLabels = 1320 ( 1320 ) NameLabels = 17 ( 17 ) ColorLabels = 1303 ( 1303 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 10 ( 10 ) +COLORS : Colors = AZURE4 CYAN1 GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ( AZURE4 CYAN1 GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/E3 b/tests/de/step_4/E3 index 8199b7838b..ee4af6ef71 100644 --- a/tests/de/step_4/E3 +++ b/tests/de/step_4/E3 @@ -8,10 +8,10 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 621 ( 621 ) Summary = 3645 ( 3645 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 621 ( 621 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1508 ( 1508 ) TOLERANCE : MaxTol = 0.003228376485 ( 0.06828121929 ) AvgTol = 0.0002204490951 ( 0.0004136533175 ) -LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 0 ) -COLORS : Colors = ( ) +NCOLORS : NColors = 1 ( 1 ) +COLORS : Colors = LIGHTGOLDENROD2 ( LIGHTGOLDENROD2 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( )