OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023644: Intersection between coaxial cones produces exception

Browse Source 
Small correction: one more tolerance variable has been added.
Test case for this fix
Small correction of test case
This commit is contained in:
pkv 2013-01-28 11:33:22 +04:00
parent 3f257c62d2
commit 4bd102b84c
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/IntAna/IntAna_QuadQuadGeo.cxx
View File

@ -1163,6 +1163,9 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
// //
Standard_Real tg1, tg2, aDA1A2, aTol2; Standard_Real tg1, tg2, aDA1A2, aTol2;
gp_Pnt aPApex1, aPApex2; gp_Pnt aPApex1, aPApex2;
Standard_Real TOL_APEX_CONF = 1.e-10;
// //
tg1=Tan(Con1.SemiAngle()); tg1=Tan(Con1.SemiAngle());
tg2=Tan(Con2.SemiAngle()); tg2=Tan(Con2.SemiAngle());
@ -1187,6 +1190,12 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
Standard_Real d=gp_Vec(D).Dot(gp_Vec(P,Con2.Apex())); Standard_Real d=gp_Vec(D).Dot(gp_Vec(P,Con2.Apex()));
if(Abs(tg1-tg2)>myEPSILON_ANGLE_CONE) { if(Abs(tg1-tg2)>myEPSILON_ANGLE_CONE) {
if (fabs(d) < TOL_APEX_CONF) {
typeres = IntAna_Point;
nbint = 1;
pt1 = P;
return;
}
x=(d*tg2)/(tg1+tg2); x=(d*tg2)/(tg1+tg2);
pt1.SetCoord( P.X() + x*D.X() pt1.SetCoord( P.X() + x*D.X()
,P.Y() + x*D.Y() ,P.Y() + x*D.Y()
@ -1203,7 +1212,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
typeres=IntAna_Circle; typeres=IntAna_Circle;
} }
else { else {
if (fabs(d)<1.e-10) { if (fabs(d) < TOL_APEX_CONF) {
typeres=IntAna_Same; typeres=IntAna_Same;
} }
else { else {
@ -1361,9 +1370,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
if (aRD2>(aR2+Tol)) { if (aRD2>(aR2+Tol)) {
iRet=0; iRet=0;
typeres=IntAna_Empty; //nothing typeres=IntAna_Empty; //nothing
//modified by NIZNHY-PKV Fri Mar 23 08:12:23 2012f
return; return;
//modified by NIZNHY-PKV Fri Mar 23 08:12:29 2012t
} }
// //
iRet=1; //touch case => 1 line iRet=1; //touch case => 1 line

20
tests/bugs/moddata/bug23644 Executable file
View File

@ -0,0 +1,20 @@
puts "========"
puts "CR23644"
puts "========"
##########################################
## Intersection between coaxial cones produces exception
##########################################
pcone cn1 10 0 20
pcone cn2 20 0 20
explode cn1 f
explode cn2 f
copy cn1_1 f1
copy cn2_1 f2
if [catch {bopcurves f1 f2} BOPLog] {
if { [regexp "Tolerance Reached=0\n has no 3d curve" ${BOPLog}] != 1 } {
puts "CR23644: Error"
}
}