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

Synchronize with fix to OCC30391

Browse Source
This commit is contained in:
jgv
2018-12-05 17:47:44 +03:00
parent 8ca4e9e58a
commit a845073de7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/BRepOffset/BRepOffset_Tool.cxx
View File

@@ -2825,6 +2825,7 @@ static Standard_Boolean EnlargeGeometry(Handle(Geom_Surface)& S,
const Standard_Real uf2, const Standard_Real uf2,
const Standard_Real vf1, const Standard_Real vf1,
const Standard_Real vf2, const Standard_Real vf2,
const Standard_Real coeff,
const Standard_Boolean theGlobalEnlargeU, const Standard_Boolean theGlobalEnlargeU,
const Standard_Boolean theGlobalEnlargeVfirst, const Standard_Boolean theGlobalEnlargeVfirst,
const Standard_Boolean theGlobalEnlargeVlast, const Standard_Boolean theGlobalEnlargeVlast,
@@ -2833,14 +2834,13 @@ static Standard_Boolean EnlargeGeometry(Handle(Geom_Surface)& S,
const Standard_Real theLenBeforeVfirst, const Standard_Real theLenBeforeVfirst,
const Standard_Real theLenAfterVlast) const Standard_Real theLenAfterVlast)
{ {
const Standard_Real coeff = 1.;
const Standard_Real TolApex = 1.e-5; const Standard_Real TolApex = 1.e-5;
Standard_Boolean SurfaceChange = Standard_False; Standard_Boolean SurfaceChange = Standard_False;
if ( S->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { if ( S->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) {
Handle(Geom_Surface) BS = Handle(Geom_RectangularTrimmedSurface)::DownCast (S)->BasisSurface(); Handle(Geom_Surface) BS = Handle(Geom_RectangularTrimmedSurface)::DownCast (S)->BasisSurface();
EnlargeGeometry(BS,U1,U2,V1,V2,IsV1degen,IsV2degen, EnlargeGeometry(BS,U1,U2,V1,V2,IsV1degen,IsV2degen,
uf1,uf2,vf1,vf2, uf1,uf2,vf1,vf2,coeff,
theGlobalEnlargeU, theGlobalEnlargeVfirst, theGlobalEnlargeVlast, theGlobalEnlargeU, theGlobalEnlargeVfirst, theGlobalEnlargeVlast,
theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast); theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast);
if (!theGlobalEnlargeVfirst) if (!theGlobalEnlargeVfirst)
@@ -2857,7 +2857,7 @@ static Standard_Boolean EnlargeGeometry(Handle(Geom_Surface)& S,
else if (S->DynamicType() == STANDARD_TYPE(Geom_OffsetSurface)) { else if (S->DynamicType() == STANDARD_TYPE(Geom_OffsetSurface)) {
Handle(Geom_Surface) Surf = Handle(Geom_OffsetSurface)::DownCast (S)->BasisSurface(); Handle(Geom_Surface) Surf = Handle(Geom_OffsetSurface)::DownCast (S)->BasisSurface();
SurfaceChange = EnlargeGeometry(Surf,U1,U2,V1,V2,IsV1degen,IsV2degen, SurfaceChange = EnlargeGeometry(Surf,U1,U2,V1,V2,IsV1degen,IsV2degen,
uf1,uf2,vf1,vf2, uf1,uf2,vf1,vf2,coeff,
theGlobalEnlargeU, theGlobalEnlargeVfirst, theGlobalEnlargeVlast, theGlobalEnlargeU, theGlobalEnlargeVfirst, theGlobalEnlargeVlast,
theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast); theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast);
Handle(Geom_OffsetSurface)::DownCast(S)->SetBasisSurface(Surf); Handle(Geom_OffsetSurface)::DownCast(S)->SetBasisSurface(Surf);
@@ -3276,7 +3276,7 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
const Standard_Boolean theEnlargeU, const Standard_Boolean theEnlargeU,
const Standard_Boolean theEnlargeVfirst, const Standard_Boolean theEnlargeVfirst,
const Standard_Boolean theEnlargeVlast, const Standard_Boolean theEnlargeVlast,
const Standard_Boolean theUseInfini, const Standard_Integer theExtensionMode,
const Standard_Real theLenBeforeUfirst, const Standard_Real theLenBeforeUfirst,
const Standard_Real theLenAfterUlast, const Standard_Real theLenAfterUlast,
const Standard_Real theLenBeforeVfirst, const Standard_Real theLenBeforeVfirst,
@@ -3316,10 +3316,12 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
} }
S->Bounds (US1,US2,VS1,VS2); S->Bounds (US1,US2,VS1,VS2);
if (theUseInfini) Standard_Real coeff;
if (theExtensionMode == 1)
{ {
UU1 = VV1 = - infini; UU1 = VV1 = - infini;
UU2 = VV2 = infini; UU2 = VV2 = infini;
coeff = 0.25;
} }
else else
{ {
@@ -3329,10 +3331,11 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
UU2 = UF2 + 10*FaceDU; UU2 = UF2 + 10*FaceDU;
VV1 = VF1 - 10*FaceDV; VV1 = VF1 - 10*FaceDV;
VV2 = VF2 + 10*FaceDV; VV2 = VF2 + 10*FaceDV;
coeff = 1.;
} }
if (CanExtentSurface) { if (CanExtentSurface) {
SurfaceChange = EnlargeGeometry(S, UU1, UU2, VV1, VV2, isVV1degen, isVV2degen, UF1, UF2, VF1, VF2, SurfaceChange = EnlargeGeometry(S, UU1, UU2, VV1, VV2, isVV1degen, isVV2degen, UF1, UF2, VF1, VF2, coeff,
theEnlargeU, theEnlargeVfirst, theEnlargeVlast, theEnlargeU, theEnlargeVfirst, theEnlargeVlast,
theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast); theLenBeforeUfirst, theLenAfterUlast, theLenBeforeVfirst, theLenAfterVlast);
} }

2
src/BRepOffset/BRepOffset_Tool.hxx
View File

@@ -115,7 +115,7 @@ public:
const Standard_Boolean theEnlargeU = Standard_True, const Standard_Boolean theEnlargeU = Standard_True,
const Standard_Boolean theEnlargeVfirst = Standard_True, const Standard_Boolean theEnlargeVfirst = Standard_True,
const Standard_Boolean theEnlargeVlast = Standard_True, const Standard_Boolean theEnlargeVlast = Standard_True,
const Standard_Boolean theUseInfini = Standard_True, const Standard_Integer theExtensionMode = 1,
const Standard_Real theLenBeforeUfirst = -1., const Standard_Real theLenBeforeUfirst = -1.,
const Standard_Real theLenAfterUlast = -1., const Standard_Real theLenAfterUlast = -1.,
const Standard_Real theLenBeforeVfirst = -1., const Standard_Real theLenBeforeVfirst = -1.,