0027719: HLRBrep_Algo incorrect output

Intersection of curves and surfaces in HLRBRep is corrected: parametric limits of face are used instead of parametric limits of surface

Building of outlines (Contap_Contour) is corrected: method ComputeCloseLine is now used in all cases.

Correction of HLRBRep_Surface: usage of UVbounds-option

Correction of test cases according to the new behavior.

diff --git a/src/Contap/Contap_Contour.cxx b/src/Contap/Contap_Contour.cxx
index 22cdbe038790b043d1e410b82ebae694ff00c7f3..34c457deeb65014e5ab461d2b38f1e72160fe8ea 100644 (file)
--- 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 a1bff019ae867b02da87df0b55e1c4c525ed8946..a23229edee7f4da3b45c152a8a6d2e02bfd271a9 100644 (file)
--- 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 9adc0380812e2442b8b02c1e21f119e7af782834..c39131f747b051014421ee022d3762af12630554 100755 (executable)
--- 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 5c48031e798b6f15830987cbc0ac0aa121a74fa6..a278496272f31f0984523cec6565543965b0224d 100644 (file)
--- 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 0eb1c3b8c73f903678434930b06a7b3d42317f55..64ef386f5d8854e05e076949261d71f1e4a5e4c6 100644 (file)
--- 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 96e3667eeb84dcd77ec17abf50960ddb60d72ebb..7698f2a1fc0dc4cf33c67f2f9f7b74e913d07228 100644 (file)
--- 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 9981db483911a592b126b0449c9be31789e83125..1ca4fedeecd09c225d5efdc1154710cb7cc6afc9 100644 (file)
--- 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 86251a44881af0ccad12437d17655219fa411c6d..b8e0622a224a43dabd245134128fef73d216c89f 100644 (file)
--- 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 6fe0f0822ae833df2662cb89b71bb318c60704d2..326496810aa241a2e1733d9326f794023444c1dd 100644 (file)
--- 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 f4f64f670924e5f037842985cfbc7f9c333ab456..a947ba4138c58514342609e7d0f0b4cb1fa3caff 100644 (file)
--- 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 202779d415ce6cff9caa49679912cba2d4ac38e0..7ee0eb73bd51eae6557862601ee7ee6162e1a687 100644 (file)
--- 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 e2e8168620b28f7540460ed44596927bc8be03b3..b136ae773be22f361c6a63998588f0b4f3ad05b2 100644 (file)
--- 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 b6fdfd2cfef78632c657d8d74e6704343a68aa87..d6b6ba4a35b4b94d2e934e872ca1d8a5b5c68ee1 100644 (file)
--- 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 ba824f05eec73b0d10b4bc20249df1d443bcba3e..cfa5701fd73c4bba94011ae78aab83122e35a7a9 100644 (file)
--- 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 9aa7a7c3bdea58a01ed34c0646a37f685f57847e..cff1cef543f7e5ce530eeb94dbbb1903f2c48567 100644 (file)
--- 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 6f2b240d0287995dc87a54974f85bd991bce90c2..01beeddc9446b4f05a97272d835719c9f7d955f7 100644 (file)
--- 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 51cd0119c92d136a1249051676cbbf83d88cb170..b15b8259f2bdf0602790598c3164fedae0d5cfce 100644 (file)
--- 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 dad9044f348b1cdf07bf940f680988e86d3c4576..cfd3304ab56ebb8d7059e9defb94df89e58640c6 100644 (file)
--- 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 4aef17776487d2e28a898fd3ef29967ae12729f1..383ea1aba9e0dc1c52cceb36dc67470348a22397 100644 (file)
--- 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 9d5402b9b7d8ead58222571e2416ae1e6f6ba798..cb537eae0d18e0855c479393170e51a17e529c7a 100644 (file)
--- 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 (file)
index 0000000..adce67a
--- /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 (file)
index 0000000..2e06c70
--- /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 (file)
index 0000000..1605872
--- /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 (file)
index 0000000..f7cab1b
--- /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 (file)
index 0000000..7f6237c
--- /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 (file)
index 0000000..4040e2e
--- /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 (file)
index 0000000..4f625ad
--- /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 (file)
index 0000000..dc56153
--- /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 (file)
index 0000000..59fc854
--- /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 (file)
index 0000000..8a9b983
--- /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 (file)
index 0000000..f9b7190
--- /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 (file)
index 0000000..2e02b88
--- /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