diff --git a/src/IGESCAFControl/IGESCAFControl_Reader.cxx b/src/IGESCAFControl/IGESCAFControl_Reader.cxx index c599215d2a..e0067f4ea4 100755 --- a/src/IGESCAFControl/IGESCAFControl_Reader.cxx +++ b/src/IGESCAFControl/IGESCAFControl_Reader.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,8 @@ #include #include #include +#include +#include //======================================================================= //function : IGESCAFControl_Reader @@ -80,6 +83,94 @@ static void checkColorRange (Standard_Real& theCol) if ( theCol > 100. ) theCol = 100.; } +static inline Standard_Boolean IsComposite (const TopoDS_Shape& theShape) +{ + if( theShape.ShapeType() == TopAbs_COMPOUND) + { + if(!theShape.Location().IsIdentity()) + return Standard_True; + TopoDS_Iterator anIt( theShape, Standard_False, Standard_False ); + + for (; anIt.More() ; anIt.Next()) + { + if( IsComposite (anIt.Value())) + return Standard_True; + } + + } + return Standard_False; +} + +//======================================================================= +//function : AddCompositeShape +//purpose : Recursively adds composite shapes (TopoDS_Compounds) into the XDE document. +// If the compound does not contain nested compounds then adds it +// as no-assembly (i.e. no individual labels for sub-shapes), as this +// combination is often encountered in IGES (e.g. Group of Trimmed Surfaces). +// If the compound does contain nested compounds then adds it as an +// assembly. +// The construction happens bottom-up, i.e. the most deep sub-shapes are added +// first. +// If theIsTop is False (in a recursive call) then sub-shapes are added without +// a location. This is to ensure that no extra label in the XDE document is +// created for an instance (as otherwise, XDE will consider it as a free +// shape). Correct location and instance will be created when adding a parent +// compound. +// theMap is used to avoid visiting the same compound. +//======================================================================= +static void AddCompositeShape (const Handle(XCAFDoc_ShapeTool)& theSTool, + const TopoDS_Shape& theShape, + Standard_Boolean theConsiderLoc, + TopTools_MapOfShape& theMap) +{ + TopoDS_Shape aShape = theShape; + TopLoc_Location aLoc = theShape.Location(); + if (!theConsiderLoc && !aLoc.IsIdentity()) + aShape.Location( TopLoc_Location() ); + if (!theMap.Add (aShape)) + return; + + TopoDS_Iterator anIt( theShape, Standard_False, Standard_False ); + Standard_Boolean aHasCompositeSubShape = Standard_False; + TopoDS_Compound aSimpleShape; + BRep_Builder aB; + aB.MakeCompound( aSimpleShape); + TopoDS_Compound aCompShape; + aB.MakeCompound( aCompShape); + Standard_Integer nbSimple = 0; + + for (; anIt.More(); anIt.Next()) { + const TopoDS_Shape& aSubShape = anIt.Value(); + if (IsComposite (aSubShape)) { + aHasCompositeSubShape = Standard_True; + AddCompositeShape( theSTool, aSubShape,Standard_False ,theMap ); + aB.Add( aCompShape, aSubShape); + } + else + { + aB.Add(aSimpleShape, aSubShape); + nbSimple++; + } + } + //case of hybrid shape + if( nbSimple && aHasCompositeSubShape) + { + theSTool->AddShape( aSimpleShape, Standard_False, Standard_False ); + TopoDS_Compound aNewShape; + BRep_Builder aB; + aB.MakeCompound(aNewShape); + aB.Add(aNewShape, aSimpleShape); + aB.Add(aNewShape,aCompShape); + //if (!aLoc.IsIdentity()) + // aNewShape.Location(aLoc ); + aNewShape.Orientation(theShape.Orientation()); + theSTool->AddShape( aNewShape, aHasCompositeSubShape, Standard_False ); + } + else + theSTool->AddShape( aShape, aHasCompositeSubShape, Standard_False ); + return; +} + Standard_Boolean IGESCAFControl_Reader::Transfer (Handle(TDocStd_Document) &doc) { // read all shapes @@ -100,7 +191,13 @@ Standard_Boolean IGESCAFControl_Reader::Transfer (Handle(TDocStd_Document) &doc) for(i=1; i<=num; i++) { TopoDS_Shape sh = Shape ( i ); // ---- HERE -- to add check [ assembly / hybrid model ] - STool->AddShape ( sh, Standard_False ); + if( !IsComposite (sh)) + STool->AddShape( sh, Standard_False ); + else { + TopTools_MapOfShape aMap; + AddCompositeShape( STool, sh,Standard_True, aMap ); + + } } // added by skl 13.10.2003 diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx index 484c318d91..2949e9f623 100755 --- a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx @@ -524,7 +524,10 @@ TDF_Label XCAFDoc_ShapeTool::addShape (const TopoDS_Shape& S, const Standard_Boo //for(Standard_Integer i=1; i<=tmpMap.Extent(); i++) //mySubShapes.Bind(tmpMap.FindKey(i),ShapeLabel); for(Standard_Integer i=1; i<=A->GetMap().Extent(); i++) - mySubShapes.Bind(A->GetMap().FindKey(i),ShapeLabel); + { + TopoDS_Shape aSh = A->GetMap().FindKey(i); + mySubShapes.Bind(aSh,ShapeLabel); + } //mySubShapes.Bind(ShapeLabel,A->GetMap()); } diff --git a/tests/bugs/xde/bug23921 b/tests/bugs/xde/bug23921 new file mode 100644 index 0000000000..1d5427acc5 --- /dev/null +++ b/tests/bugs/xde/bug23921 @@ -0,0 +1,25 @@ +puts "============" +puts "OCC23921" +puts "============" +puts "" +################################################################# +# IGES reader cannot map subshapes colors inside nested assemblies +################################################################# + +pload DCAF + +NewDocument D XmlXCAF + +ReadIges D [locate_data_file bug23921_case2.igs] + +#XShow D +# + +XGetOneShape result D + +vinit +vsetdispmode 1 +vdisplay result +vfit + +set only_screen 1 diff --git a/tests/de/iges_1/H5 b/tests/de/iges_1/H5 old mode 100644 new mode 100755 index 908fbbaa9e..e0afebb3d7 --- a/tests/de/iges_1/H5 +++ b/tests/de/iges_1/H5 @@ -9,10 +9,10 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 53 ) Warnings = 36 ( 167 ) Summary = 36 ( 220 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 42 ( 42 ) Summary = 1134 ( 1133 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 42 ( 42 ) Summary = 1134 ( 1135 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 42 ( 42 ) FreeWire = 8 ( 58 ) FreeEdge = 217 ( 217 ) SharedEdge = 413 ( 395 ) TOLERANCE : MaxTol = 0.9314567018 ( 0.01444583491 ) AvgTol = 0.01569636351 ( 0.0003004299328 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 141 ( 209 ) N2Labels = 0 ( 0 ) TotalLabels = 144 ( 212 ) NameLabels = 144 ( 172 ) ColorLabels = 141 ( 209 ) LayerLabels = 140 ( 208 ) +LABELS : N0Labels = 3 ( 6 ) N1Labels = 193 ( 264 ) N2Labels = 0 ( 0 ) TotalLabels = 196 ( 270 ) NameLabels = 144 ( 230 ) ColorLabels = 193 ( 261 ) LayerLabels = 192 ( 209 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) COLORS : Colors = BLUE1 CYAN1 MAGENTA2 RED TURQUOISE3 WHITE ( BLUE1 CYAN1 MAGENTA2 RED TURQUOISE3 WHITE ) diff --git a/tests/de/iges_1/H7 b/tests/de/iges_1/H7 old mode 100644 new mode 100755 index 084a93869a..f97a13e55e --- a/tests/de/iges_1/H7 +++ b/tests/de/iges_1/H7 @@ -8,10 +8,10 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 53 ) Warnings = 2 ( 632 ) Summary = 2 ( 685 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1766 ( 1766 ) Summary = 18585 ( 18585 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1766 ( 1766 ) Summary = 18585 ( 18587 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1766 ( 1766 ) FreeWire = 0 ( 2 ) FreeEdge = 104 ( 104 ) SharedEdge = 7470 ( 7469 ) TOLERANCE : MaxTol = 0.1881003203 ( 0.1881003203 ) AvgTol = 0.0004558439058 ( 0.0004561075883 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 1816 ( 3099 ) N2Labels = 0 ( 0 ) TotalLabels = 1819 ( 3102 ) NameLabels = 1819 ( 1961 ) ColorLabels = 1816 ( 3099 ) LayerLabels = 1816 ( 3099 ) +LABELS : N0Labels = 3 ( 6 ) N1Labels = 1868 ( 3154 ) N2Labels = 0 ( 0 ) TotalLabels = 1871 ( 3160 ) NameLabels = 1819 ( 2019 ) ColorLabels = 1868 ( 3151 ) LayerLabels = 1868 ( 3100 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) COLORS : Colors = BLUE1 MAGENTA2 ORANGE RED WHITE ( BLUE1 MAGENTA2 ORANGE RED WHITE ) diff --git a/tests/de/iges_2/A6 b/tests/de/iges_2/A6 old mode 100644 new mode 100755 index 3eb067b023..7b026da663 --- a/tests/de/iges_2/A6 +++ b/tests/de/iges_2/A6 @@ -12,11 +12,11 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 565 ( 57 ) Summary = 565 ( 57 CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 5 ) Shell = 0 ( 5 ) Face = 93 ( 93 ) Summary = 5965 ( 574 ) STATSHAPE : Solid = 0 ( 5 ) Shell = 0 ( 5 ) Face = 93 ( 93 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2876 ( 211 ) -TOLERANCE : MaxTol = 1e-005 ( 0.9051733624 ) AvgTol = 9.894427245e-006 ( 0.243781117 ) -LABELS : N0Labels = 1 ( 2 ) N1Labels = 93 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 94 ( 2 ) NameLabels = 1 ( 2 ) ColorLabels = 93 ( 1 ) LayerLabels = 0 ( 0 ) +TOLERANCE : MaxTol = 1e-05 ( 0.9051733624 ) AvgTol = 9.894427245e-06 ( 0.243781117 ) +LABELS : N0Labels = 1 ( 8 ) N1Labels = 93 ( 11 ) N2Labels = 0 ( 0 ) TotalLabels = 94 ( 19 ) NameLabels = 1 ( 14 ) ColorLabels = 93 ( 12 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 1 ( 6 ) -COLORS : Colors = WHITE ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) +NCOLORS : NColors = 5 ( 6 ) +COLORS : Colors = BLUE1 GREEN MAGENTA1 RED YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1 old mode 100644 new mode 100755 index a4673b69b8..6a2fe57b83 --- a/tests/de/iges_2/B1 +++ b/tests/de/iges_2/B1 @@ -2,23 +2,23 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: Exception in Segment()" +puts "TODO CR23096 ALL: LAYERS : Faulty" set filename CATIA01.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 480 ) Warnings = 328 ( 4630 ) Summary = 328 ( 5110 ) +TPSTAT : Faulties = 0 ( 480 ) Warnings = 326 ( 4630 ) Summary = 326 ( 5110 ) CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) Summary = 60875 ( 60888 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) Summary = 60875 ( 60890 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 732 ( 732 ) FreeWire = 1612 ( 1613 ) FreeEdge = 16359 ( 16359 ) SharedEdge = 22931 ( 22935 ) -TOLERANCE : MaxTol = 0.6032674714 ( 20.1302013 ) AvgTol = 0.001486791291 ( 0.007274283982 ) -LABELS : N0Labels = 4 ( 4 ) N1Labels = 11017 ( 17451 ) N2Labels = 0 ( 0 ) TotalLabels = 11021 ( 17455 ) NameLabels = 10620 ( 12665 ) ColorLabels = 11018 ( 17452 ) LayerLabels = 10917 ( 17301 ) +TOLERANCE : MaxTol = 0.6032674714 ( 20.1302013 ) AvgTol = 0.001486789868 ( 0.007274283982 ) +LABELS : N0Labels = 4 ( 7 ) N1Labels = 11017 ( 17868 ) N2Labels = 0 ( 0 ) TotalLabels = 11021 ( 17875 ) NameLabels = 10620 ( 13085 ) ColorLabels = 11018 ( 17867 ) LayerLabels = 10517 ( 17715 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 17 ( 17 ) COLORS : Colors = BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ( BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ) -NLAYERS : NLayers = 16 ( 16 ) -LAYERS : Layers = 1 101 102 104 106 107 108 152 154 156 158 2 240 255 6 7 ( 1 101 102 104 106 107 108 152 154 156 158 2 240 255 6 7 ) +NLAYERS : NLayers = 16 ( 17 ) +LAYERS : Layers = 1 101 102 104 106 107 108 152 154 156 158 2 240 255 6 7 ( 1 101 102 104 106 107 108 152 154 156 158 2 239 240 255 6 7 ) } diff --git a/tests/de/iges_2/C8 b/tests/de/iges_2/C8 old mode 100644 new mode 100755 index dfdf542e2d..ceae5241ad --- a/tests/de/iges_2/C8 +++ b/tests/de/iges_2/C8 @@ -1,6 +1,6 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR23096 ALL: COLORS : Faulty" +puts "TODO CR23096 ALL: LAYERS : Faulty" set filename Disc.igs @@ -11,12 +11,12 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) Summary = 125 ( 126 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) FreeWire = 0 ( 0 ) FreeEdge = 46 ( 46 ) SharedEdge = 46 ( 46 ) -TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) -LABELS : N0Labels = 1 ( 2 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 2 ) NameLabels = 1 ( 2 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) +TOLERANCE : MaxTol = 1e-07 ( 1e-07 ) AvgTol = 1e-07 ( 1e-07 ) +LABELS : N0Labels = 1 ( 3 ) N1Labels = 46 ( 47 ) N2Labels = 0 ( 0 ) TotalLabels = 47 ( 50 ) NameLabels = 1 ( 50 ) ColorLabels = 46 ( 46 ) LayerLabels = 0 ( 47 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 0 ( 2 ) -COLORS : Colors = ( WHITE YELLOW ) -NLAYERS : NLayers = 0 ( 0 ) -LAYERS : Layers = ( ) +NCOLORS : NColors = 2 ( 2 ) +COLORS : Colors = WHITE YELLOW ( WHITE YELLOW ) +NLAYERS : NLayers = 0 ( 2 ) +LAYERS : Layers = ( 1 2 ) } diff --git a/tests/de/iges_2/F2 b/tests/de/iges_2/F2 old mode 100644 new mode 100755 index 7bd3276127..f073fbce6d --- a/tests/de/iges_2/F2 +++ b/tests/de/iges_2/F2 @@ -11,14 +11,14 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 369 ) Warnings = 22 ( 979 ) Summary = 22 ( 1348 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 73 ( 73 ) Summary = 13303 ( 13310 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 73 ( 73 ) Summary = 13303 ( 13312 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 73 ( 73 ) FreeWire = 409 ( 414 ) FreeEdge = 4891 ( 4891 ) SharedEdge = 5892 ( 5893 ) TOLERANCE : MaxTol = 0.6679845366 ( 0.6679845366 ) AvgTol = 0.004666698119 ( 0.004573791805 ) -LABELS : N0Labels = 4 ( 4 ) N1Labels = 740 ( 1738 ) N2Labels = 0 ( 0 ) TotalLabels = 744 ( 1742 ) NameLabels = 744 ( 1222 ) ColorLabels = 740 ( 1738 ) LayerLabels = 208 ( 819 ) +LABELS : N0Labels = 4 ( 7 ) N1Labels = 804 ( 1805 ) N2Labels = 0 ( 0 ) TotalLabels = 808 ( 1812 ) NameLabels = 744 ( 1292 ) ColorLabels = 804 ( 1802 ) LayerLabels = 208 ( 884 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 4 ( 7 ) -COLORS : Colors = GREEN MAGENTA4 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA4 RED WHITE ) -NLAYERS : NLayers = 6 ( 8 ) -LAYERS : Layers = 200 214 240 4 51 7 ( 192 200 214 221 240 4 51 7 ) +NCOLORS : NColors = 6 ( 7 ) +COLORS : Colors = CYAN1 GREEN MAGENTA1 MAGENTA4 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA4 RED WHITE ) +NLAYERS : NLayers = 6 ( 10 ) +LAYERS : Layers = 200 214 240 4 51 7 ( 192 200 214 221 239 240 255 4 51 7 ) } diff --git a/tests/de/iges_2/F3 b/tests/de/iges_2/F3 old mode 100644 new mode 100755 index 884b2a46f3..533dece79a --- a/tests/de/iges_2/F3 +++ b/tests/de/iges_2/F3 @@ -9,16 +9,16 @@ set filename BUC60195.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 368 ) Warnings = 57 ( 1204 ) Summary = 57 ( 1572 ) +TPSTAT : Faulties = 0 ( 367 ) Warnings = 57 ( 1205 ) Summary = 57 ( 1572 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 211 ( 211 ) Summary = 12556 ( 12567 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 211 ( 211 ) Summary = 12556 ( 12569 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 211 ( 211 ) FreeWire = 255 ( 267 ) FreeEdge = 3643 ( 3643 ) SharedEdge = 5784 ( 5784 ) -TOLERANCE : MaxTol = 0.9498862984 ( 0.9498862984 ) AvgTol = 0.008210119431 ( 0.008216800661 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 390 ( 1874 ) N2Labels = 0 ( 0 ) TotalLabels = 393 ( 1877 ) NameLabels = 393 ( 800 ) ColorLabels = 390 ( 1874 ) LayerLabels = 386 ( 1856 ) +TOLERANCE : MaxTol = 0.9498862984 ( 0.9498862984 ) AvgTol = 0.008210118978 ( 0.008216800661 ) +LABELS : N0Labels = 3 ( 6 ) N1Labels = 454 ( 1941 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 1947 ) NameLabels = 393 ( 870 ) ColorLabels = 454 ( 1938 ) LayerLabels = 386 ( 1921 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 3 ( 7 ) -COLORS : Colors = GREEN RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) -NLAYERS : NLayers = 3 ( 4 ) -LAYERS : Layers = 200 240 4 ( 192 200 240 4 ) +NCOLORS : NColors = 5 ( 7 ) +COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +NLAYERS : NLayers = 3 ( 6 ) +LAYERS : Layers = 200 240 4 ( 192 200 239 240 255 4 ) } diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4 old mode 100644 new mode 100755 index 350484e2c0..ceb88ef222 --- a/tests/de/iges_2/F4 +++ b/tests/de/iges_2/F4 @@ -1,21 +1,23 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" -puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" +puts "TODO CR23096 ALL: STATSHAPE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO CR23096 ALL: COLORS : Faulty" -puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" +puts "TODO CR23096 ALL: COLORS : Faulty" + + +puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" set LinuxDiff 2 set filename buc60894.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 30 ( 36 ) Warnings = 528 ( 1854 ) Summary = 558 ( 1890 ) +TPSTAT : Faulties = 0 ( 36 ) Warnings = 600 ( 1854 ) Summary = 600 ( 1890 ) CHECKSHAPE : Wires = 7 ( 6 ) Faces = 7 ( 6 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3500 ( 3499 ) Summary = 43166 ( 43105 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3500 ( 3499 ) Summary = 43166 ( 43109 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3500 ( 3499 ) FreeWire = 0 ( 0 ) FreeEdge = 164 ( 164 ) SharedEdge = 18147 ( 18117 ) -TOLERANCE : MaxTol = 0.9816000285 ( 5.284023931 ) AvgTol = 0.02459127692 ( 0.02803193243 ) -LABELS : N0Labels = 12 ( 24 ) N1Labels = 3661 ( 3662 ) N2Labels = 0 ( 0 ) TotalLabels = 3673 ( 3686 ) NameLabels = 12 ( 3684 ) ColorLabels = 3661 ( 3662 ) LayerLabels = 0 ( 0 ) +TOLERANCE : MaxTol = 0.9816000285 ( 5.284023931 ) AvgTol = 0.02459126458 ( 0.02803193293 ) +LABELS : N0Labels = 12 ( 30 ) N1Labels = 3661 ( 3666 ) N2Labels = 0 ( 0 ) TotalLabels = 3673 ( 3696 ) NameLabels = 1379 ( 3694 ) ColorLabels = 3661 ( 3662 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 11 ) COLORS : Colors = BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE ( BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE YELLOW ) diff --git a/tests/de/iges_2/F5 b/tests/de/iges_2/F5 old mode 100644 new mode 100755 index dbbeab59b6..937f6d3043 --- a/tests/de/iges_2/F5 +++ b/tests/de/iges_2/F5 @@ -1,23 +1,23 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" -puts "TODO CR23096 ALL: LAYERS : Faulty" +puts "TODO CR23096 ALL: LAYERS : Faulty" + set filename BUC60898.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 6 ( 126 ) Warnings = 24 ( 678 ) Summary = 30 ( 804 ) +TPSTAT : Faulties = 0 ( 126 ) Warnings = 24 ( 678 ) Summary = 24 ( 804 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 91 ( 91 ) Summary = 23706 ( 23776 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 91 ( 91 ) FreeWire = 304 ( 372 ) FreeEdge = 7104 ( 7104 ) SharedEdge = 10271 ( 10271 ) -TOLERANCE : MaxTol = 0.0779303086 ( 0.07793030858 ) AvgTol = 6.770070428e-005 ( 0.0001043952529 ) -LABELS : N0Labels = 3 ( 3 ) N1Labels = 2325 ( 4109 ) N2Labels = 0 ( 0 ) TotalLabels = 2328 ( 4112 ) NameLabels = 2328 ( 2708 ) ColorLabels = 2325 ( 4109 ) LayerLabels = 220 ( 409 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 91 ( 91 ) Summary = 24023 ( 23781 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 91 ( 91 ) FreeWire = 304 ( 372 ) FreeEdge = 7210 ( 7210 ) SharedEdge = 10377 ( 10271 ) +TOLERANCE : MaxTol = 0.0779303086 ( 0.07793030858 ) AvgTol = 6.700668132e-05 ( 0.0001033335376 ) +LABELS : N0Labels = 4 ( 38 ) N1Labels = 2509 ( 4250 ) N2Labels = 0 ( 0 ) TotalLabels = 2513 ( 4288 ) NameLabels = 2357 ( 2884 ) ColorLabels = 2509 ( 4215 ) LayerLabels = 249 ( 515 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) -NLAYERS : NLayers = 1 ( 2 ) -LAYERS : Layers = 50 ( 5 50 ) +NLAYERS : NLayers = 3 ( 4 ) +LAYERS : Layers = 255 30 50 ( 255 30 5 50 ) } diff --git a/tests/de/iges_2/F6 b/tests/de/iges_2/F6 old mode 100644 new mode 100755 index 20288ce194..481a292e12 --- a/tests/de/iges_2/F6 +++ b/tests/de/iges_2/F6 @@ -10,14 +10,14 @@ set ref_data { DATA : Faulties = 0 ( 1 ) Warnings = 0 ( 0 ) Summary = 0 ( 1 ) TPSTAT : Faulties = 0 ( 146 ) Warnings = 0 ( 153 ) Summary = 0 ( 299 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) Summary = 923 ( 932 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) Summary = 923 ( 934 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 0 ( 0 ) FreeWire = 7 ( 7 ) FreeEdge = 315 ( 315 ) SharedEdge = 315 ( 315 ) -TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 ) -LABELS : N0Labels = 5 ( 6 ) N1Labels = 284 ( 136 ) N2Labels = 0 ( 0 ) TotalLabels = 289 ( 142 ) NameLabels = 5 ( 15 ) ColorLabels = 284 ( 141 ) LayerLabels = 160 ( 141 ) +TOLERANCE : MaxTol = 1e-07 ( 1e-07 ) AvgTol = 1e-07 ( 1e-07 ) +LABELS : N0Labels = 5 ( 16 ) N1Labels = 284 ( 298 ) N2Labels = 0 ( 0 ) TotalLabels = 289 ( 314 ) NameLabels = 5 ( 27 ) ColorLabels = 284 ( 309 ) LayerLabels = 124 ( 309 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -NCOLORS : NColors = 1 ( 5 ) -COLORS : Colors = WHITE ( CYAN1 GREEN RED WHITE YELLOW ) -NLAYERS : NLayers = 1 ( 4 ) -LAYERS : Layers = 1 ( 1 11 2 3 ) +NCOLORS : NColors = 2 ( 5 ) +COLORS : Colors = RED WHITE ( CYAN1 GREEN RED WHITE YELLOW ) +NLAYERS : NLayers = 3 ( 4 ) +LAYERS : Layers = 1 2 3 ( 1 11 2 3 ) } diff --git a/tests/de/iges_2/H3 b/tests/de/iges_2/H3 old mode 100644 new mode 100755 index d1564e6849..cdd3ebe75d --- a/tests/de/iges_2/H3 +++ b/tests/de/iges_2/H3 @@ -2,18 +2,19 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" -puts "TODO CR23096 ALL: LAYERS : Faulty" +puts "TODO CR23096 ALL: LAYERS : Faulty" + set filename UKI60028-1.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 8 ( 150 ) Warnings = 75 ( 789 ) Summary = 83 ( 939 ) +TPSTAT : Faulties = 0 ( 150 ) Warnings = 49 ( 789 ) Summary = 49 ( 939 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 159 ( 159 ) Summary = 7582 ( 7682 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 159 ( 159 ) Summary = 7582 ( 7684 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 159 ( 159 ) FreeWire = 189 ( 284 ) FreeEdge = 1726 ( 1726 ) SharedEdge = 3035 ( 3035 ) -TOLERANCE : MaxTol = 0.6023944505 ( 0.6023945025 ) AvgTol = 0.007299345438 ( 0.0087526096 ) -LABELS : N0Labels = 8 ( 8 ) N1Labels = 949 ( 1807 ) N2Labels = 0 ( 0 ) TotalLabels = 957 ( 1815 ) NameLabels = 955 ( 1258 ) ColorLabels = 949 ( 1807 ) LayerLabels = 917 ( 1774 ) +TOLERANCE : MaxTol = 0.6023944505 ( 0.6023945025 ) AvgTol = 0.007299249683 ( 0.0087526096 ) +LABELS : N0Labels = 8 ( 11 ) N1Labels = 949 ( 1809 ) N2Labels = 0 ( 0 ) TotalLabels = 957 ( 1820 ) NameLabels = 955 ( 1263 ) ColorLabels = 949 ( 1807 ) LayerLabels = 917 ( 1774 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 12 ( 14 ) COLORS : Colors = BLUE1 CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED WHITE YELLOW ( BLUE1 CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 FIREBRICK4 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED TURQUOISE4 WHITE YELLOW ) diff --git a/tests/de/iges_2/H6 b/tests/de/iges_2/H6 old mode 100644 new mode 100755 index 466d146917..5265b5be97 --- a/tests/de/iges_2/H6 +++ b/tests/de/iges_2/H6 @@ -9,14 +9,14 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 93 ) Warnings = 4 ( 129 ) Summary = 4 ( 222 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4 ( 4 ) Summary = 438 ( 236 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4 ( 4 ) Summary = 438 ( 240 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4 ( 4 ) FreeWire = 7 ( 7 ) FreeEdge = 135 ( 135 ) SharedEdge = 151 ( 84 ) TOLERANCE : MaxTol = 1e-07 ( 1.000100002e-07 ) AvgTol = 1e-07 ( 1.00000086e-07 ) -LABELS : N0Labels = 5 ( 5 ) N1Labels = 23 ( 33 ) N2Labels = 0 ( 0 ) TotalLabels = 28 ( 38 ) NameLabels = 28 ( 38 ) ColorLabels = 23 ( 33 ) LayerLabels = 23 ( 33 ) +LABELS : N0Labels = 5 ( 12 ) N1Labels = 106 ( 70 ) N2Labels = 0 ( 0 ) TotalLabels = 111 ( 82 ) NameLabels = 28 ( 82 ) ColorLabels = 106 ( 50 ) LayerLabels = 106 ( 49 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) COLORS : Colors = GOLD3 GREEN LIGHTSEAGREEN YELLOW ( GOLD3 GREEN LIGHTSEAGREEN RED YELLOW ) -NLAYERS : NLayers = 2 ( 2 ) -LAYERS : Layers = 201 254 ( 201 254 ) +NLAYERS : NLayers = 3 ( 3 ) +LAYERS : Layers = 201 254 255 ( 201 254 255 ) }