diff --git a/src/Contap/Contap_Contour.cxx b/src/Contap/Contap_Contour.cxx index 22cdbe0387..34c457deeb 100644 --- a/src/Contap/Contap_Contour.cxx +++ b/src/Contap/Contap_Contour.cxx @@ -468,7 +468,6 @@ static void KeepInsidePoints(const Contap_TheSearchInside& solins, { Standard_Integer Nba = solrst.NbSegments(); - if (Nba <= 0) return; Standard_Integer Nbp,indp,inda; Standard_Real U,V,paramproj; gp_Pnt2d toproj,Ptproj; diff --git a/src/HLRBRep/HLRBRep_Surface.cxx b/src/HLRBRep/HLRBRep_Surface.cxx index a1bff019ae..a23229edee 100644 --- a/src/HLRBRep/HLRBRep_Surface.cxx +++ b/src/HLRBRep/HLRBRep_Surface.cxx @@ -49,7 +49,8 @@ HLRBRep_Surface::HLRBRep_Surface () void HLRBRep_Surface::Surface (const TopoDS_Face& F) { - mySurf.Initialize(F,Standard_False); + //mySurf.Initialize(F,Standard_False); + mySurf.Initialize(F,Standard_True); GeomAbs_SurfaceType typ = HLRBRep_BSurfaceTool::GetType(mySurf); switch (typ) { diff --git a/tests/bugs/modalg_6/bug25908 b/tests/bugs/modalg_6/bug25908 index 9adc038081..c39131f747 100755 --- a/tests/bugs/modalg_6/bug25908 +++ b/tests/bugs/modalg_6/bug25908 @@ -20,15 +20,15 @@ compound vl v1l vnl vol vil result set nbshapes_expected " Number of shapes in shape - VERTEX : 93 - EDGE : 47 + VERTEX : 103 + EDGE : 52 WIRE : 0 FACE : 0 SHELL : 0 SOLID : 0 COMPSOLID : 0 COMPOUND : 1 - SHAPE : 141 + SHAPE : 156 " checknbshapes result -ref ${nbshapes_expected} -t -m "HLRToShape" diff --git a/tests/bugs/modalg_6/bug27341_301 b/tests/bugs/modalg_6/bug27341_301 index 5c48031e79..a278496272 100644 --- a/tests/bugs/modalg_6/bug27341_301 +++ b/tests/bugs/modalg_6/bug27341_301 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 1030.62 -checknbshapes result -vertex 236 -edge 119 +checknbshapes result -vertex 258 -edge 130 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_304 b/tests/bugs/modalg_6/bug27341_304 index 0eb1c3b8c7..64ef386f5d 100644 --- a/tests/bugs/modalg_6/bug27341_304 +++ b/tests/bugs/modalg_6/bug27341_304 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 2867.9 -checknbshapes result -vertex 1365 -edge 684 +checknbshapes result -vertex 1375 -edge 689 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_306 b/tests/bugs/modalg_6/bug27341_306 index 96e3667eeb..7698f2a1fc 100644 --- a/tests/bugs/modalg_6/bug27341_306 +++ b/tests/bugs/modalg_6/bug27341_306 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 2893.98 -checknbshapes result -vertex 697 -edge 349 +checknbshapes result -vertex 705 -edge 353 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_307 b/tests/bugs/modalg_6/bug27341_307 index 9981db4839..1ca4fedeec 100644 --- a/tests/bugs/modalg_6/bug27341_307 +++ b/tests/bugs/modalg_6/bug27341_307 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 2282.11 -checknbshapes result -vertex 943 -edge 474 +checknbshapes result -vertex 947 -edge 476 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_308 b/tests/bugs/modalg_6/bug27341_308 index 86251a4488..b8e0622a22 100644 --- a/tests/bugs/modalg_6/bug27341_308 +++ b/tests/bugs/modalg_6/bug27341_308 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 1169.48 -checknbshapes result -vertex 482 -edge 241 +checkprops result -l 1249.94 +checknbshapes result -vertex 490 -edge 245 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_312 b/tests/bugs/modalg_6/bug27341_312 index 6fe0f0822a..326496810a 100644 --- a/tests/bugs/modalg_6/bug27341_312 +++ b/tests/bugs/modalg_6/bug27341_312 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 520.703 -checknbshapes result -vertex 306 -edge 153 +checkprops result -l 534.882 +checknbshapes result -vertex 310 -edge 155 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_313 b/tests/bugs/modalg_6/bug27341_313 index f4f64f6709..a947ba4138 100644 --- a/tests/bugs/modalg_6/bug27341_313 +++ b/tests/bugs/modalg_6/bug27341_313 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 9662.5 -checknbshapes result -vertex 4417 -edge 2215 +checknbshapes result -vertex 4429 -edge 2221 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_314 b/tests/bugs/modalg_6/bug27341_314 index 202779d415..7ee0eb73bd 100644 --- a/tests/bugs/modalg_6/bug27341_314 +++ b/tests/bugs/modalg_6/bug27341_314 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 5910.01 -checknbshapes result -vertex 1406 -edge 703 +checkprops result -l 6141.2 +checknbshapes result -vertex 1444 -edge 722 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_315 b/tests/bugs/modalg_6/bug27341_315 index e2e8168620..b136ae773b 100644 --- a/tests/bugs/modalg_6/bug27341_315 +++ b/tests/bugs/modalg_6/bug27341_315 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 5219.21 -checknbshapes result -vertex 1692 -edge 848 +checkprops result -l 5282.13 +checknbshapes result -vertex 1702 -edge 853 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_316 b/tests/bugs/modalg_6/bug27341_316 index b6fdfd2cfe..d6b6ba4a35 100644 --- a/tests/bugs/modalg_6/bug27341_316 +++ b/tests/bugs/modalg_6/bug27341_316 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 1764.64 -checknbshapes result -vertex 345 -edge 173 +checkprops result -l 1794.57 +checknbshapes result -vertex 349 -edge 175 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_317 b/tests/bugs/modalg_6/bug27341_317 index ba824f05ee..cfa5701fd7 100644 --- a/tests/bugs/modalg_6/bug27341_317 +++ b/tests/bugs/modalg_6/bug27341_317 @@ -22,7 +22,7 @@ build3d result fit -checkprops result -l 2619.72 -checknbshapes result -vertex 578 -edge 289 +checkprops result -l 2774.53 +checknbshapes result -vertex 614 -edge 307 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_318 b/tests/bugs/modalg_6/bug27341_318 index 9aa7a7c3bd..cff1cef543 100644 --- a/tests/bugs/modalg_6/bug27341_318 +++ b/tests/bugs/modalg_6/bug27341_318 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 2429.7 -checknbshapes result -vertex 379 -edge 190 +checknbshapes result -vertex 381 -edge 191 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_320 b/tests/bugs/modalg_6/bug27341_320 index 6f2b240d02..01beeddc94 100644 --- a/tests/bugs/modalg_6/bug27341_320 +++ b/tests/bugs/modalg_6/bug27341_320 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 1726.77 -checknbshapes result -vertex 801 -edge 401 +checknbshapes result -vertex 811 -edge 406 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_322 b/tests/bugs/modalg_6/bug27341_322 index 51cd0119c9..b15b8259f2 100644 --- a/tests/bugs/modalg_6/bug27341_322 +++ b/tests/bugs/modalg_6/bug27341_322 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 6584.94 -checknbshapes result -vertex 774 -edge 387 +checknbshapes result -vertex 784 -edge 392 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_324 b/tests/bugs/modalg_6/bug27341_324 index dad9044f34..cfd3304ab5 100644 --- a/tests/bugs/modalg_6/bug27341_324 +++ b/tests/bugs/modalg_6/bug27341_324 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 211.007 -checknbshapes result -vertex 102 -edge 51 +checknbshapes result -vertex 106 -edge 53 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_328 b/tests/bugs/modalg_6/bug27341_328 index 4aef177764..383ea1aba9 100644 --- a/tests/bugs/modalg_6/bug27341_328 +++ b/tests/bugs/modalg_6/bug27341_328 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 40.3211 -checknbshapes result -vertex 60 -edge 30 +checknbshapes result -vertex 62 -edge 31 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27341_329 b/tests/bugs/modalg_6/bug27341_329 index 9d5402b9b7..cb537eae0d 100644 --- a/tests/bugs/modalg_6/bug27341_329 +++ b/tests/bugs/modalg_6/bug27341_329 @@ -23,6 +23,6 @@ build3d result fit checkprops result -l 1126.76 -checknbshapes result -vertex 280 -edge 140 +checknbshapes result -vertex 284 -edge 142 checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_101 b/tests/bugs/modalg_6/bug27719_101 new file mode 100644 index 0000000000..adce67af17 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_101 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded.brep] a + +set viewname "axo" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 4.04214 +checknbshapes result -vertex 16 -edge 8 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_102 b/tests/bugs/modalg_6/bug27719_102 new file mode 100644 index 0000000000..2e06c7090b --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_102 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded.brep] a + +set viewname "top" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 5.79737 +checknbshapes result -vertex 22 -edge 11 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_103 b/tests/bugs/modalg_6/bug27719_103 new file mode 100644 index 0000000000..1605872c26 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_103 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded.brep] a + +set viewname "bottom" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 6.15279 +checknbshapes result -vertex 22 -edge 11 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_104 b/tests/bugs/modalg_6/bug27719_104 new file mode 100644 index 0000000000..f7cab1b4dd --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_104 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded.brep] a + +set viewname "front" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 7.45731 +checknbshapes result -vertex 24 -edge 12 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_105 b/tests/bugs/modalg_6/bug27719_105 new file mode 100644 index 0000000000..7f6237c5bf --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_105 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded.brep] a + +set viewname "back" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 7.48768 +checknbshapes result -vertex 22 -edge 11 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_201 b/tests/bugs/modalg_6/bug27719_201 new file mode 100644 index 0000000000..4040e2eae6 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_201 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded2.brep] a + +set viewname "axo" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 4.53263 +checknbshapes result -vertex 14 -edge 7 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_202 b/tests/bugs/modalg_6/bug27719_202 new file mode 100644 index 0000000000..4f625ad0c7 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_202 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded2.brep] a + +set viewname "top" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 4.79563 +checknbshapes result -vertex 16 -edge 8 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_203 b/tests/bugs/modalg_6/bug27719_203 new file mode 100644 index 0000000000..dc56153149 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_203 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded2.brep] a + +set viewname "bottom" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 4.64864 +checknbshapes result -vertex 16 -edge 8 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_204 b/tests/bugs/modalg_6/bug27719_204 new file mode 100644 index 0000000000..59fc854d78 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_204 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded2.brep] a + +set viewname "front" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 5.96312 +checknbshapes result -vertex 16 -edge 8 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27719_205 b/tests/bugs/modalg_6/bug27719_205 new file mode 100644 index 0000000000..8a9b983a28 --- /dev/null +++ b/tests/bugs/modalg_6/bug27719_205 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27719" +puts "============" +puts "" +###################################################### +# Incorrect exact HLR results +###################################################### + +pload QAcommands + +restore [locate_data_file bug27719_Extruded2.brep] a + +set viewname "back" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 5.61843 +checknbshapes result -vertex 16 -edge 8 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27720_2 b/tests/bugs/modalg_6/bug27720_2 new file mode 100644 index 0000000000..f9b7190fca --- /dev/null +++ b/tests/bugs/modalg_6/bug27720_2 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27720" +puts "============" +puts "" +###################################################### +# HLRBrep_Algo BSpline missing edges +###################################################### + +pload QAcommands + +restore [locate_data_file bug27720_BSpline.brep] a + +set viewname "top" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 0.980942 +checknbshapes result -vertex 54 -edge 27 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27720_3 b/tests/bugs/modalg_6/bug27720_3 new file mode 100644 index 0000000000..2e02b8826d --- /dev/null +++ b/tests/bugs/modalg_6/bug27720_3 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC27720" +puts "============" +puts "" +###################################################### +# HLRBrep_Algo BSpline missing edges +###################################################### + +pload QAcommands + +restore [locate_data_file bug27720_BSpline.brep] a + +set viewname "bottom" + +top +clear + +OCC27341 result a ${viewname} +build3d result + +fit + +checkprops result -l 0.958458 +checknbshapes result -vertex 52 -edge 26 + +checkview -screenshot -2d -path ${imagedir}/${test_image}.png