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

0024328: Revolution of a wire generates two interfered faces.

Browse Source 
Correct treatment of cones with collinear axes.

Test case for issue CR24328
This commit is contained in:
emv
2013-11-21 13:33:12 +04:00
committed by bugmaster
parent d5af86261d
commit b92a64cc68
3 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/IntPatch/IntPatch_Intersection.cxx
View File

@@ -784,21 +784,17 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
//// modified by jgv, 15.12.02 for OCC565 ////
if (typs1 == GeomAbs_Cone)
if (typs1 == GeomAbs_Cone && TreatAsBiParametric)
{
const gp_Cone Con1 = theS1->Cone();
const Standard_Real a1 = Abs(Con1.SemiAngle());
if (a1 < 0.02 && a2 < 0.02) //quasi-cylinders: if same domain, treat as canonic
//if collinear, treat as canonical
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
const gp_Lin L1(A1);
if (A1.IsParallel(A2,Precision::Angular()) &&
(L1.Distance(A2.Location()) <= Precision::Confusion()))
{
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
if (A1.IsParallel(A2,Precision::Angular()))
{
const gp_Lin L1(A1);
if (L1.Distance(A2.Location()) <= Precision::Confusion())
{
TreatAsBiParametric = Standard_False;
}
}
TreatAsBiParametric = Standard_False;
}
else if (a1 > 1.55 && a2 > 1.55) //quasi-planes: if same domain, treat as canonic
{
@@ -813,14 +809,6 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
}
}
else if ((a1 > 1.55) || (a2 > 1.55))
{
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
if (A1.IsCoaxial(A2,Precision::Angular(),Precision::Confusion()))
{
TreatAsBiParametric = Standard_False;
}
}
}// if (typs1 == GeomAbs_Cone) {
}// if(typs2 == GeomAbs_Cone) {
@@ -984,21 +972,17 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
//// modified by jgv, 15.12.02 for OCC565 ////
if (typs1 == GeomAbs_Cone)
if (typs1 == GeomAbs_Cone && TreatAsBiParametric)
{
const gp_Cone Con1 = theS1->Cone();
const Standard_Real a1 = Abs(Con1.SemiAngle());
if (a1 < 0.02 && a2 < 0.02) //quasi-cylinders: if same domain, treat as canonic
//if collinear, treat as canonical
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
const gp_Lin L1(A1);
if (A1.IsParallel(A2,Precision::Angular()) &&
(L1.Distance(A2.Location()) <= Precision::Confusion()))
{
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
if (A1.IsParallel(A2,Precision::Angular()))
{
const gp_Lin L1(A1);
if (L1.Distance(A2.Location()) <= Precision::Confusion())
{
TreatAsBiParametric = Standard_False;
}
}
TreatAsBiParametric = Standard_False;
}
else if (a1 > 1.55 && a2 > 1.55) //quasi-planes: if same domain, treat as canonic
{
@@ -1013,14 +997,6 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& theS1,
}
}
}
else if ((a1 > 1.55) || (a2 > 1.55))
{
const gp_Ax1 A1 = Con1.Axis(), A2 = Con2.Axis();
if (A1.IsCoaxial(A2,Precision::Angular(),Precision::Confusion()))
{
TreatAsBiParametric = Standard_False;
}
}
}// if (typs1 == GeomAbs_Cone) {
}// if(typs2 == GeomAbs_Cone) {