OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0033648: Modeling Algorithms - Bad partition result

Browse Source 
Removed unnecessary tolerance increase for Line\Line intersection.
Tolerance increasing logic for some specific curve types
  was added with #26619.
Original fix had no test for Line/Line case and
  theoretically was added as a possible issue.
After research Line/Line case doesn't need a special tolerance case.
This commit is contained in:
astromko 2024-08-07 15:15:43 +01:00 committed by jfa
parent 1827edbc9a
commit 17d27a772d
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
View File

@ -341,12 +341,8 @@ void BOPAlgo_PaveFiller::PerformEE(const Message_ProgressRange& theRange)
GeomAbs_CurveType aType1 = aBAC1.GetType(); GeomAbs_CurveType aType1 = aBAC1.GetType();
GeomAbs_CurveType aType2 = aBAC2.GetType(); GeomAbs_CurveType aType2 = aBAC2.GetType();
// //
bAnalytical = (((aType1 == GeomAbs_Line) && bAnalytical = (aType1 == GeomAbs_Line && aType2 == GeomAbs_Circle) ||
(aType2 == GeomAbs_Line || (aType1 == GeomAbs_Circle && aType2 == GeomAbs_Line);
aType2 == GeomAbs_Circle)) ||
((aType2 == GeomAbs_Line) &&
(aType1 == GeomAbs_Line ||
aType1 == GeomAbs_Circle)));
} }
// //
for (i=1; i<=aNbCPrts; ++i) { for (i=1; i<=aNbCPrts; ++i) {
@ -443,7 +439,7 @@ void BOPAlgo_PaveFiller::PerformEE(const Message_ProgressRange& theRange)
Standard_Real aTolVnew = BRep_Tool::Tolerance(aVnew); Standard_Real aTolVnew = BRep_Tool::Tolerance(aVnew);
if (bAnalytical) { if (bAnalytical) {
// increase tolerance for Line/Line intersection, but do not update // increase tolerance for Line/Circle intersection, but do not update
// the vertex till its intersection with some other shape // the vertex till its intersection with some other shape
Standard_Real aTolMin = (BRepAdaptor_Curve(aE1).GetType() == GeomAbs_Line) ? Standard_Real aTolMin = (BRepAdaptor_Curve(aE1).GetType() == GeomAbs_Line) ?
(aCR1.Last() - aCR1.First()) / 2. : (aCR2.Last() - aCR2.First()) / 2.; (aCR1.Last() - aCR1.First()) / 2. : (aCR2.Last() - aCR2.First()) / 2.;

26
tests/bugs/modalg_8/bug33648 Normal file
View File

@ -0,0 +1,26 @@
puts "==================================================="
puts "0033648: Modeling Algorithms - Bad partition result"
puts "==================================================="
puts ""
pload MODELING
restore [locate_data_file bug33648_1.brep] s1
restore [locate_data_file bug33648_2.brep] s2
baddobjects s1 s2
bfillds
bbuild result
checkprops result -s 87.2813
checknbshapes result -vertex 58 -edge 97 -wire 44 -face 44 -shell 4 -solid 4 -compsolid 0 -compound 2 -shape 253
set expected_MaxTolerance 0.05
regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance result] full MaxTolerance
if { $MaxTolerance > $expected_MaxTolerance } {
puts "Error : too big tolerance for the shape (should be less than $expected_MaxTolerance, now $MaxTolerance)"
}
vinit
vdisplay result
vfit
checkview -screenshot -3d -path ${imagedir}/${test_image}.png