0030789: Data Exchange - Some names are lost during STEP import

Add importing name from PRODUCT_DEFINITION_WITH_ASSOCIATED_DOCUMENTS STEP entity.
Update test cases with files contained this entity.

diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 71b1857eb7dada8486dc48485cce45d58dae3bf8..3aa10e222a05521924727b7ac4b10211be620b57 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -39,6 +39,7 @@
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
+#include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 #include <StepBasic_Unit.hxx>
@@ -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 (file)
index 0000000..263c49d
--- /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 d424b9911c2f6b31e5436f241bbe9118f2bff5ea..4997743f7c1aa9db1945e0e5ee53dec2d9c30933 100644 (file)
--- 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 1f6623ea64c84d38492c440b201be9aaa0275b74..8c07e86a097ab35e7b57f60a20f06d5c9e03a35b 100644 (file)
--- 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 23512ea0e83e5d0f93ccc46e86c7b3e0c9fe2f6f..042ffc7482d2ea3e0a2f3b4369e65297fa348b5c 100644 (file)
--- 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 9f82b2fdbcfc353f0b646ad6ee53d740a5d9ba12..ecff59972f6e6c09083461d9e2315fa1b0df4ec7 100644 (file)
--- 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 9184c0ee9a3763769a22f7bba5ade50b1a955e93..8ccecfb821fc5ca14a1bc56fd47fd822696992f0 100644 (file)
--- 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 760b8ecc78f8d29f5d4c646997322bd4df8ebf67..5475058ffd4dd88ae51b0bfb231c252ae38fd098 100644 (file)
--- 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 d3d2f1cace236886648bc282d5b1f5c5d72863fd..ad26e52a0159af960468d08900d6e7bcc21bbbb8 100644 (file)
--- 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 97fa607eb58275daa986f5a93480773f30854744..1242c13735f2ce6f23a8eb37436ef91734ee4cde 100644 (file)
--- 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 003a8f78e9f0237ec6d4702474e7abc0bdfd519e..f952665d4e8df81c5f453106f7c8e8884673bb70 100644 (file)
--- 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 ce179f24e558d29b8720a7fa14fd9a64cc95b7b0..4631ecc60931f00940d6b4fcd84715ced1180248 100644 (file)
--- 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 cdd67fe5e80fa20580b11bc93b6d6d30ed09cca3..2b0a7dde325087c1b34fec5a639fc0bc53a73bc6 100644 (file)
--- 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 18d2d0d0c18a0e9d5dbf9891d01aa613f2d17868..a216add2c32a6d84de04253e631cebc1b0bd397a 100644 (file)
--- 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 9b055e4acdc693cd1314f5f245ec5700f833fbdd..d9bfe0e9fa4a5379d5bfed8f805525385ab06d31 100644 (file)
--- 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 bc6017ec215965d622212c1d8d079848cbd382c9..e37ba69dd0abf2c6461f0e9eeeb2b14c4002f317 100644 (file)
--- 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 fa94104c89cfaaff98f0f8713a8c93a942c07f78..824432932cb3948e8bed056a69b6d001e778fca3 100644 (file)
--- 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 4be44c28250b44c6fd33eb52c72fef0e74015c05..58174d7ce72cdbc59adeffe1b758f3f95992bc43 100644 (file)
--- 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 4dc5da95482adec06f96faefe4f84a44f12694d4..a418c71f3e32653b3b9fa8d9ac1dcb34a5d9dcbd 100644 (file)
--- 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 b7eb42f54b1cb30fb58423c79a55e5f3f6e67114..9b098e01016f835724548b57edfe55ce7c6b2e60 100644 (file)
--- 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 3c88404d08b8fc5048c20cf8b68dc364032ef5c3..7388410e0e0435c898fae75550a8e16a4602970e 100644 (file)
--- 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 d3573127042ed7af9ea72b949ddd9b8fb5ff627f..4cec7b4717314bbf5ffc94987e41187968d8341f 100644 (file)
--- 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   =   (  )