diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index 71b1857eb7..3aa10e222a 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1146,6 +1147,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadNames(const Handle(XSControl_WorkSes Standard_Integer nb = Model->NbEntities(); Handle(Standard_Type) tNAUO = STANDARD_TYPE(StepRepr_NextAssemblyUsageOccurrence); Handle(Standard_Type) tPD = STANDARD_TYPE(StepBasic_ProductDefinition); + Handle(Standard_Type) tPDWAD = STANDARD_TYPE(StepBasic_ProductDefinitionWithAssociatedDocuments); Handle(TCollection_HAsciiString) name; TDF_Label L; for (Standard_Integer i = 1; i <= nb; i++) { @@ -1179,7 +1181,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadNames(const Handle(XSControl_WorkSes } // for PD get name of associated product - if (enti->DynamicType() == tPD) { + if (enti->DynamicType() == tPD || enti->DynamicType() == tPDWAD) { L.Nullify(); Handle(StepBasic_ProductDefinition) PD = Handle(StepBasic_ProductDefinition)::DownCast(enti); diff --git a/tests/bugs/step/bug30789 b/tests/bugs/step/bug30789 new file mode 100644 index 0000000000..263c49d40b --- /dev/null +++ b/tests/bugs/step/bug30789 @@ -0,0 +1,33 @@ +puts "===============================================================" +puts "0030789: Data Exchange - Some names are lost during STEP import" +puts "===============================================================" +puts "" + +# Load file + +pload DCAF +ReadStep D [locate_data_file bug30789.stp] + +# Check several names came from problematic entities +set name [GetName D 0:1:1:10] +if {$name != "F5347130221100"} { + puts "Error: name of entity is lost." +} +set name [GetName D 0:1:1:20] +if {$name != "A5397301720500"} { + puts "Error: name of entity is lost." +} +set name [GetName D 0:1:1:34] +if {$name != "F5349193000400-CUT01"} { + puts "Error: name of entity is lost." +} +set name [GetName D 0:1:1:48] +if {$name != "F5349195500100-FLX05"} { + puts "Error: name of entity is lost." +} +set name [GetName D 0:1:1:74] +if {$name != "F5349193500000-FLX10"} { + puts "Error: name of entity is lost." +} + +Close D diff --git a/tests/de/step_1/A4 b/tests/de/step_1/A4 index d424b9911c..4997743f7c 100644 --- a/tests/de/step_1/A4 +++ b/tests/de/step_1/A4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 2 ( 2 ) Shell = 2 ( 2 ) Face = 80 ( 80 ) STATSHAPE : Solid = 2 ( 2 ) Shell = 2 ( 2 ) Face = 80 ( 80 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0009825722198 ( 0.0009825722195 ) AvgTol = 7.814603999e-005 ( 7.722132677e-005 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/A7 b/tests/de/step_1/A7 index 1f6623ea64..8c07e86a09 100644 --- a/tests/de/step_1/A7 +++ b/tests/de/step_1/A7 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 8 ( 8 ) Shell = 8 ( 8 ) Face = 101 ( 101 ) STATSHAPE : Solid = 11 ( 11 ) Shell = 11 ( 11 ) Face = 134 ( 134 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0002663644062 ( 0.004247173074 ) AvgTol = 6.037675043e-006 ( 9.943491328e-005 ) -LABELS : N0Labels = 13 ( 13 ) N1Labels = 18 ( 23 ) N2Labels = 0 ( 5 ) TotalLabels = 31 ( 41 ) NameLabels = 27 ( 27 ) ColorLabels = 12 ( 12 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 13 ( 13 ) N1Labels = 18 ( 23 ) N2Labels = 0 ( 5 ) TotalLabels = 31 ( 41 ) NameLabels = 27 ( 32 ) ColorLabels = 12 ( 12 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) diff --git a/tests/de/step_1/B1 b/tests/de/step_1/B1 index 23512ea0e8..042ffc7482 100644 --- a/tests/de/step_1/B1 +++ b/tests/de/step_1/B1 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 226 ( 226 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 226 ( 226 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.004186274562 ( 0.004186274559 ) AvgTol = 6.102189214e-005 ( 6.108789747e-005 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 4 ) N2Labels = 0 ( 2 ) TotalLabels = 5 ( 9 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 4 ) N2Labels = 0 ( 2 ) TotalLabels = 5 ( 9 ) NameLabels = 5 ( 7 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/B8 b/tests/de/step_1/B8 index 9f82b2fdbc..ecff59972f 100644 --- a/tests/de/step_1/B8 +++ b/tests/de/step_1/B8 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 5 ( 5 ) Shell = 5 ( 5 ) Face = 111 ( 111 ) STATSHAPE : Solid = 5 ( 5 ) Shell = 5 ( 5 ) Face = 111 ( 111 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0004869324906 ( 0.0004869324906 ) AvgTol = 2.610567178e-005 ( 2.610567176e-005 ) -LABELS : N0Labels = 6 ( 6 ) N1Labels = 5 ( 6 ) N2Labels = 0 ( 1 ) TotalLabels = 11 ( 13 ) NameLabels = 11 ( 11 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 6 ( 6 ) N1Labels = 5 ( 6 ) N2Labels = 0 ( 1 ) TotalLabels = 11 ( 13 ) NameLabels = 11 ( 12 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) COLORS : Colors = BLUE1 CHARTREUSE CYAN1 RED YELLOW ( BLUE1 CHARTREUSE CYAN1 RED YELLOW ) diff --git a/tests/de/step_1/B9 b/tests/de/step_1/B9 index 9184c0ee9a..8ccecfb821 100644 --- a/tests/de/step_1/B9 +++ b/tests/de/step_1/B9 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 52 ( 52 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 52 ( 52 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0004859831616 ( 0.0004859831006 ) AvgTol = 3.80049368e-005 ( 3.800713022e-005 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/C5 b/tests/de/step_1/C5 index 760b8ecc78..5475058ffd 100644 --- a/tests/de/step_1/C5 +++ b/tests/de/step_1/C5 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 5 ( 5 ) Shell = 5 ( 5 ) Face = 39 ( 39 ) STATSHAPE : Solid = 18 ( 18 ) Shell = 18 ( 18 ) Face = 125 ( 125 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) -LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 17 ) N2Labels = 0 ( 4 ) TotalLabels = 22 ( 30 ) NameLabels = 22 ( 22 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 17 ) N2Labels = 0 ( 4 ) TotalLabels = 22 ( 30 ) NameLabels = 22 ( 26 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 6 ( 6 ) Volume = 6 ( 6 ) Area = 6 ( 6 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/C9 b/tests/de/step_1/C9 index d3d2f1cace..ad26e52a01 100644 --- a/tests/de/step_1/C9 +++ b/tests/de/step_1/C9 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 5 ( 5 ) Shell = 5 ( 5 ) Face = 39 ( 39 ) STATSHAPE : Solid = 18 ( 18 ) Shell = 18 ( 18 ) Face = 125 ( 125 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) -LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 17 ) N2Labels = 0 ( 4 ) TotalLabels = 22 ( 30 ) NameLabels = 22 ( 22 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 17 ) N2Labels = 0 ( 4 ) TotalLabels = 22 ( 30 ) NameLabels = 22 ( 26 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 6 ( 6 ) Volume = 6 ( 6 ) Area = 6 ( 6 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/D2 b/tests/de/step_1/D2 index 97fa607eb5..1242c13735 100644 --- a/tests/de/step_1/D2 +++ b/tests/de/step_1/D2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 132 ( 132 ) STATSHAPE : Solid = 7 ( 7 ) Shell = 7 ( 7 ) Face = 132 ( 132 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0003598511661 ( 0.0003598511659 ) AvgTol = 3.390043964e-005 ( 3.390043961e-005 ) -LABELS : N0Labels = 8 ( 8 ) N1Labels = 7 ( 8 ) N2Labels = 0 ( 1 ) TotalLabels = 15 ( 17 ) NameLabels = 15 ( 15 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 8 ( 8 ) N1Labels = 7 ( 8 ) N2Labels = 0 ( 1 ) TotalLabels = 15 ( 17 ) NameLabels = 15 ( 16 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/D3 b/tests/de/step_1/D3 index 003a8f78e9..f952665d4e 100644 --- a/tests/de/step_1/D3 +++ b/tests/de/step_1/D3 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 113 ( 113 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 113 ( 113 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0009825722198 ( 0.0009825722195 ) AvgTol = 0.0001141914147 ( 0.0001128347789 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/D4 b/tests/de/step_1/D4 index ce179f24e5..4631ecc609 100644 --- a/tests/de/step_1/D4 +++ b/tests/de/step_1/D4 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 127 ( 127 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 127 ( 127 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0009825722198 ( 0.0009825722195 ) AvgTol = 0.0001005180586 ( 9.932542361e-005 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/E9 b/tests/de/step_1/E9 index cdd67fe5e8..2b0a7dde32 100644 --- a/tests/de/step_1/E9 +++ b/tests/de/step_1/E9 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 68 ( 68 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 68 ( 68 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0004859831617 ( 0.0004859831006 ) AvgTol = 3.076845222e-005 ( 3.077022317e-005 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/ZE2 b/tests/de/step_1/ZE2 index 18d2d0d0c1..a216add2c3 100644 --- a/tests/de/step_1/ZE2 +++ b/tests/de/step_1/ZE2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0 ( 0 ) AvgTol = 0 ( 0 ) -LABELS : N0Labels = 2 ( 2 ) N1Labels = 1 ( 3 ) N2Labels = 0 ( 2 ) TotalLabels = 3 ( 7 ) NameLabels = 3 ( 4 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 2 ( 2 ) N1Labels = 1 ( 3 ) N2Labels = 0 ( 2 ) TotalLabels = 3 ( 7 ) NameLabels = 3 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/ZG1 b/tests/de/step_1/ZG1 index 9b055e4acd..d9bfe0e9fa 100644 --- a/tests/de/step_1/ZG1 +++ b/tests/de/step_1/ZG1 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 14 ( 14 ) STATSHAPE : Solid = 1 ( 1 ) Shell = 1 ( 1 ) Face = 14 ( 14 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 7.34727251e-006 ( 7.347307161e-006 ) AvgTol = 1.215889256e-006 ( 1.215894904e-006 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_1/ZG9 b/tests/de/step_1/ZG9 index bc6017ec21..e37ba69dd0 100644 --- a/tests/de/step_1/ZG9 +++ b/tests/de/step_1/ZG9 @@ -12,7 +12,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 22 ( 22 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 3 ( 3 ) Face = 22 ( 22 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 2.100581826e-007 ( 2.098677141e-007 ) AvgTol = 1.07336592e-007 ( 1.07325212e-007 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_2/B6 b/tests/de/step_2/B6 index fa94104c89..824432932c 100644 --- a/tests/de/step_2/B6 +++ b/tests/de/step_2/B6 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 457 ( 457 ) STATSHAPE : Solid = 3 ( 3 ) Shell = 4 ( 4 ) Face = 457 ( 457 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.005476327781 ( 0.009836983218 ) AvgTol = 0.0003525225618 ( 0.000683015021 ) -LABELS : N0Labels = 6 ( 6 ) N1Labels = 5 ( 7 ) N2Labels = 0 ( 2 ) TotalLabels = 11 ( 15 ) NameLabels = 11 ( 11 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 6 ( 6 ) N1Labels = 5 ( 7 ) N2Labels = 0 ( 2 ) TotalLabels = 11 ( 15 ) NameLabels = 11 ( 13 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_2/C2 b/tests/de/step_2/C2 index 4be44c2825..58174d7ce7 100644 --- a/tests/de/step_2/C2 +++ b/tests/de/step_2/C2 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 29 ( 29 ) Shell = 29 ( 29 ) Face = 656 ( 656 ) STATSHAPE : Solid = 91 ( 91 ) Shell = 91 ( 91 ) Face = 2181 ( 2181 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0002458730661 ( 0.0002458730658 ) AvgTol = 6.914882128e-006 ( 6.91488176e-006 ) -LABELS : N0Labels = 53 ( 53 ) N1Labels = 114 ( 137 ) N2Labels = 0 ( 23 ) TotalLabels = 167 ( 213 ) NameLabels = 167 ( 168 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 53 ( 53 ) N1Labels = 114 ( 137 ) N2Labels = 0 ( 23 ) TotalLabels = 167 ( 213 ) NameLabels = 167 ( 190 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_2/C4 b/tests/de/step_2/C4 index 4dc5da9548..a418c71f3e 100644 --- a/tests/de/step_2/C4 +++ b/tests/de/step_2/C4 @@ -11,7 +11,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 14 ( 14 ) Shell = 14 ( 14 ) Face = 396 ( 396 ) STATSHAPE : Solid = 14 ( 14 ) Shell = 14 ( 14 ) Face = 396 ( 396 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0006172563959 ( 0.0006172563965 ) AvgTol = 1.06210764e-005 ( 1.06210764e-005 ) -LABELS : N0Labels = 15 ( 15 ) N1Labels = 14 ( 15 ) N2Labels = 0 ( 1 ) TotalLabels = 29 ( 31 ) NameLabels = 29 ( 29 ) ColorLabels = 14 ( 14 ) LayerLabels = 14 ( 14 ) +LABELS : N0Labels = 15 ( 15 ) N1Labels = 14 ( 15 ) N2Labels = 0 ( 1 ) TotalLabels = 29 ( 31 ) NameLabels = 29 ( 30 ) ColorLabels = 14 ( 14 ) LayerLabels = 14 ( 14 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) COLORS : Colors = AQUAMARINE2 BROWN1 DARKSEAGREEN2 OLIVEDRAB2 ORCHID1 ROYALBLUE2 SLATEBLUE2 ( AQUAMARINE2 BROWN1 DARKSEAGREEN2 OLIVEDRAB2 ORCHID1 ROYALBLUE2 SLATEBLUE2 ) diff --git a/tests/de/step_2/Y5 b/tests/de/step_2/Y5 index b7eb42f54b..9b098e0101 100644 --- a/tests/de/step_2/Y5 +++ b/tests/de/step_2/Y5 @@ -11,8 +11,8 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 53 ( 39 ) Summary = 53 ( 39 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 10 ( 10 ) Shell = 12 ( 12 ) Face = 269 ( 269 ) STATSHAPE : Solid = 10 ( 10 ) Shell = 12 ( 12 ) Face = 269 ( 269 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 0.01008847035 ( 0.01044437072 ) AvgTol = 0.0002927901561 ( 0.0002946170329 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +TOLERANCE : MaxTol = 0.01008847035 ( 0.01044437072 ) AvgTol = 0.0002931816434 ( 0.0002946170329 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_3/E5 b/tests/de/step_3/E5 index 3c88404d08..7388410e0e 100644 --- a/tests/de/step_3/E5 +++ b/tests/de/step_3/E5 @@ -2,7 +2,6 @@ puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" -puts "TODO CR23096 ALL: LABELS : Faulty" set filename trj9_ap209-mp.stp @@ -14,7 +13,7 @@ CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) So NBSHAPES : Solid = 8 ( 4 ) Shell = 8 ( 4 ) Face = 48 ( 24 ) STATSHAPE : Solid = 24 ( 24 ) Shell = 24 ( 24 ) Face = 144 ( 144 ) FreeWire = 0 ( 0 ) TOLERANCE : MaxTol = 0.0009551590893 ( 0.0009551590893 ) AvgTol = 0.0002351426518 ( 0.0002351426518 ) -LABELS : N0Labels = 4 ( 4 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 10 ( 10 ) NameLabels = 10 ( 9 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +LABELS : N0Labels = 4 ( 4 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 10 ( 10 ) NameLabels = 10 ( 10 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( ) diff --git a/tests/de/step_4/A1 b/tests/de/step_4/A1 index d357312704..4cec7b4717 100644 --- a/tests/de/step_4/A1 +++ b/tests/de/step_4/A1 @@ -12,8 +12,8 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 24 ( 38 ) Summary = 24 ( 38 ) CHECKSHAPE : Wires = 0 ( 2 ) Faces = 0 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 8 ( 8 ) Shell = 230 ( 230 ) Face = 734 ( 730 ) STATSHAPE : Solid = 8 ( 8 ) Shell = 230 ( 230 ) Face = 734 ( 730 ) FreeWire = 0 ( 0 ) -TOLERANCE : MaxTol = 0.007776477864 ( 0.009838987775 ) AvgTol = 0.0001629414909 ( 0.0003475319522 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +TOLERANCE : MaxTol = 0.007776477864 ( 0.009838987775 ) AvgTol = 0.0001629414909 ( 0.0003516922103 ) +LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 1 ) TotalLabels = 5 ( 7 ) NameLabels = 5 ( 6 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 0 ( 0 ) COLORS : Colors = ( )