mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +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.
52 lines
1.0 KiB
Plaintext
52 lines
1.0 KiB
Plaintext
puts "=========="
|
|
puts "OCC23972: Excep-tion thrown when intersecting two cones"
|
|
puts "=========="
|
|
puts ""
|
|
|
|
pload QAcommands
|
|
|
|
set GoodNbCurv 2
|
|
|
|
OCC23972 s1 s2
|
|
|
|
intersect res s1 s2
|
|
|
|
set che [whatis res]
|
|
set ind [string first "3d curve" $che]
|
|
if {${ind} >= 0} {
|
|
#Only variable "res" exists
|
|
renamevar res res_1
|
|
}
|
|
|
|
set ic 1
|
|
set AllowRepeat 1
|
|
while { $AllowRepeat != 0 } {
|
|
set che [whatis res_$ic]
|
|
set ind [string first "3d curve" $che]
|
|
if {${ind} < 0} {
|
|
set AllowRepeat 0
|
|
} else {
|
|
|
|
bounds res_$ic U1 U2
|
|
|
|
# Hyperbola is expected as intersection result.
|
|
# So, all bounds are adjusted to allow correct computation.
|
|
if { [dval U1] < -20.0 } { dset U1 -20.0 }
|
|
if { [dval U2] > 20.0 } { dset U2 20.0 }
|
|
|
|
if {[dval U2-U1] < 1.0e-20} {
|
|
puts "Error: Wrong curve's range!"
|
|
}
|
|
|
|
xdistcs res_$ic s1 U1 U2 10 3.0e-7
|
|
xdistcs res_$ic s2 U1 U2 10 3.0e-7
|
|
|
|
incr ic
|
|
}
|
|
}
|
|
|
|
if {[expr {$ic - 1}] == $GoodNbCurv} {
|
|
puts "OK: Number of curves is good!"
|
|
} else {
|
|
puts "Error: Number of curves is bad!"
|
|
} |