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

0023985: There is no section between attached faces.

Browse Source 
Added new parameter for checking whether the plane and cylinder are parallel - the height of the cylinder.
This parameter is needed for the cases when angle between AXIS and plane's normal is very close to PI,
but the "height" is big enough that point, translated from intersection point between cylinder's axis and plane
on the "height" distance in the direction of cylinder's axis, does not belong to the plane.
Such plane and cylinder cannot be considered as parallel.
Add test case for this fix
This commit is contained in:
emv 2013-05-31 17:17:34 +04:00
parent 470ebb43f2
commit 04cbc9d384
8 changed files with 113 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/IntAna/IntAna_IntConicQuad.cdl
View File

@ -144,21 +144,29 @@ is
----------------------------------------------------------------------
Create(L : Lin from gp; P: Pln from gp;
Tolang: Real from Standard)
Tolang: Real from Standard;
Tol : Real from Standard = 0;
Len : Real from Standard = 0)
---Purpose: Intersection between a line and a plane.
-- Tolang is used to determine if the angle between two
-- vectors is null.
-- Tol is used to check the distance between line and plane
-- on the distance <Len> from the origin of the line.
returns IntConicQuad from IntAna;
Perform(me: in out;
L : Lin from gp; P: Pln from gp; Tolang: Real from Standard)
L : Lin from gp; P: Pln from gp; Tolang: Real from Standard;
Tol : Real from Standard = 0;
Len : Real from Standard = 0)
---Purpose: Intersects a line and a plane.
-- Tolang is used to determine if the angle between two
-- vectors is null.
-- Tol is used to check the distance between line and plane
-- on the distance <Len> from the origin of the line.
is static;

31
src/IntAna/IntAna_IntConicQuad.cxx
View File

@ -376,8 +376,10 @@ PERFORM(const gp_Hypr& H,const IntAna_Quadric& Quad) {
IntAna_IntConicQuad::IntAna_IntConicQuad (const gp_Lin& L, const gp_Pln& P,
const Standard_Real Tolang) {
Perform(L,P,Tolang);
const Standard_Real Tolang,
const Standard_Real Tol,
const Standard_Real Len) {
Perform(L,P,Tolang,Tol,Len);
}
@ -408,7 +410,9 @@ IntAna_IntConicQuad::IntAna_IntConicQuad (const gp_Hypr& H, const gp_Pln& P,
void IntAna_IntConicQuad::Perform (const gp_Lin& L, const gp_Pln& P,
const Standard_Real Tolang) {
const Standard_Real Tolang,
const Standard_Real Tol,
const Standard_Real Len) {
// Tolang represente la tolerance angulaire a partir de laquelle on considere
// que l angle entre 2 vecteurs est nul. On raisonnera sur le cosinus de cet
@ -426,9 +430,22 @@ void IntAna_IntConicQuad::Perform (const gp_Lin& L, const gp_Pln& P,
Direc=A*Al+B*Bl+C*Cl;
Dis = A*Orig.X() + B*Orig.Y() + C*Orig.Z() + D;
//
parallel=Standard_False;
if (Abs(Direc) < Tolang) {
parallel=Standard_True;
if (Len!=0 && Direc!=0) {
//check the distance from bounding point of the line to the plane
gp_Pnt aP1, aP2;
//
aP1.SetCoord(Orig.X()-Dis*A, Orig.Y()-Dis*B, Orig.Z()-Dis*C);
aP2.SetCoord(aP1.X()+Len*Al, aP1.Y()+Len*Bl, aP1.Z()+Len*Cl);
if (P.Distance(aP2) > Tol) {
parallel=Standard_False;
}
}
}
if (parallel) {
if (Abs(Dis) < Tolang) {
inquadric=Standard_True;
}
@ -441,9 +458,9 @@ void IntAna_IntConicQuad::Perform (const gp_Lin& L, const gp_Pln& P,
inquadric=Standard_False;
nbpts = 1;
paramonc [0] = - Dis/Direc;
pnts[0].SetCoord(Orig.X()+paramonc[0]*Al
, Orig.Y()+paramonc[0]*Bl
, Orig.Z()+paramonc[0]*Cl);
pnts[0].SetCoord(Orig.X()+paramonc[0]*Al,
Orig.Y()+paramonc[0]*Bl,
Orig.Z()+paramonc[0]*Cl);
}
done=Standard_True;
}

11
src/IntAna/IntAna_QuadQuadGeo.cdl
View File

@ -93,8 +93,8 @@ is
Create(P : Pln from gp;
C : Cylinder from gp;
Tolang,Tol: Real from Standard)
Tolang,Tol: Real from Standard;
H : Real from Standard = 0)
---Purpose: Creates the intersection between a plane and a cylinder.
-- TolAng is the angular tolerance used to determine
-- if the axis of the cylinder is parallel to the plane.
@ -102,6 +102,8 @@ is
-- is a circle or an ellipse. If the maximum distance between
-- the ellipse solution and the circle centered at the ellipse
-- center is less than Tol, the result will be the circle.
-- H is the height of the cylinder <Cyl>. It is used to check
-- whether the plane and cylinder are parallel.
returns QuadQuadGeo from IntAna;
@ -109,7 +111,8 @@ is
Perform(me: in out;
P : Pln from gp;
C : Cylinder from gp;
Tolang,Tol: Real from Standard)
Tolang,Tol: Real from Standard;
H :Real from Standard = 0)
---Purpose: Intersects a plane and a cylinder.
-- TolAng is the angular tolerance used to determine
@ -118,6 +121,8 @@ is
-- is a circle or an ellipse. If the maximum distance between
-- the ellipse solution and the circle centered at the ellipse
-- center is less than Tol, the result will be the circle.
-- H is the height of the cylinder <Cyl>. It is used to check
-- whether the plane and cylinder are parallel.
is static;

10
src/IntAna/IntAna_QuadQuadGeo.cxx
View File

@ -356,7 +356,8 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
IntAna_QuadQuadGeo::IntAna_QuadQuadGeo( const gp_Pln& P
,const gp_Cylinder& Cl
,const Standard_Real Tolang
,const Standard_Real Tol)
,const Standard_Real Tol
,const Standard_Real H)
: done(Standard_False),
nbint(0),
typeres(IntAna_Empty),
@ -370,7 +371,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
myPChar(0,0,0)
{
InitTolerances();
Perform(P,Cl,Tolang,Tol);
Perform(P,Cl,Tolang,Tol,H);
}
//=======================================================================
//function : Perform
@ -379,7 +380,8 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
void IntAna_QuadQuadGeo::Perform( const gp_Pln& P
,const gp_Cylinder& Cl
,const Standard_Real Tolang
,const Standard_Real Tol)
,const Standard_Real Tol
,const Standard_Real H)
{
done = Standard_False;
Standard_Real dist,radius;
@ -422,7 +424,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
}
nbint = 0;
IntAna_IntConicQuad inter(axec,P,tolang);
IntAna_IntConicQuad inter(axec,P,tolang,Tol,H);
if (inter.IsParallel()) {
// Le resultat de l intersection Plan-Cylindre est de type droite.

3
src/IntPatch/IntPatch_ImpImpIntersection_1.gxx
View File

@ -32,7 +32,8 @@ static Standard_Boolean IntPCy (const IntSurf_Quadric&,
const Standard_Real,
const Standard_Boolean,
Standard_Boolean&,
IntPatch_SequenceOfLine&);
IntPatch_SequenceOfLine&,
const Standard_Real H=0.);
static Standard_Boolean IntPSp (const IntSurf_Quadric&,

6
src/IntPatch/IntPatch_ImpImpIntersection_2.gxx
View File

@ -101,7 +101,8 @@ void IntPatch_ImpImpIntersection::Perform(const Handle(Adaptor3d_HSurface)& S1,
case GeomAbs_Cylinder:
{
quad2.SetValue(S2->Cylinder());
if (!IntPCy(quad1,quad2,Tolang,TolTang,Standard_False,empt,slin)) {
Standard_Real H = S1->LastVParameter() - S1->FirstVParameter();
if (!IntPCy(quad1,quad2,Tolang,TolTang,Standard_False,empt,slin,H)) {
return;
}
if (empt) {
@ -157,7 +158,8 @@ void IntPatch_ImpImpIntersection::Perform(const Handle(Adaptor3d_HSurface)& S1,
case GeomAbs_Plane:
{
quad2.SetValue(S2->Plane());
if (!IntPCy(quad1,quad2,Tolang,TolTang,Standard_True,empt,slin)) {
Standard_Real H = S1->LastVParameter() - S1->FirstVParameter();
if (!IntPCy(quad1,quad2,Tolang,TolTang,Standard_True,empt,slin,H)) {
return;
}
if (empt) {

5
src/IntPatch/IntPatch_ImpImpIntersection_3.gxx
View File

@ -92,7 +92,8 @@ Standard_Boolean IntPCy (const IntSurf_Quadric& Quad1,
const Standard_Real TolTang,
const Standard_Boolean Reversed,
Standard_Boolean& Empty,
IntPatch_SequenceOfLine& slin)
IntPatch_SequenceOfLine& slin,
const Standard_Real H)
{
gp_Pln Pl;
@ -110,7 +111,7 @@ Standard_Boolean IntPCy (const IntSurf_Quadric& Quad1,
Pl = Quad2.Plane();
Cy = Quad1.Cylinder();
}
inter.Perform(Pl,Cy,Tolang,TolTang);
inter.Perform(Pl,Cy,Tolang,TolTang,H);
if (!inter.IsDone()) {return Standard_False;}
typint = inter.TypeInter();
Standard_Integer NbSol = inter.NbSolutions();

27
tests/bugs/modalg_5/bug23985 Executable file
View File

@ -0,0 +1,27 @@
puts "========"
puts "OCC23985"
puts "========"
puts ""
##########################################
## There is no section between attached faces
##########################################
set BugNumber 23985
restore [locate_data_file bug23985_b1.brep] b1
restore [locate_data_file bug23985_b2.brep] b2
bsection result b1 b2
set expl [explode result]
set length [llength $expl]
puts "Result is $length section edge"
if {$length > 0} {
puts "${BugNumber} OK"
} else {
puts "Faulty ${BugNumber}"
}
set 2dviewer 0