mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-05 18:16:23 +03:00
0025991: Cyclic dependency in OCCT detected by WOK compiler
The reason of possible exception has been eliminated.
This commit is contained in:
nbv
bugmaster
parent
7e859dff1b
commit
7a91ad6e81
@ -88,13 +88,14 @@
|
||||
#include <Approx_CurveOnSurface.hxx>
|
||||
#include <GeomAdaptor.hxx>
|
||||
#include <GeomProjLib.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <TColStd_Array1OfReal.hxx>
|
||||
#include <TColgp_Array1OfPnt2d.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <Geom2d_BSplineCurve.hxx>
|
||||
#include <Geom2dAPI_InterCurveCurve.hxx>
|
||||
#include <Geom2dAdaptor_Curve.hxx>
|
||||
#include <IntRes2d_IntersectionPoint.hxx>
|
||||
#include <IntRes2d_IntersectionSegment.hxx>
|
||||
#include <Geom2dInt_GInter.hxx>
|
||||
|
||||
static
|
||||
void Parameters(const Handle(GeomAdaptor_HSurface)& HS1,
|
||||
@ -2054,6 +2055,98 @@ Standard_Boolean FindPoint(const gp_Pnt2d& theFirstPoint,
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : ParametersOfNearestPointOnSurface
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
static Standard_Boolean ParametersOfNearestPointOnSurface(const Extrema_ExtPS theExtr,
|
||||
Standard_Real& theU,
|
||||
Standard_Real& theV)
|
||||
{
|
||||
if(!theExtr.IsDone() || !theExtr.NbExt())
|
||||
return Standard_False;
|
||||
|
||||
Standard_Integer anIndex = 1;
|
||||
Standard_Real aMinSQDist = theExtr.SquareDistance(anIndex);
|
||||
for(Standard_Integer i = 2; i <= theExtr.NbExt(); i++)
|
||||
{
|
||||
Standard_Real aSQD = theExtr.SquareDistance(i);
|
||||
if (aSQD < aMinSQDist)
|
||||
{
|
||||
aMinSQDist = aSQD;
|
||||
anIndex = i;
|
||||
}
|
||||
}
|
||||
|
||||
theExtr.Point(anIndex).Parameter(theU, theV);
|
||||
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : GetSegmentBoundary
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
static void GetSegmentBoundary( const IntRes2d_IntersectionSegment& theSegm,
|
||||
const Handle(Geom2d_Curve)& theCurve,
|
||||
GeomInt_VectorOfReal& theArrayOfParameters)
|
||||
{
|
||||
Standard_Real aU1 = theCurve->FirstParameter(), aU2 = theCurve->LastParameter();
|
||||
|
||||
if(theSegm.HasFirstPoint())
|
||||
{
|
||||
const IntRes2d_IntersectionPoint& anIPF = theSegm.FirstPoint();
|
||||
aU1 = anIPF.ParamOnFirst();
|
||||
}
|
||||
|
||||
if(theSegm.HasLastPoint())
|
||||
{
|
||||
const IntRes2d_IntersectionPoint& anIPL = theSegm.LastPoint();
|
||||
aU2 = anIPL.ParamOnFirst();
|
||||
}
|
||||
|
||||
theArrayOfParameters.Append(aU1);
|
||||
theArrayOfParameters.Append(aU2);
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : IntersectCurveAndBoundary
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
static void IntersectCurveAndBoundary(const Handle(Geom2d_Curve)& theC2d,
|
||||
const Handle(Geom2d_Curve)* const theArrBounds,
|
||||
const Standard_Integer theNumberOfCurves,
|
||||
const Standard_Real theTol,
|
||||
GeomInt_VectorOfReal& theArrayOfParameters)
|
||||
{
|
||||
if(theC2d.IsNull())
|
||||
return;
|
||||
|
||||
Geom2dAdaptor_Curve anAC1(theC2d);
|
||||
for(Standard_Integer aCurID = 0; aCurID < theNumberOfCurves; aCurID++)
|
||||
{
|
||||
if(theArrBounds[aCurID].IsNull())
|
||||
continue;
|
||||
|
||||
Geom2dAdaptor_Curve anAC2(theArrBounds[aCurID]);
|
||||
Geom2dInt_GInter anIntCC2d(anAC1, anAC2, theTol, theTol);
|
||||
|
||||
if(!anIntCC2d.IsDone() || anIntCC2d.IsEmpty())
|
||||
continue;
|
||||
|
||||
for (Standard_Integer aPntID = 1; aPntID <= anIntCC2d.NbPoints(); aPntID++)
|
||||
{
|
||||
const Standard_Real aParam = anIntCC2d.Point(aPntID).ParamOnFirst();
|
||||
theArrayOfParameters.Append(aParam);
|
||||
}
|
||||
|
||||
for (Standard_Integer aSegmID = 1; aSegmID <= anIntCC2d.NbSegments(); aSegmID++)
|
||||
{
|
||||
GetSegmentBoundary(anIntCC2d.Segment(aSegmID), theC2d, theArrayOfParameters);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : TreatRLine
|
||||
//purpose : Approx of Restriction line
|
||||
@ -2147,45 +2240,55 @@ void GeomInt_IntSS::BuildPCurves (Standard_Real f,
|
||||
}
|
||||
}
|
||||
else {
|
||||
if((l - f) > Epsilon(Abs(f))) {
|
||||
GeomAPI_ProjectPointOnSurf aProjector1, aProjector2;
|
||||
gp_Pnt P1 = C->Value(f);
|
||||
gp_Pnt P2 = C->Value(l);
|
||||
aProjector1.Init(P1, S);
|
||||
aProjector2.Init(P2, S);
|
||||
if((l - f) > Epsilon(Abs(f)))
|
||||
{
|
||||
//The domain of C2d is [Epsilon(Abs(f)), 2.e-09]
|
||||
//On this small range C2d can be considered as segment
|
||||
//of line.
|
||||
|
||||
if(aProjector1.IsDone() && aProjector2.IsDone()) {
|
||||
Standard_Real U=0., V=0.;
|
||||
aProjector1.LowerDistanceParameters(U, V);
|
||||
gp_Pnt2d p1(U, V);
|
||||
Standard_Real aU=0., aV=0.;
|
||||
GeomAdaptor_Surface anAS;
|
||||
anAS.Load(S);
|
||||
Extrema_ExtPS anExtr;
|
||||
const gp_Pnt aP3d1 = C->Value(f);
|
||||
const gp_Pnt aP3d2 = C->Value(l);
|
||||
|
||||
aProjector2.LowerDistanceParameters(U, V);
|
||||
gp_Pnt2d p2(U, V);
|
||||
anExtr.SetAlgo(Extrema_ExtAlgo_Grad);
|
||||
anExtr.Initialize(anAS, umin, umax, vmin, vmax,
|
||||
Precision::Confusion(), Precision::Confusion());
|
||||
anExtr.Perform(aP3d1);
|
||||
|
||||
if(p1.Distance(p2) > gp::Resolution()) {
|
||||
TColgp_Array1OfPnt2d poles(1,2);
|
||||
TColStd_Array1OfReal knots(1,2);
|
||||
TColStd_Array1OfInteger mults(1,2);
|
||||
poles(1) = p1;
|
||||
poles(2) = p2;
|
||||
knots(1) = f;
|
||||
knots(2) = l;
|
||||
mults(1) = mults(2) = 2;
|
||||
if(ParametersOfNearestPointOnSurface(anExtr, aU, aV))
|
||||
{
|
||||
const gp_Pnt2d aP2d1(aU, aV);
|
||||
|
||||
C2d = new Geom2d_BSplineCurve(poles,knots,mults,1);
|
||||
anExtr.Perform(aP3d2);
|
||||
|
||||
// compute reached tolerance.begin
|
||||
gp_Pnt PMid = C->Value((f + l) * 0.5);
|
||||
aProjector1.Perform(PMid);
|
||||
if(ParametersOfNearestPointOnSurface(anExtr, aU, aV))
|
||||
{
|
||||
const gp_Pnt2d aP2d2(aU, aV);
|
||||
|
||||
if(aProjector1.IsDone()) {
|
||||
aProjector1.LowerDistanceParameters(U, V);
|
||||
gp_Pnt2d pmidproj(U, V);
|
||||
gp_Pnt2d pmidcurve2d = C2d->Value((f + l) * 0.5);
|
||||
Standard_Real adist = pmidcurve2d.Distance(pmidproj);
|
||||
Tol = (adist > Tol) ? adist : Tol;
|
||||
if(aP2d1.Distance(aP2d2) > gp::Resolution())
|
||||
{
|
||||
TColgp_Array1OfPnt2d poles(1,2);
|
||||
TColStd_Array1OfReal knots(1,2);
|
||||
TColStd_Array1OfInteger mults(1,2);
|
||||
poles(1) = aP2d1;
|
||||
poles(2) = aP2d2;
|
||||
knots(1) = f;
|
||||
knots(2) = l;
|
||||
mults(1) = mults(2) = 2;
|
||||
|
||||
C2d = new Geom2d_BSplineCurve(poles,knots,mults,1);
|
||||
|
||||
//Check same parameter in middle point .begin
|
||||
const gp_Pnt PMid(C->Value(0.5*(f+l)));
|
||||
const gp_Pnt2d pmidcurve2d(0.5*(aP2d1.XY() + aP2d2.XY()));
|
||||
const gp_Pnt aPC(anAS.Value(pmidcurve2d.X(), pmidcurve2d.Y()));
|
||||
const Standard_Real aDist = PMid.Distance(aPC);
|
||||
Tol = Max(aDist, Tol);
|
||||
//Check same parameter in middle point .end
|
||||
}
|
||||
// compute reached tolerance.end
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2309,57 +2412,13 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
|
||||
}
|
||||
}
|
||||
|
||||
Geom2dAPI_InterCurveCurve anIntCC2d;
|
||||
const Standard_Real anIntTol = 10.0*Precision::Confusion();
|
||||
|
||||
if(!theC2d1.IsNull())
|
||||
{
|
||||
for(Standard_Integer aCurID = 0; aCurID < aNumberOfCurves; aCurID++)
|
||||
{
|
||||
if(aCurS1Bounds[aCurID].IsNull())
|
||||
continue;
|
||||
IntersectCurveAndBoundary(theC2d1, aCurS1Bounds,
|
||||
aNumberOfCurves, anIntTol, theArrayOfParameters);
|
||||
|
||||
anIntCC2d.Init(theC2d1, aCurS1Bounds[aCurID]);
|
||||
|
||||
for (Standard_Integer aPntID = 1; aPntID <= anIntCC2d.NbPoints(); aPntID++)
|
||||
{
|
||||
const Standard_Real aParam = anIntCC2d.Intersector().Point(aPntID).ParamOnFirst();
|
||||
theArrayOfParameters.Append(aParam);
|
||||
}
|
||||
|
||||
for (Standard_Integer aSegmID = 1; aSegmID <= anIntCC2d.NbSegments(); aSegmID++)
|
||||
{
|
||||
Handle(Geom2d_Curve) aCS, aCSTemp;
|
||||
anIntCC2d.Segment(aSegmID, aCS, aCSTemp);
|
||||
theArrayOfParameters.Append(aCS->FirstParameter());
|
||||
theArrayOfParameters.Append(aCS->LastParameter());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!theC2d2.IsNull())
|
||||
{
|
||||
for(Standard_Integer aCurID = 0; aCurID < aNumberOfCurves; aCurID++)
|
||||
{
|
||||
if(aCurS2Bounds[aCurID].IsNull())
|
||||
continue;
|
||||
|
||||
anIntCC2d.Init(theC2d2, aCurS2Bounds[aCurID]);
|
||||
|
||||
for (Standard_Integer aPntID = 1; aPntID <= anIntCC2d.NbPoints(); aPntID++)
|
||||
{
|
||||
const Standard_Real aParam = anIntCC2d.Intersector().Point(aPntID).ParamOnFirst();
|
||||
theArrayOfParameters.Append(aParam);
|
||||
}
|
||||
|
||||
for (Standard_Integer aSegmID = 1; aSegmID <= anIntCC2d.NbSegments(); aSegmID++)
|
||||
{
|
||||
Handle(Geom2d_Curve) aCS, aCSTemp;
|
||||
anIntCC2d.Segment(aSegmID, aCS, aCSTemp);
|
||||
theArrayOfParameters.Append(aCS->FirstParameter());
|
||||
theArrayOfParameters.Append(aCS->LastParameter());
|
||||
}
|
||||
}
|
||||
}
|
||||
IntersectCurveAndBoundary(theC2d2, aCurS2Bounds,
|
||||
aNumberOfCurves, anIntTol, theArrayOfParameters);
|
||||
|
||||
std::sort(theArrayOfParameters.begin(), theArrayOfParameters.end());
|
||||
}
|
||||
|
||||
@ -23,7 +23,8 @@
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TColStd_SequenceOfReal.hxx>
|
||||
#include <IntPatch_GLine.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <Extrema_ExtPC.hxx>
|
||||
#include <GeomAdaptor_Curve.hxx>
|
||||
#include <Geom_Ellipse.hxx>
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Hyperbola.hxx>
|
||||
@ -1673,9 +1674,9 @@ inline const gp_Pnt& VertexValue( const Handle(IntPatch_RLine) theRLine,
|
||||
return theRLine->Vertex(theIndex).Value();
|
||||
}
|
||||
|
||||
static Standard_Real SquareDistance(const Handle(IntPatch_GLine) theGLine,
|
||||
static Standard_Real SquareDistance(const Handle(IntPatch_GLine)& theGLine,
|
||||
const gp_Pnt& theP,
|
||||
GeomAPI_ProjectPointOnCurve& thePrj)
|
||||
Extrema_ExtPC& theExtr)
|
||||
{
|
||||
Standard_Real aSQDist = RealLast();
|
||||
switch(theGLine->ArcType())
|
||||
@ -1687,14 +1688,23 @@ static Standard_Real SquareDistance(const Handle(IntPatch_GLine) theGLine,
|
||||
aSQDist = theGLine->Circle().SquareDistance(theP);
|
||||
break;
|
||||
default:
|
||||
thePrj.Perform(theP);
|
||||
if(thePrj.NbPoints() == 0)
|
||||
theExtr.Perform(theP);
|
||||
if(!theExtr.IsDone() || !theExtr.NbExt())
|
||||
{
|
||||
//Lines are not overlapped
|
||||
return aSQDist;
|
||||
}
|
||||
|
||||
aSQDist = theP.SquareDistance(thePrj.NearestPoint());
|
||||
aSQDist = theExtr.SquareDistance(1);
|
||||
const Standard_Integer aNbExtr = theExtr.NbExt();
|
||||
for ( Standard_Integer i = 2; i <= aNbExtr; i++)
|
||||
{
|
||||
const Standard_Real aSQD = theExtr.SquareDistance(i);
|
||||
if (aSQD < aSQDist)
|
||||
{
|
||||
aSQDist = aSQD;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return aSQDist;
|
||||
@ -1726,9 +1736,10 @@ static Standard_Boolean IsRLineGood(const IntSurf_Quadric& Quad1,
|
||||
if(aNbPntsM1 < 1)
|
||||
return Standard_False;
|
||||
|
||||
GeomAPI_ProjectPointOnCurve aPrj;
|
||||
|
||||
Extrema_ExtPC anExtr;
|
||||
GeomAdaptor_Curve anAC;
|
||||
Handle(Geom_Curve) aCurv;
|
||||
|
||||
if(aGType == IntPatch_Ellipse)
|
||||
aCurv = new Geom_Ellipse(theGLine->Ellipse());
|
||||
else if(aGType == IntPatch_Parabola)
|
||||
@ -1737,7 +1748,12 @@ static Standard_Boolean IsRLineGood(const IntSurf_Quadric& Quad1,
|
||||
aCurv = new Geom_Hyperbola(theGLine->Hyperbola());
|
||||
|
||||
if(!aCurv.IsNull())
|
||||
aPrj.Init(aCurv, aCurv->FirstParameter(), aCurv->LastParameter());
|
||||
{
|
||||
const Standard_Real anUinf = aCurv->FirstParameter(),
|
||||
anUsup = aCurv->LastParameter();
|
||||
anAC.Load(aCurv, anUinf, anUsup);
|
||||
anExtr.Initialize(anAC, anUinf, anUsup);
|
||||
}
|
||||
|
||||
if(aNbPntsM1 == 1)
|
||||
{
|
||||
@ -1767,14 +1783,14 @@ static Standard_Boolean IsRLineGood(const IntSurf_Quadric& Quad1,
|
||||
aPMid = Quad2.Value(aP2d.X(), aP2d.Y());
|
||||
}
|
||||
|
||||
const Standard_Real aSQDist = SquareDistance(theGLine, aPMid, aPrj);
|
||||
const Standard_Real aSQDist = SquareDistance(theGLine, aPMid, anExtr);
|
||||
return (aSQDist > aSQTol);
|
||||
}
|
||||
|
||||
for(Standard_Integer i = 2; i <= aNbPntsM1; i++)
|
||||
{
|
||||
const gp_Pnt aP(Value(theRLine, i));
|
||||
const Standard_Real aSQDist = SquareDistance(theGLine, aP, aPrj);
|
||||
const Standard_Real aSQDist = SquareDistance(theGLine, aP, anExtr);
|
||||
|
||||
if(aSQDist > aSQTol)
|
||||
return Standard_True;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user