OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0023939: Incorrect circle parameter in IntAna

Browse Source 
Fix for circle circle intersection in case of one point touching
Test command added
This commit is contained in:
pdn
2013-06-13 15:28:55 +04:00
parent f03671a0c4
commit 3f16d97046
3 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/IntAna2d/IntAna2d_AnaIntersection_2.cxx
View File

@@ -66,7 +66,7 @@ void IntAna2d_AnaIntersection::Perform (const gp_Circ2d& C1,
if (ang1<0) {ang1=2*M_PI+ang1;} // On revient entre 0 et 2PI
lpnt[0].SetValue(XS,YS,ang1,ang2);
}
else if (((sum-d)>Epsilon(d)) && ((d-dif)>Epsilon(d))) {
else if (((sum-d)>Epsilon(sum)) && ((d-dif)>Epsilon(sum))) {
empt=Standard_False;
para=Standard_False;
iden=Standard_False;
@@ -78,6 +78,11 @@ void IntAna2d_AnaIntersection::Perform (const gp_Circ2d& C1,
Standard_Real ref2=Ox2.Angle(ax); // Resultat entre -PI et +PI
Standard_Real l1=(d*d + R1*R1 -R2*R2)/(2.0*d);
Standard_Real aDet = R1*R1-l1*l1;
if(aDet < 0.) {
aDet = 0.;
l1 = (l1 > 0 ? R1 : - R1);
}
Standard_Real h= Sqrt(R1*R1-l1*l1);
Standard_Real XS1= C1.Location().X() + l1*ax.X()/d - h*ax.Y()/d;
@@ -143,12 +148,15 @@ void IntAna2d_AnaIntersection::Perform (const gp_Circ2d& C1,
lpnt[0].SetValue(XS1,YS1,ang11,ang21);
lpnt[1].SetValue(XS2,YS2,ang12,ang22);
}
else if (Abs(d-dif)<=Epsilon(d)) { // Cercles tangents interieurs
else if (Abs(d-dif)<=Epsilon(sum)) { // Cercles tangents interieurs
empt=Standard_False;
para=Standard_False;
iden=Standard_False;
nbp=1;
gp_Vec2d ax(C1.Location(),C2.Location());
if(C1.Radius() < C2.Radius())
ax.Reverse();
gp_Vec2d Ox1(C1.XAxis().Direction());
gp_Vec2d Ox2(C2.XAxis().Direction());
Standard_Real ang1=Ox1.Angle(ax); // Resultat entre -PI et +PI