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

239343: OCC fails to work with offset surfaces with singularities

Browse Source 
Add test cases for this fix
This commit is contained in:
Roman Lygin 2013-05-23 14:52:21 +04:00
parent f7b4312f04
commit c15398ab70
6 changed files with 106 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Geom/Geom_OsculatingSurface.cxx
View File

@ -62,7 +62,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
{ {
ClearOsculFlags(); ClearOsculFlags();
myTol=Tol; myTol=Tol;
Standard_Real TolMin=1.e-12; Standard_Real TolMin=0.;//consider all singularities below Tol, not just above 1.e-12 (id23943)
Standard_Boolean OsculSurf = Standard_True; Standard_Boolean OsculSurf = Standard_True;
myBasisSurf = Handle(Geom_Surface)::DownCast(BS->Copy()); myBasisSurf = Handle(Geom_Surface)::DownCast(BS->Copy());
myOsculSurf1 = new Geom_HSequenceOfBSplineSurface(); myOsculSurf1 = new Geom_HSequenceOfBSplineSurface();
@ -78,7 +78,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
myAlong.SetValue(2,IsQPunctual(BS,V2,GeomAbs_IsoV,TolMin,Tol)); myAlong.SetValue(2,IsQPunctual(BS,V2,GeomAbs_IsoV,TolMin,Tol));
myAlong.SetValue(3,IsQPunctual(BS,U1,GeomAbs_IsoU,TolMin,Tol)); myAlong.SetValue(3,IsQPunctual(BS,U1,GeomAbs_IsoU,TolMin,Tol));
myAlong.SetValue(4,IsQPunctual(BS,U2,GeomAbs_IsoU,TolMin,Tol)); myAlong.SetValue(4,IsQPunctual(BS,U2,GeomAbs_IsoU,TolMin,Tol));
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<myAlong(1)<<endl<<myAlong(2)<<endl<<myAlong(3)<<endl<<myAlong(4)<<endl; cout<<myAlong(1)<<endl<<myAlong(2)<<endl<<myAlong(3)<<endl<<myAlong(4)<<endl;
#endif #endif
if (myAlong(1) || myAlong(2) || myAlong(3) || myAlong(4)) if (myAlong(1) || myAlong(2) || myAlong(3) || myAlong(4))
@ -111,7 +111,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
{ {
InitSurf = Handle(Geom_BSplineSurface)::DownCast(myBasisSurf); InitSurf = Handle(Geom_BSplineSurface)::DownCast(myBasisSurf);
} }
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"UDEG: "<<InitSurf->UDegree()<<endl; cout<<"UDEG: "<<InitSurf->UDegree()<<endl;
cout<<"VDEG: "<<InitSurf->VDegree()<<endl; cout<<"VDEG: "<<InitSurf->VDegree()<<endl;
#endif #endif
@ -139,7 +139,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(V1,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(V1,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"1.k = "<<k<<endl; cout<<"1.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,V1,GeomAbs_IsoV,0.,Tol); IsQPunc=IsQPunctual(L,V1,GeomAbs_IsoV,0.,Tol);
@ -163,7 +163,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(V2,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(V2,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"2.k = "<<k<<endl; cout<<"2.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,V2,GeomAbs_IsoV,0.,Tol); IsQPunc=IsQPunctual(L,V2,GeomAbs_IsoV,0.,Tol);
@ -189,7 +189,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(V2,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(V2,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"2.k = "<<k<<endl; cout<<"2.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,V2,GeomAbs_IsoV,0.,Tol); IsQPunc=IsQPunctual(L,V2,GeomAbs_IsoV,0.,Tol);
@ -222,7 +222,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(U1,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(U1,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"1.k = "<<k<<endl; cout<<"1.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,U1,GeomAbs_IsoU,0.,Tol); IsQPunc=IsQPunctual(L,U1,GeomAbs_IsoU,0.,Tol);
@ -244,7 +244,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(U2,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(U2,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"2.k = "<<k<<endl; cout<<"2.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,U2,GeomAbs_IsoU,0.,Tol); IsQPunc=IsQPunctual(L,U2,GeomAbs_IsoU,0.,Tol);
@ -269,7 +269,7 @@ void Geom_OsculatingSurface::Init(const Handle(Geom_Surface)& BS,
OsculSurf = BuildOsculatingSurface(U2,UKnot,VKnot,S,L); OsculSurf = BuildOsculatingSurface(U2,UKnot,VKnot,S,L);
if(!OsculSurf) break; if(!OsculSurf) break;
k++; k++;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"2.k = "<<k<<endl; cout<<"2.k = "<<k<<endl;
#endif #endif
IsQPunc=IsQPunctual(L,U2,GeomAbs_IsoU,0.,Tol); IsQPunc=IsQPunctual(L,U2,GeomAbs_IsoU,0.,Tol);
@ -447,7 +447,7 @@ Standard_Boolean Geom_OsculatingSurface::BuildOsculatingSurface
{ {
Standard_Integer i, j; Standard_Integer i, j;
Standard_Boolean OsculSurf=Standard_True; Standard_Boolean OsculSurf=Standard_True;
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"t = "<<Param<<endl; cout<<"t = "<<Param<<endl;
cout<<"======================================"<<endl<<endl; cout<<"======================================"<<endl<<endl;
#endif #endif
@ -460,7 +460,7 @@ Standard_Boolean Geom_OsculatingSurface::BuildOsculatingSurface
vdeg = BS->VDegree(); vdeg = BS->VDegree();
if( (IsAlongU() && vdeg <=1) || (IsAlongV() && udeg <=1)) if( (IsAlongU() && vdeg <=1) || (IsAlongV() && udeg <=1))
{ {
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<" surface osculatrice nulle "<<endl; cout<<" surface osculatrice nulle "<<endl;
#endif #endif
//Standard_ConstructionError::Raise("Geom_OsculatingSurface"); //Standard_ConstructionError::Raise("Geom_OsculatingSurface");
@ -503,7 +503,7 @@ Standard_Boolean Geom_OsculatingSurface::BuildOsculatingSurface
Standard_Integer OscUNumCoeff=0, OscVNumCoeff=0; Standard_Integer OscUNumCoeff=0, OscVNumCoeff=0;
if (IsAlongU()) if (IsAlongU())
{ {
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<">>>>>>>>>>> AlongU"<<endl; cout<<">>>>>>>>>>> AlongU"<<endl;
#endif #endif
OscUNumCoeff = (Standard_Integer ) udeg + 1; OscUNumCoeff = (Standard_Integer ) udeg + 1;
@ -511,7 +511,7 @@ Standard_Boolean Geom_OsculatingSurface::BuildOsculatingSurface
} }
if (IsAlongV()) if (IsAlongV())
{ {
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<">>>>>>>>>>> AlongV"<<endl; cout<<">>>>>>>>>>> AlongV"<<endl;
#endif #endif
OscUNumCoeff = (Standard_Integer ) udeg; OscUNumCoeff = (Standard_Integer ) udeg;
@ -650,7 +650,7 @@ Standard_Boolean Geom_OsculatingSurface::BuildOsculatingSurface
Data.UDegree(), Data.UDegree(),
Data.VDegree(), Data.VDegree(),
0, 0); 0, 0);
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout<<"^====================================^"<<endl<<endl; cout<<"^====================================^"<<endl<<endl;
#endif #endif
@ -687,7 +687,7 @@ Standard_Boolean Geom_OsculatingSurface::IsQPunctual
D1NormMax=Max(D1NormMax,D1U.Magnitude()); D1NormMax=Max(D1NormMax,D1U.Magnitude());
} }
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout << " D1NormMax = " << D1NormMax << endl; cout << " D1NormMax = " << D1NormMax << endl;
#endif #endif
if (D1NormMax >TolMax || D1NormMax < TolMin ) if (D1NormMax >TolMax || D1NormMax < TolMin )
@ -702,7 +702,7 @@ Standard_Boolean Geom_OsculatingSurface::IsQPunctual
S->D1(Param,T,P,D1U,D1V); S->D1(Param,T,P,D1U,D1V);
D1NormMax=Max(D1NormMax,D1V.Magnitude()); D1NormMax=Max(D1NormMax,D1V.Magnitude());
} }
#ifdef DEB #if defined(DEB) && defined(OCCT_DEVELOPMENT)
cout << " D1NormMax = " << D1NormMax << endl; cout << " D1NormMax = " << D1NormMax << endl;
#endif #endif
if (D1NormMax >TolMax || D1NormMax < TolMin ) if (D1NormMax >TolMax || D1NormMax < TolMin )

7
src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
View File

@ -997,9 +997,14 @@ gp_Pnt2d ShapeAnalysis_Surface::ValueOfUV(const gp_Pnt& P3D,const Standard_Real
// Forcer appel a IsU-VClosed // Forcer appel a IsU-VClosed
if (myUCloseVal < 0) IsUClosed(); if (myUCloseVal < 0) IsUClosed();
if (myVCloseVal < 0) IsVClosed(); if (myVCloseVal < 0) IsVClosed();
Standard_Real du = 0., dv = 0.;
//extension of the surface range is limited to non-offset surfaces as the latter
//can throw exception (e.g. Geom_UndefinedValue) when computing value - see id23943
if (!mySurf->IsKind (STANDARD_TYPE (Geom_OffsetSurface))) {
//modified by rln during fixing CSR # BUC60035 entity #D231 //modified by rln during fixing CSR # BUC60035 entity #D231
Standard_Real du = Min (myUDelt, SurfAdapt.UResolution (preci)), du = Min (myUDelt, SurfAdapt.UResolution (preci));
dv = Min (myVDelt, SurfAdapt.VResolution (preci)); dv = Min (myVDelt, SurfAdapt.VResolution (preci));
}
myExtSrf = mySurf; myExtSrf = mySurf;
Standard_Real Tol = Precision::PConfusion(); Standard_Real Tol = Precision::PConfusion();
myExtPS.SetFlag (Extrema_ExtFlag_MIN); myExtPS.SetFlag (Extrema_ExtFlag_MIN);

28
tests/bugs/moddata_3/bug23943_1 Executable file
View File

@ -0,0 +1,28 @@
puts "============"
puts "OCC23943"
puts "============"
puts ""
#######################################################################
# OCC fails to work with offset surfaces with singularities
#######################################################################
set BugNumber OCC23943
pload XDE
restore [locate_data_file bug23943_a.brep] s
fixshape result s
checkshape result
regexp {EDGE +: +([-0-9.+eE]+)} [numshapes s] full EDGE_num_s
regexp {EDGE +: +([-0-9.+eE]+)} [numshapes result] full EDGE_num_result
if {${EDGE_num_result} != ${EDGE_num_s} || ${EDGE_num_result} == 0} {
puts "Faulty ${BugNumber}"
} else {
puts "OK ${BugNumber}"
}
set 2dviewer 0

28
tests/bugs/moddata_3/bug23943_2 Executable file
View File

@ -0,0 +1,28 @@
puts "============"
puts "OCC23943"
puts "============"
puts ""
#######################################################################
# OCC fails to work with offset surfaces with singularities
#######################################################################
set BugNumber OCC23943
pload XDE
restore [locate_data_file bug23943_b.brep] s
fixshape result s
checkshape result
regexp {EDGE +: +([-0-9.+eE]+)} [numshapes s] full EDGE_num_s
regexp {EDGE +: +([-0-9.+eE]+)} [numshapes result] full EDGE_num_result
if {${EDGE_num_result} != ${EDGE_num_s} || ${EDGE_num_result} == 0} {
puts "Faulty ${BugNumber}"
} else {
puts "OK ${BugNumber}"
}
set 2dviewer 0

13
tests/bugs/moddata_3/bug23943_3 Executable file
View File

@ -0,0 +1,13 @@
puts "============"
puts "OCC23943"
puts "============"
puts ""
#######################################################################
# OCC fails to work with offset surfaces with singularities
#######################################################################
set BugNumber OCC23943
restore [locate_data_file bug23943_s.brep] s
proj s 12.0565, 36.7424, -9.68517

13
tests/bugs/moddata_3/bug23943_4 Executable file
View File

@ -0,0 +1,13 @@
puts "============"
puts "OCC23943"
puts "============"
puts ""
#######################################################################
# OCC fails to work with offset surfaces with singularities
#######################################################################
set BugNumber OCC23943
restore [locate_data_file bug23943_s.brep] s
proj s 4.99019, 38.0944, -11.244