OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0032607: Modeling Algorithms - BOPAlgo_BOP returns incomplete result

Browse Source 
IntPatch/IntPatch_ImpPrmIntersection.cxx - decreasing step for some conditions
tests/lowalgos/intss/bug32607 - test case added
This commit is contained in:
ifv 2021-10-04 17:25:56 +03:00 committed by smoskvin
parent 96b92906de
commit 56b495d93b
2 changed files with 108 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/IntPatch/IntPatch_ImpPrmIntersection.cxx
View File

@ -81,6 +81,11 @@ static
const Standard_Real theToler2D,
const Standard_Real thePeriod);
static
Standard_Real GetLocalStep(const Handle(Adaptor3d_Surface)& theSurf,
const Standard_Real theStep);
//=======================================================================
//function : IsSeamOrPole
//purpose :
@ -481,6 +486,81 @@ void Recadre(const Standard_Boolean ,
pt.SetParameters(U1,V1,U2,V2);
}
//=======================================================================
//function : GetLocalStep
//purpose :
//=======================================================================
Standard_Real GetLocalStep(const Handle(Adaptor3d_Surface)& theSurf,
const Standard_Real theStep)
{
Standard_Real aLocalStep = theStep;
if (theSurf->UContinuity() > GeomAbs_C0 && theSurf->VContinuity() > GeomAbs_C0)
{
GeomAbs_SurfaceType aSType = theSurf->GetType();
if (aSType == GeomAbs_BezierSurface || aSType == GeomAbs_BSplineSurface)
{
Standard_Real aMinRes = Precision::Infinite();
Standard_Integer aMaxDeg = 0;
const Standard_Real aLimRes = 1.e-10;
aMinRes = Min(theSurf->UResolution(Precision::Confusion()),
theSurf->VResolution(Precision::Confusion()));
aMaxDeg = Max(theSurf->UDegree(), theSurf->VDegree());
if (aMinRes < aLimRes && aMaxDeg > 3)
{
aLocalStep = 0.0001;
}
}
}
if (theSurf->UContinuity() == GeomAbs_C0)
{
Standard_Integer aNbInt = theSurf->NbUIntervals(GeomAbs_C1);
if (aNbInt > 1)
{
TColStd_Array1OfReal anInts(1, aNbInt + 1);
theSurf->UIntervals(anInts, GeomAbs_C1);
Standard_Integer i;
Standard_Real aMinInt = Precision::Infinite();
for (i = 1; i <= aNbInt; ++i)
{
aMinInt = Min(aMinInt, anInts(i + 1) - anInts(i));
}
aMinInt /= theSurf->LastUParameter() - theSurf->FirstUParameter();
if (aMinInt < 0.002)
{
aLocalStep = 0.0001;
}
}
}
if (theSurf->VContinuity() == GeomAbs_C0)
{
Standard_Integer aNbInt = theSurf->NbVIntervals(GeomAbs_C1);
if (aNbInt > 1)
{
TColStd_Array1OfReal anInts(1, aNbInt + 1);
theSurf->VIntervals(anInts, GeomAbs_C1);
Standard_Integer i;
Standard_Real aMinInt = Precision::Infinite();
for (i = 1; i <= aNbInt; ++i)
{
aMinInt = Min(aMinInt, anInts(i + 1) - anInts(i));
}
aMinInt /= theSurf->LastVParameter() - theSurf->FirstVParameter();
if (aMinInt < 0.002)
{
aLocalStep = 0.0001;
}
}
}
aLocalStep = Min(theStep, aLocalStep);
return aLocalStep;
}
//=======================================================================
//function : Perform
//purpose :
@ -587,35 +667,10 @@ void IntPatch_ImpPrmIntersection::Perform (const Handle(Adaptor3d_Surface)& Surf
}
//
Standard_Real aLocalPas = Pas;
GeomAbs_SurfaceType aSType = reversed ? Surf1->GetType() : Surf2->GetType();
if (aSType == GeomAbs_BezierSurface || aSType == GeomAbs_BSplineSurface)
{
Standard_Real aMinRes = Precision::Infinite();
GeomAbs_Shape aCont = GeomAbs_C0;
Standard_Integer aMaxDeg = 0;
const Standard_Real aLimRes = 1.e-10;
if (reversed)
{
aMinRes = Min(Surf1->UResolution(Precision::Confusion()),
Surf1->VResolution(Precision::Confusion()));
aCont = (GeomAbs_Shape)Min(Surf1->UContinuity(), Surf1->VContinuity());
aMaxDeg = Max(Surf1->UDegree(), Surf1->VDegree());
}
else
{
aMinRes = Min(Surf2->UResolution(Precision::Confusion()),
Surf2->VResolution(Precision::Confusion()));
aCont = (GeomAbs_Shape)Min(Surf2->UContinuity(), Surf2->VContinuity());
aMaxDeg = Max(Surf2->UDegree(), Surf2->VDegree());
}
if (aMinRes < aLimRes && aCont > GeomAbs_C0 && aMaxDeg > 3)
{
aLocalPas = Min(Pas, 0.0001);
}
}
if (reversed)
aLocalPas = GetLocalStep(Surf1, Pas);
else
aLocalPas = GetLocalStep(Surf2, Pas);
Func.SetImplicitSurface(Quad);
Func.Set(IntSurf_QuadricTool::Tolerance(Quad));

24
tests/lowalgos/intss/bug32607 Normal file
View File

@ -0,0 +1,24 @@
puts "========"
puts "0032607: Modeling Algorithms - BOPAlgo_BOP returns incomplete result"
puts "========"
puts ""
restore [locate_data_file bug32607.brep] s
explode s
regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves s_1 s_2 -2d] full Toler NbCurv
checkreal Tolerance $Toler 0.0011727990276470168 1.0e-7 0.0
if {$NbCurv != 1} {
puts "Error: Please check NbCurves for intersector"
} else {
checklength c_1 -l 14.469397997508448
CheckLoops c_1
}
smallview
don c_*
fit
disp s_1 s_2
checkview -screenshot -2d -path ${imagedir}/${test_image}.png