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

0023732: Exception raised during intersection between two surfaces

Browse Source 
Adding of test case
This commit is contained in:
pkv 2013-02-01 17:06:03 +04:00
parent 024855ee13
commit 2426168486
3 changed files with 115 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
src/IntPolyh/IntPolyh_MaillageAffinage.cxx
View File

@ -138,6 +138,12 @@ static
const Standard_Integer aIsoDirection, const Standard_Integer aIsoDirection,
Standard_Integer& aI1, Standard_Integer& aI1,
Standard_Integer& aI2); Standard_Integer& aI2);
static
void EnlargeZone(const Handle(Adaptor3d_HSurface)& MaSurface,
Standard_Real &u0,
Standard_Real &u1,
Standard_Real &v0,
Standard_Real &v1);
//======================================================================= //=======================================================================
//function : IntPolyh_MaillageAffinage //function : IntPolyh_MaillageAffinage
@ -216,11 +222,10 @@ IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
void IntPolyh_MaillageAffinage::FillArrayOfPnt void IntPolyh_MaillageAffinage::FillArrayOfPnt
(const Standard_Integer SurfID) (const Standard_Integer SurfID)
{ {
Standard_Integer NbSamplesU, NbSamplesV; Standard_Integer NbSamplesU, NbSamplesV, i, aNbSamplesU1, aNbSamplesV1;
Standard_Real u0, u1, v0, v1; Standard_Real u0, u1, v0, v1, aU, aV, dU, dV;
Handle(Adaptor3d_HSurface) MaSurface;
// //
MaSurface=(SurfID==1)? MaSurface1:MaSurface2; const Handle(Adaptor3d_HSurface&) MaSurface=(SurfID==1)? MaSurface1 : MaSurface2;
IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2; IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2;
NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2; NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2;
NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2; NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2;
@ -231,59 +236,35 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
v1 = (MaSurface)->LastVParameter(); v1 = (MaSurface)->LastVParameter();
if(myEnlargeZone) { if(myEnlargeZone) {
if(MaSurface->GetType() == GeomAbs_BSplineSurface || EnlargeZone(MaSurface, u0, u1, v0, v1);
MaSurface->GetType() == GeomAbs_BezierSurface) {
if((!MaSurface->IsUClosed() && !MaSurface->IsUPeriodic()) &&
(Abs(u0) < 1.e+100 && Abs(u1) < 1.e+100) ) {
Standard_Real delta_u = Abs(u1 - u0) / 100.;
u0 -= delta_u;
u1 += delta_u;
}
if((!MaSurface->IsVClosed() && !MaSurface->IsVPeriodic()) &&
(Abs(v0) < 1.e+100 && Abs(v1) < 1.e+100) ) {
Standard_Real delta_v = Abs(v1 - v0) / 100.;
v0 -= delta_v;
v1 += delta_v;
}
}
} }
// //
Standard_Integer iCnt, BoucleU, BoucleV; TColStd_Array1OfReal aUpars(1, NbSamplesU);
Standard_Real itU, itV, U, V, Tol; TColStd_Array1OfReal aVpars(1, NbSamplesV);
Bnd_Box *PtrBox;
gp_Pnt PtXYZ;
// //
iCnt=0; aNbSamplesU1=NbSamplesU-1;
itU=(u1-u0)/Standard_Real(NbSamplesU-1); aNbSamplesV1=NbSamplesV-1;
itV=(v1-v0)/Standard_Real(NbSamplesV-1); //
PtrBox = (SurfID==1) ? (&MyBox1) : (&MyBox2); dU=(u1-u0)/Standard_Real(aNbSamplesU1);
dV=(v1-v0)/Standard_Real(aNbSamplesV1);
for(BoucleU=0; BoucleU<NbSamplesU; BoucleU++){ //
U = (BoucleU == (NbSamplesU - 1)) ? u1 : u0+BoucleU*itU; for (i=0; i<NbSamplesU; ++i) {
for(BoucleV=0; BoucleV<NbSamplesV; BoucleV++){ aU=u0+i*dU;
V = (BoucleV == (NbSamplesV - 1)) ? v1 : v0+BoucleV*itV; if (i==aNbSamplesU1) {
PtXYZ = (MaSurface)->Value(U,V); aU=u1;
IntPolyh_Point& aIPnt=TPoints[iCnt];
aIPnt.Set(PtXYZ.X(), PtXYZ.Y(), PtXYZ.Z(), U, V);
iCnt++;
PtrBox->Add(PtXYZ);
} }
aUpars.SetValue(i+1, aU);
} }
TPoints.SetNbItems(iCnt);
// //
IntCurveSurface_ThePolyhedronOfHInter polyhedron(MaSurface, for (i=0; i<NbSamplesV; ++i) {
NbSamplesU, aV=v0+i*dV;
NbSamplesV, if (i==aNbSamplesV1) {
u0,v0, aV=v1;
u1,v1); }
Tol=polyhedron.DeflectionOverEstimation(); aVpars.SetValue(i+1, aV);
Tol*=1.2; }
// //
Standard_Real a1,a2,a3,b1,b2,b3; FillArrayOfPnt(SurfID, aUpars, aVpars);
//
PtrBox->Get(a1,a2,a3,b1,b2,b3);
PtrBox->Update(a1-Tol,a2-Tol,a3-Tol,b1+Tol,b2+Tol,b3+Tol);
PtrBox->Enlarge(MyTolerance);
} }
//======================================================================= //=======================================================================
//function : FillArrayOfPnt //function : FillArrayOfPnt
@ -294,86 +275,48 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
(const Standard_Integer SurfID, (const Standard_Integer SurfID,
const Standard_Boolean isShiftFwd) const Standard_Boolean isShiftFwd)
{ {
Standard_Integer NbSamplesU, NbSamplesV, i, aNbSamplesU1, aNbSamplesV1;
Handle(Adaptor3d_HSurface) MaSurface=(SurfID==1)? MaSurface1:MaSurface2; Standard_Real u0, u1, v0, v1, aU, aV, dU, dV;
const Handle(Adaptor3d_HSurface)& MaSurface=(SurfID==1)? MaSurface1 : MaSurface2;
IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2; IntPolyh_ArrayOfPoints &TPoints=(SurfID==1)? TPoints1:TPoints2;
Standard_Integer NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2; NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2;
Standard_Integer NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2; NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2;
Standard_Real u0 = (MaSurface)->FirstUParameter(); u0 = (MaSurface)->FirstUParameter();
Standard_Real u1 = (MaSurface)->LastUParameter(); u1 = (MaSurface)->LastUParameter();
Standard_Real v0 = (MaSurface)->FirstVParameter(); v0 = (MaSurface)->FirstVParameter();
Standard_Real v1 = (MaSurface)->LastVParameter(); v1 = (MaSurface)->LastVParameter();
if(myEnlargeZone) { if(myEnlargeZone) {
if(MaSurface->GetType() == GeomAbs_BSplineSurface || EnlargeZone(MaSurface, u0, u1, v0, v1);
MaSurface->GetType() == GeomAbs_BezierSurface) {
if((!MaSurface->IsUClosed() && !MaSurface->IsUPeriodic()) &&
(Abs(u0) < 1.e+100 && Abs(u1) < 1.e+100) ) {
Standard_Real delta_u = Abs(u1 - u0) / 100.;
u0 -= delta_u;
u1 += delta_u;
}
if((!MaSurface->IsVClosed() && !MaSurface->IsVPeriodic()) &&
(Abs(v0) < 1.e+100 && Abs(v1) < 1.e+100) ) {
Standard_Real delta_v = Abs(v1 - v0) / 100.;
v0 -= delta_v;
v1 += delta_v;
}
}
} }
//
IntCurveSurface_ThePolyhedronOfHInter polyhedron(MaSurface, TColStd_Array1OfReal aUpars(1, NbSamplesU);
NbSamplesU, TColStd_Array1OfReal aVpars(1, NbSamplesV);
NbSamplesV, //
u0,v0, aNbSamplesU1=NbSamplesU-1;
u1,v1); aNbSamplesV1=NbSamplesV-1;
Standard_Real Tol=polyhedron.DeflectionOverEstimation(); //
dU=(u1-u0)/Standard_Real(aNbSamplesU1);
Standard_Integer CpteurTabPnt=0; dV=(v1-v0)/Standard_Real(aNbSamplesV1);
Standard_Real itU=(u1-u0)/Standard_Real(NbSamplesU-1); //
Standard_Real itV=(v1-v0)/Standard_Real(NbSamplesV-1); for (i=0; i<NbSamplesU; ++i) {
aU=u0+i*dU;
Bnd_Box *PtrBox = (SurfID==1) ? (&MyBox1) : (&MyBox2); if (i==aNbSamplesU1) {
Standard_Real resol = gp::Resolution(); aU=u1;
for(Standard_Integer BoucleU=0; BoucleU<NbSamplesU; BoucleU++){
Standard_Real U = (BoucleU == (NbSamplesU - 1)) ? u1 : u0+BoucleU*itU;
for(Standard_Integer BoucleV=0; BoucleV<NbSamplesV; BoucleV++){
Standard_Real V = (BoucleV == (NbSamplesV - 1)) ? v1 : v0+BoucleV*itV;
gp_Pnt PtXYZ;
gp_Vec aDU;
gp_Vec aDV;
gp_Vec aNorm;
MaSurface->D1(U, V, PtXYZ, aDU, aDV);
aNorm = aDU.Crossed(aDV);
Standard_Real aMag = aNorm.Magnitude();
if (aMag > resol) {
aNorm /= aMag;
aNorm.Multiply(Tol*1.5);
if (isShiftFwd)
PtXYZ.Translate(aNorm);
else
PtXYZ.Translate(aNorm.Reversed());
}
(TPoints[CpteurTabPnt]).Set(PtXYZ.X(), PtXYZ.Y(), PtXYZ.Z(), U, V);
CpteurTabPnt++;
PtrBox->Add(PtXYZ);
} }
aUpars.SetValue(i+1, aU);
} }
TPoints.SetNbItems(CpteurTabPnt); //
for (i=0; i<NbSamplesV; ++i) {
Tol*=1.2; aV=v0+i*dV;
if (i==aNbSamplesV1) {
Standard_Real a1,a2,a3,b1,b2,b3; aV=v1;
PtrBox->Get(a1,a2,a3,b1,b2,b3); }
PtrBox->Update(a1-Tol,a2-Tol,a3-Tol,b1+Tol,b2+Tol,b3+Tol); aVpars.SetValue(i+1, aV);
PtrBox->Enlarge(MyTolerance); }
//
FillArrayOfPnt(SurfID, isShiftFwd, aUpars, aVpars);
} }
//======================================================================= //=======================================================================
//function : FillArrayOfPnt //function : FillArrayOfPnt
@ -4015,6 +3958,32 @@ Standard_Boolean IsDegenerated(const Handle(Adaptor3d_HSurface)& aS,
// //
return bRet; return bRet;
} }
//=======================================================================
//function : EnlargeZone
//purpose :
//=======================================================================
void EnlargeZone(const Handle(Adaptor3d_HSurface)& MaSurface,
Standard_Real &u0,
Standard_Real &u1,
Standard_Real &v0,
Standard_Real &v1)
{
if(MaSurface->GetType() == GeomAbs_BSplineSurface ||
MaSurface->GetType() == GeomAbs_BezierSurface) {
if((!MaSurface->IsUClosed() && !MaSurface->IsUPeriodic()) &&
(Abs(u0) < 1.e+100 && Abs(u1) < 1.e+100) ) {
Standard_Real delta_u = 0.01*Abs(u1 - u0);
u0 -= delta_u;
u1 += delta_u;
}
if((!MaSurface->IsVClosed() && !MaSurface->IsVPeriodic()) &&
(Abs(v0) < 1.e+100 && Abs(v1) < 1.e+100) ) {
Standard_Real delta_v = 0.01*Abs(v1 - v0);
v0 -= delta_v;
v1 += delta_v;
}
}
}
#ifdef DEB #ifdef DEB
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>

8
tests/bugs/modalg/buc60703_1
View File

@ -1,6 +1,6 @@
puts "TODO OCC12345 ALL: An exception was caught" #puts "TODO OCC12345 ALL: An exception was caught"
puts "TODO OCC12345 ALL: Exception" #puts "TODO OCC12345 ALL: Exception"
puts "TODO OCC12345 ALL: Faulty BUC60703: here is problem with FUSE operation" #puts "TODO OCC12345 ALL: Faulty BUC60703: here is problem with FUSE operation"
puts "========================" puts "========================"
puts "BUC60703" puts "BUC60703"
@ -31,7 +31,7 @@ if [catch {bfuse result a b } catch_result] {
puts "BUC60703 OK" puts "BUC60703 OK"
} }
# maxtolerance res # maxtolerance res
set square 0 set square 237.333
set 2dviewer 0 set 2dviewer 0
} }

17
tests/bugs/modalg/bug23732 Executable file
View File

@ -0,0 +1,17 @@
puts "========="
puts "CR23722"
puts "========="
puts ""
###############################
## Exception reaised during intersection between two surfaces
###############################
restore [locate_data_file bug23732_fx1.brep] b1
restore [locate_data_file bug23732_fx2.brep] b2
mksurface s1 b1
mksurface s2 b1
intersect result s1 s2
set 2dviewer 1