mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
3306fdd954
The algorithm has been improved for the cases when the intersection line goes through the cone apex. <!break> 1. All special points are put to the ALine forcefully (if they are true intersection point). Currently this step has not been implemented yet. 2. Now the tolerance of IntPatch_Point (put into ALine) is computed in order to cover the distance between it and the correspond ALine. 3. Test cases have been created. 4. Procedure of trimming IntAna_Curve has been improved. 5. Criterion when the discriminant of IntAna_Curve can be considered to be equal to 0 has been improved. 6. Methods IntAna_Curve::FindParameter(...) (and IntPatch_ALine::FindParameter(...)) currently returns list of all parameters corresponding the given point (IntAna_Curve can be self-interfered curve). Before the fix, this method always returned only one (randomly chosen) parameter. 7. Interfaces of the following methods have been changed: IntAna_Curve::FindParameter(...), IntPatch_ALine::FindParameter(...), IntPatch_ALine::ChangeVertex(...), IntPatch_SpecialPoints::AddPointOnUorVIso(...), IntPatch_SpecialPoints::AddSingularPole(...), IntPatch_WLineTool::ExtendTwoWLines(). 8. Following methods have been added: IntAna_Quadric::SpecialPoints(...), IntPatch_ALineToWLine::GetSectionRadius(...), IntPatch_SpecialPoints::ProcessSphere(...), IntPatch_SpecialPoints::ProcessCone(...), IntPatch_SpecialPoints::GetTangentToIntLineForCone(...). ------------------ 1) tests/boolean/volumemaker/C5 tests/boolean/volumemaker/C6 tests/boolean/volumemaker/E7 They are real IMPROVEMENTS. In the FIX (in compare with MASTER), section result between pairs of faces f2&f6 (C5), f3&f7 (C6) and f1&f5 (E7) is closed. Separated test cases have been created in order to focus on the problem with section. Bug #28503 has been fixed. Correction in test cases.
72 lines
1.6 KiB
Plaintext
Executable File
72 lines
1.6 KiB
Plaintext
Executable File
puts "========"
|
|
puts "OCC565: Can not intersect two trimmed conical surfaces"
|
|
puts "========"
|
|
puts ""
|
|
|
|
set GoodNbCurv 1
|
|
|
|
foreach c [directory result*] {
|
|
unset $c
|
|
}
|
|
|
|
foreach c [directory inf*] {
|
|
unset $c
|
|
}
|
|
|
|
restore [locate_data_file OCC565a.draw] s1
|
|
restore [locate_data_file OCC565b.draw] s2
|
|
|
|
puts "Preliminary check: intersection work with infinite cones:"
|
|
if { [catch {intersect inf s1 s2 } catch_result] } {
|
|
puts "Faulty OCC565: function intersection works wrongly with infinite cones"
|
|
} else {
|
|
set isFound 0
|
|
foreach c [directory inf*] {
|
|
set ind [string first "3d curve" [whatis $c]]
|
|
if {${ind} < 0} {
|
|
dump $c
|
|
puts "Error: Intersection result (with infinite cones) is not 3D-curve"
|
|
} else {
|
|
set isFound 1
|
|
}
|
|
}
|
|
|
|
if { !$isFound } {
|
|
puts "Error: Empty intersection result (with infinite cones)"
|
|
}
|
|
}
|
|
|
|
trim s1x s1 0 2*pi 0 2.8
|
|
trim s2x s2 0 2*pi 0 2.8
|
|
|
|
if { [catch {intersect result s1x s2x } catch_result] } {
|
|
puts "Faulty OCC565 exception: function intersection works wrongly with trimmed cones"
|
|
} else {
|
|
foreach c [directory result*] {
|
|
bounds $c U1 U2
|
|
|
|
if {[dval U2-U1] < 1.0e-9} {
|
|
puts "Error: Wrong curve's range!"
|
|
}
|
|
|
|
xdistcs $c s1 U1 U2 10 1.0e-7
|
|
xdistcs $c s2 U1 U2 10 1.0e-7
|
|
}
|
|
|
|
set NbCurv [llength [directory result*]]
|
|
|
|
if { $NbCurv == $GoodNbCurv } {
|
|
puts "OK: Number of curves is good!"
|
|
} else {
|
|
puts "Error: $GoodNbCurv is expected but $NbCurv is found!"
|
|
}
|
|
|
|
smallview
|
|
don result*
|
|
fit
|
|
disp s1x s2x
|
|
checkview -screenshot -2d -path ${imagedir}/${test_image}.png
|
|
}
|
|
|
|
|