From 13223d710e8b274df8ebe035ed012506cf06ba47 Mon Sep 17 00:00:00 2001 From: nbv Date: Wed, 1 Nov 2017 17:45:10 +0300 Subject: [PATCH] Adaptor3d --- src/Adaptor3d/Adaptor3d_Curve.cxx | 2 +- src/Adaptor3d/Adaptor3d_Curve.hxx | 2 +- src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx | 2 +- src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx | 2 +- src/Adaptor3d/Adaptor3d_HCurve.hxx | 2 +- src/Adaptor3d/Adaptor3d_HCurve.lxx | 4 ++-- src/Adaptor3d/Adaptor3d_IsoCurve.cxx | 2 +- src/Adaptor3d/Adaptor3d_IsoCurve.hxx | 2 +- src/BRepAdaptor/BRepAdaptor_CompCurve.cxx | 2 +- src/BRepAdaptor/BRepAdaptor_CompCurve.hxx | 2 +- src/BRepAdaptor/BRepAdaptor_Curve.cxx | 6 +++--- src/BRepAdaptor/BRepAdaptor_Curve.hxx | 2 +- src/BRepAlgo/BRepAlgo.cxx | 4 ++-- src/BRepBlend/BRepBlend_HCurveTool.lxx | 2 +- src/BRepLProp/BRepLProp.cxx | 2 +- src/BiTgte/BiTgte_CurveOnEdge.cxx | 2 +- src/BiTgte/BiTgte_CurveOnEdge.hxx | 2 +- src/BiTgte/BiTgte_CurveOnVertex.cxx | 2 +- src/BiTgte/BiTgte_CurveOnVertex.hxx | 2 +- src/Blend/Blend_Walking_4.gxx | 2 +- src/ChFi3d/ChFi3d_Builder_0.cxx | 10 +++++----- src/ChFi3d/ChFi3d_Builder_2.cxx | 12 ++++++------ src/ChFi3d/ChFi3d_Builder_6.cxx | 4 ++-- src/ChFi3d/ChFi3d_Builder_C1.cxx | 5 +++-- src/ChFiDS/ChFiDS_ElSpine.cxx | 12 ++++++------ src/ChFiDS/ChFiDS_ElSpine.hxx | 4 ++-- src/ChFiDS/ChFiDS_FilSpine.cxx | 4 ++-- src/Extrema/Extrema_CurveTool.cxx | 2 +- src/Extrema/Extrema_ExtCS.cxx | 2 +- src/Extrema/Extrema_ExtPExtS.cxx | 5 +++-- src/GeomAdaptor/GeomAdaptor_Curve.cxx | 2 +- src/GeomAdaptor/GeomAdaptor_Curve.hxx | 2 +- .../GeomAdaptor_SurfaceOfLinearExtrusion.cxx | 2 +- src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx | 2 +- src/GeomFill/GeomFill_CorrectedFrenet.cxx | 2 +- src/GeomFill/GeomFill_GuideTrihedronPlan.cxx | 6 +++--- src/GeomFill/GeomFill_LocationGuide.cxx | 6 +++--- src/GeomFill/GeomFill_NSections.cxx | 11 ++++------- src/GeomFill/GeomFill_SnglrFunc.cxx | 4 ++-- src/GeomFill/GeomFill_SnglrFunc.hxx | 2 +- src/HLRBRep/HLRBRep_BCurveTool.lxx | 2 +- src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx | 2 +- src/IntTools/IntTools_BeanFaceIntersector.cxx | 2 +- src/LocOpe/LocOpe_SplitDrafts.cxx | 2 +- src/ProjLib/ProjLib_ComputeApprox.cxx | 6 ++++-- src/ProjLib/ProjLib_ProjectOnPlane.cxx | 6 +++--- src/ProjLib/ProjLib_ProjectOnPlane.hxx | 2 +- src/ProjLib/ProjLib_ProjectedCurve.cxx | 2 +- src/QABugs/QABugs_20.cxx | 2 +- 49 files changed, 87 insertions(+), 86 deletions(-) diff --git a/src/Adaptor3d/Adaptor3d_Curve.cxx b/src/Adaptor3d/Adaptor3d_Curve.cxx index 49b02da158..a98558efdc 100644 --- a/src/Adaptor3d/Adaptor3d_Curve.cxx +++ b/src/Adaptor3d/Adaptor3d_Curve.cxx @@ -123,7 +123,7 @@ Standard_Boolean Adaptor3d_Curve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor3d_Curve::IsPeriodic() const +Standard_Boolean Adaptor3d_Curve::IsPeriodic222() const { throw Standard_NotImplemented("Adaptor3d_Curve::IsPeriodic"); } diff --git a/src/Adaptor3d/Adaptor3d_Curve.hxx b/src/Adaptor3d/Adaptor3d_Curve.hxx index de882dc430..ad668ad5a3 100644 --- a/src/Adaptor3d/Adaptor3d_Curve.hxx +++ b/src/Adaptor3d/Adaptor3d_Curve.hxx @@ -88,7 +88,7 @@ public: Standard_EXPORT virtual Standard_Boolean IsClosed() const; - Standard_EXPORT virtual Standard_Boolean IsPeriodic() const; + Standard_EXPORT virtual Standard_Boolean IsPeriodic222() const; Standard_EXPORT virtual Standard_Real Period() const; diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx index f977b24650..bcf63320eb 100644 --- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx +++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx @@ -952,7 +952,7 @@ Standard_Boolean Adaptor3d_CurveOnSurface::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor3d_CurveOnSurface::IsPeriodic() const +Standard_Boolean Adaptor3d_CurveOnSurface::IsPeriodic222() const { return myCurve->IsPeriodic222(); } diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx index c7431f67a4..4674ba84a7 100644 --- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx +++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx @@ -112,7 +112,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/Adaptor3d/Adaptor3d_HCurve.hxx b/src/Adaptor3d/Adaptor3d_HCurve.hxx index 3e4e321af0..dde1eb537b 100644 --- a/src/Adaptor3d/Adaptor3d_HCurve.hxx +++ b/src/Adaptor3d/Adaptor3d_HCurve.hxx @@ -93,7 +93,7 @@ public: Standard_Boolean IsClosed() const; - Standard_Boolean IsPeriodic() const; + Standard_Boolean IsPeriodic222() const; Standard_Real Period() const; diff --git a/src/Adaptor3d/Adaptor3d_HCurve.lxx b/src/Adaptor3d/Adaptor3d_HCurve.lxx index 48b2d8d0d3..6e0286efdb 100644 --- a/src/Adaptor3d/Adaptor3d_HCurve.lxx +++ b/src/Adaptor3d/Adaptor3d_HCurve.lxx @@ -92,9 +92,9 @@ inline Standard_Real Adaptor3d_HCurve::FirstParameter() const //purpose : //======================================================================= - inline Standard_Boolean Adaptor3d_HCurve::IsPeriodic() const + inline Standard_Boolean Adaptor3d_HCurve::IsPeriodic222() const { - return Curve().IsPeriodic(); + return Curve().IsPeriodic222(); } //======================================================================= diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx index 5cbc54eb86..e8c1b27bca 100644 --- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx +++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx @@ -345,7 +345,7 @@ Standard_Boolean Adaptor3d_IsoCurve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor3d_IsoCurve::IsPeriodic() const +Standard_Boolean Adaptor3d_IsoCurve::IsPeriodic222() const { switch (myIso) { case GeomAbs_IsoU: diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.hxx b/src/Adaptor3d/Adaptor3d_IsoCurve.hxx index 2032eb9888..cf2cbbb560 100644 --- a/src/Adaptor3d/Adaptor3d_IsoCurve.hxx +++ b/src/Adaptor3d/Adaptor3d_IsoCurve.hxx @@ -114,7 +114,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx b/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx index e4068ac95c..0b4a2bdc6a 100644 --- a/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx +++ b/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx @@ -284,7 +284,7 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const return myWire.Closed(); } - Standard_Boolean BRepAdaptor_CompCurve::IsPeriodic() const + Standard_Boolean BRepAdaptor_CompCurve::IsPeriodic222() const { return Standard_False; diff --git a/src/BRepAdaptor/BRepAdaptor_CompCurve.hxx b/src/BRepAdaptor/BRepAdaptor_CompCurve.hxx index e009fea951..4e8d878e4e 100644 --- a/src/BRepAdaptor/BRepAdaptor_CompCurve.hxx +++ b/src/BRepAdaptor/BRepAdaptor_CompCurve.hxx @@ -113,7 +113,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/BRepAdaptor/BRepAdaptor_Curve.cxx b/src/BRepAdaptor/BRepAdaptor_Curve.cxx index 4b75698d01..a2481bca55 100644 --- a/src/BRepAdaptor/BRepAdaptor_Curve.cxx +++ b/src/BRepAdaptor/BRepAdaptor_Curve.cxx @@ -344,13 +344,13 @@ Standard_Boolean BRepAdaptor_Curve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean BRepAdaptor_Curve::IsPeriodic() const +Standard_Boolean BRepAdaptor_Curve::IsPeriodic222() const { if (myConSurf.IsNull()) { - return myCurve.IsPeriodic(); + return myCurve.IsPeriodic222(); } else { - return myConSurf->IsPeriodic(); + return myConSurf->IsPeriodic222(); } } diff --git a/src/BRepAdaptor/BRepAdaptor_Curve.hxx b/src/BRepAdaptor/BRepAdaptor_Curve.hxx index 640505d6f7..193226de93 100644 --- a/src/BRepAdaptor/BRepAdaptor_Curve.hxx +++ b/src/BRepAdaptor/BRepAdaptor_Curve.hxx @@ -149,7 +149,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/BRepAlgo/BRepAlgo.cxx b/src/BRepAlgo/BRepAlgo.cxx index b8648203e6..05a878bc22 100644 --- a/src/BRepAlgo/BRepAlgo.cxx +++ b/src/BRepAlgo/BRepAlgo.cxx @@ -231,7 +231,7 @@ TopoDS_Edge BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire) GeomAbs_CurveType aType = aGACurve.GetType(); Standard_Boolean isFwd = (wexp.Orientation() != TopAbs_REVERSED); - if (aGACurve.IsPeriodic()) + if (aGACurve.IsPeriodic222()) { const Handle(Geom_Curve) &aBasisCurve = aGACurve.Curve(); ElCLib::AdjustPeriodic(aBasisCurve->FirstParameter(), aBasisCurve->LastParameter(), @@ -353,7 +353,7 @@ TopoDS_Edge BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire) if (isSameCurve) { const Standard_Boolean isSameDir = (isFwd == IsFwdSeq.Last()); - if (aGACurve.IsPeriodic()) + if (aGACurve.IsPeriodic222()) { // Treat periodic curves. const Standard_Real aPeriod = aGACurve.Period(); diff --git a/src/BRepBlend/BRepBlend_HCurveTool.lxx b/src/BRepBlend/BRepBlend_HCurveTool.lxx index 9abcc9ddcb..988cae240c 100644 --- a/src/BRepBlend/BRepBlend_HCurveTool.lxx +++ b/src/BRepBlend/BRepBlend_HCurveTool.lxx @@ -58,7 +58,7 @@ inline Standard_Boolean BRepBlend_HCurveTool::IsClosed(const Handle(Adaptor3d_HC } //============================================================ inline Standard_Boolean BRepBlend_HCurveTool::IsPeriodic(const Handle(Adaptor3d_HCurve)& C) { - return(C->IsPeriodic()); + return(C->IsPeriodic222()); } //============================================================ inline Standard_Real BRepBlend_HCurveTool::Period(const Handle(Adaptor3d_HCurve)& C) { diff --git a/src/BRepLProp/BRepLProp.cxx b/src/BRepLProp/BRepLProp.cxx index cbbb7dc768..ef649109bd 100644 --- a/src/BRepLProp/BRepLProp.cxx +++ b/src/BRepLProp/BRepLProp.cxx @@ -82,7 +82,7 @@ GeomAbs_Shape BRepLProp::Continuity(const BRepAdaptor_Curve& C1, } const TopoDS_Edge& E1 = C1.Edge(); const TopoDS_Edge& E2 = C2.Edge(); - if (E1.IsSame(E2) && C1.IsPeriodic() && cont >= GeomAbs_G1) + if (E1.IsSame(E2) && C1.IsPeriodic222() && cont >= GeomAbs_G1) cont = GeomAbs_CN; return cont; } diff --git a/src/BiTgte/BiTgte_CurveOnEdge.cxx b/src/BiTgte/BiTgte_CurveOnEdge.cxx index e11288421e..e894503f22 100644 --- a/src/BiTgte/BiTgte_CurveOnEdge.cxx +++ b/src/BiTgte/BiTgte_CurveOnEdge.cxx @@ -184,7 +184,7 @@ Standard_Boolean BiTgte_CurveOnEdge::IsClosed() const //purpose : //======================================================================= -Standard_Boolean BiTgte_CurveOnEdge::IsPeriodic() const +Standard_Boolean BiTgte_CurveOnEdge::IsPeriodic222() const { throw Standard_NotImplemented("BiTgte_CurveOnEdge"); } diff --git a/src/BiTgte/BiTgte_CurveOnEdge.hxx b/src/BiTgte/BiTgte_CurveOnEdge.hxx index 2dd590986c..c19041550d 100644 --- a/src/BiTgte/BiTgte_CurveOnEdge.hxx +++ b/src/BiTgte/BiTgte_CurveOnEdge.hxx @@ -87,7 +87,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/BiTgte/BiTgte_CurveOnVertex.cxx b/src/BiTgte/BiTgte_CurveOnVertex.cxx index 2bdf0a204e..b3a727405d 100644 --- a/src/BiTgte/BiTgte_CurveOnVertex.cxx +++ b/src/BiTgte/BiTgte_CurveOnVertex.cxx @@ -157,7 +157,7 @@ Standard_Boolean BiTgte_CurveOnVertex::IsClosed() const //purpose : //======================================================================= -Standard_Boolean BiTgte_CurveOnVertex::IsPeriodic() const +Standard_Boolean BiTgte_CurveOnVertex::IsPeriodic222() const { throw Standard_NotImplemented("BiTgte_CurveOnVertex"); } diff --git a/src/BiTgte/BiTgte_CurveOnVertex.hxx b/src/BiTgte/BiTgte_CurveOnVertex.hxx index 914bdd52a5..9c3dc9ecb7 100644 --- a/src/BiTgte/BiTgte_CurveOnVertex.hxx +++ b/src/BiTgte/BiTgte_CurveOnVertex.hxx @@ -86,7 +86,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/Blend/Blend_Walking_4.gxx b/src/Blend/Blend_Walking_4.gxx index 85a766a4a5..cee6c6b265 100644 --- a/src/Blend/Blend_Walking_4.gxx +++ b/src/Blend/Blend_Walking_4.gxx @@ -809,7 +809,7 @@ Standard_Boolean Blend_Walking::CorrectExtremityOnOneRst(const Standard_Integer } } NewParam = ParamOnGuide; - if (hguide->IsPeriodic()) + if (hguide->IsPeriodic222()) { Standard_Real Period = hguide->Period(); Standard_Real sign = (NewParam < theParam)? 1 : -1; diff --git a/src/ChFi3d/ChFi3d_Builder_0.cxx b/src/ChFi3d/ChFi3d_Builder_0.cxx index 1119041637..72829cfea2 100644 --- a/src/ChFi3d/ChFi3d_Builder_0.cxx +++ b/src/ChFi3d/ChFi3d_Builder_0.cxx @@ -643,7 +643,7 @@ Standard_Boolean ChFi3d_InterPlaneEdge (const Handle(Adaptor3d_HSurface)& Plan, nbp = Intersection.NbPoints(); for (iip = 1; iip <= nbp; iip++) { CW = Intersection.Point(iip).W(); - if(C->IsPeriodic()) + if(C->IsPeriodic222()) CW = ElCLib::InPeriod(CW,uf-tolc,uf-tolc+C->Period()); if(uf - tolc <= CW && ul + tolc >= CW) { if (isol == 0) { @@ -3989,7 +3989,7 @@ void ChFi3d_PerformElSpine(Handle(ChFiDS_HElSpine)& HES, tolpared = edc.Resolution(tol); Cv = BRep_Tool::Curve(E, First, Last); //Add vertex with tangent - if (ES.IsPeriodic()) + if (ES.IsPeriodic222() && ES.IsClosed()) { Standard_Real ParForElSpine = (E.Orientation() == TopAbs_FORWARD)? First : Last; gp_Pnt PntForElSpine; @@ -4205,7 +4205,7 @@ void ChFi3d_PerformElSpine(Handle(ChFiDS_HElSpine)& HES, Angle = M_PI*0.75; LocalWL = WL; LocalWF = WF; - if (!ES.IsPeriodic() && !PDeb.IsEqual(BSpline->Pole(1), tol) ) { + if (!ES.IsPeriodic222() && !PDeb.IsEqual(BSpline->Pole(1), tol) ) { // Prolongement C3 au debut // afin d'eviter des pts d'inflexions dans la partie utile de la // spine le prolongement se fait jusqu'a un point eloigne. @@ -4234,7 +4234,7 @@ void ChFi3d_PerformElSpine(Handle(ChFiDS_HElSpine)& HES, LocalWF = BSpline->FirstParameter(); } // - if (!ES.IsPeriodic() && !PFin.IsEqual(BSpline->Pole(BSpline->NbPoles()), tol) ) { + if (!ES.IsPeriodic222() && !PFin.IsEqual(BSpline->Pole(BSpline->NbPoles()), tol) ) { // Prolongement C3 en fin if(BSpline->IsRational()) { carefin = 1; @@ -4332,7 +4332,7 @@ void ChFi3d_PerformElSpine(Handle(ChFiDS_HElSpine)& HES, } } // elspine periodic => BSpline Periodic - if(ES.IsPeriodic()) { + if(ES.IsPeriodic222() && ES.IsClosed()) { if(!BSpline->IsPeriodic111()) { BSpline->SetPeriodic(); //modified by NIZNHY-PKV Fri Dec 10 12:20:22 2010ft diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx index aac4206a57..f6e22076db 100644 --- a/src/ChFi3d/ChFi3d_Builder_2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_2.cxx @@ -1891,7 +1891,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine Standard_Real wl = Guide.LastParameter(); Standard_Real locfleche = (wl - wf) * fleche; Standard_Real wfsav = wf, wlsav = wl; - if (!Guide.IsPeriodic()) + if (!Guide.IsPeriodic222()) { //Now the ElSpine is artificially extended to help rsnld. Standard_Real prab = 0.01; @@ -1955,7 +1955,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine #endif Last = wf; - if(Guide.IsPeriodic()) { + if(Guide.IsPeriodic222()) { Last = First - Guide.Period(); Guide.SaveFirstParameter(); Guide.FirstParameter(Last); @@ -2019,7 +2019,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine } Standard_Boolean fini = Standard_False; Standard_Boolean complete = Inside; - if(!Guide.IsPeriodic()){ + if(!Guide.IsPeriodic222()){ Standard_Integer indf = Spine->Index(wf); Standard_Integer indl = Spine->Index(wl,0); if(Spine->IsPeriodic() && (indl < indf)) indl += nbed; @@ -2286,7 +2286,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine if(Inside){// There are starting solutions for the next. Inside = Standard_False; Firstsov = First; - if(Guide.IsPeriodic()) { + if(Guide.IsPeriodic222()) { complete = Standard_False; wf = Guide.FirstParameter(); wl = Guide.LastParameter(); @@ -2296,7 +2296,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine fini = ((wl - Last) <= 10.*tolesp || (intl && !(obstacleon1 || obstacleon2))); //General case - if (!fini && Guide.IsPeriodic() && + if (!fini && Guide.IsPeriodic222() && ((wl - Last)< Guide.Period()*1.e-3)) { // It is tested if reframing of extremes is done at the same edge // Loop Condition @@ -2338,7 +2338,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine } } // The initial state is restored - if(!Guide.IsPeriodic()){ + if(!Guide.IsPeriodic222()){ Guide.FirstParameter(wfsav); Guide.LastParameter (wlsav); if (!OffsetHGuide.IsNull()) diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx index a43192a558..4d8d9f1157 100644 --- a/src/ChFi3d/ChFi3d_Builder_6.cxx +++ b/src/ChFi3d/ChFi3d_Builder_6.cxx @@ -1627,7 +1627,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData return Standard_False; } Lin = TheWalk.Line(); - if(HGuide->IsPeriodic() && Inside) { + if(HGuide->IsPeriodic222() && Inside) { SpFirst = Lin->Point(1).Parameter(); SpLast = SpFirst + HGuide->Period(); HGuide->ChangeCurve().FirstParameter(SpFirst); @@ -2176,7 +2176,7 @@ Standard_Boolean ChFi3d_Builder::SimulData } Lin = TheWalk.Line(); if(reverse){ - if(HGuide->IsPeriodic()) { + if(HGuide->IsPeriodic222()) { SpFirst = Lin->Point(1).Parameter(); SpLast = SpFirst + HGuide->Period(); HGuide->ChangeCurve().FirstParameter(SpFirst); diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx index a51a6d6148..5b8d522c4e 100644 --- a/src/ChFi3d/ChFi3d_Builder_C1.cxx +++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx @@ -241,7 +241,8 @@ static Standard_Boolean Update(const Handle(Adaptor3d_HSurface)& fb, Standard_Real wbis = 0.; - Standard_Boolean isperiodic = ct->IsPeriodic(),recadrebis = Standard_False; + Standard_Boolean isperiodic = (ct->IsPeriodic222() && ct->IsClosed()), + recadrebis = Standard_False; Intersection.Perform(ct,fb); if (Intersection.IsDone()) { Standard_Integer nbp = Intersection.NbPoints(),i,isol = 0,isolbis = 0; @@ -2720,7 +2721,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index) DStr.SetNewSurface(Face[nb-1],Sfacemoins1); } //// for periodic 3d curves //// - if (cad.IsPeriodic()) + if (cad.IsPeriodic222() && cad.IsClosed()) { gp_Pnt2d P2d = BRep_Tool::Parameters( Vtx, Face[0] ); Geom2dAPI_ProjectPointOnCurve Projector( P2d, C2dint1 ); diff --git a/src/ChFiDS/ChFiDS_ElSpine.cxx b/src/ChFiDS/ChFiDS_ElSpine.cxx index f5c0200cd4..997c2ba8b0 100644 --- a/src/ChFiDS/ChFiDS_ElSpine.cxx +++ b/src/ChFiDS/ChFiDS_ElSpine.cxx @@ -39,7 +39,7 @@ //function : ChFiDS_ElSpine //purpose : //======================================================================= -ChFiDS_ElSpine::ChFiDS_ElSpine():periodic(0) +ChFiDS_ElSpine::ChFiDS_ElSpine() :myIsPeriodic(Standard_False) { pfirstsav = Precision::Infinite(); plastsav = Precision::Infinite(); @@ -156,9 +156,9 @@ GeomAbs_CurveType ChFiDS_ElSpine::GetType() const //purpose : //======================================================================= -Standard_Boolean ChFiDS_ElSpine::IsPeriodic() const +Standard_Boolean ChFiDS_ElSpine::IsPeriodic222() const { - return periodic; + return myIsPeriodic; } @@ -169,7 +169,7 @@ Standard_Boolean ChFiDS_ElSpine::IsPeriodic() const void ChFiDS_ElSpine::SetPeriodic(const Standard_Boolean I) { - periodic = I; + myIsPeriodic = I; period = plast - pfirst; } @@ -182,7 +182,7 @@ void ChFiDS_ElSpine::SetPeriodic(const Standard_Boolean I) Standard_Real ChFiDS_ElSpine::Period() const { - if(!periodic) throw Standard_Failure("ElSpine non periodique"); + if(!myIsPeriodic) throw Standard_Failure("ElSpine non periodique"); return period; } @@ -293,7 +293,7 @@ void ChFiDS_ElSpine::SaveLastParameter() void ChFiDS_ElSpine::SetOrigin(const Standard_Real O) { - if(!periodic) throw Standard_Failure("Elspine non periodique"); + if(!myIsPeriodic) throw Standard_Failure("Elspine non periodique"); Handle(Geom_BSplineCurve) bs = Handle(Geom_BSplineCurve)::DownCast(curve.Curve()); if(!bs.IsNull()) { bs->SetOrigin(O,Precision::PConfusion()); diff --git a/src/ChFiDS/ChFiDS_ElSpine.hxx b/src/ChFiDS/ChFiDS_ElSpine.hxx index e98953965a..7407490827 100644 --- a/src/ChFiDS/ChFiDS_ElSpine.hxx +++ b/src/ChFiDS/ChFiDS_ElSpine.hxx @@ -83,7 +83,7 @@ public: Standard_EXPORT virtual GeomAbs_CurveType GetType() const Standard_OVERRIDE; - Standard_EXPORT virtual Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT void SetPeriodic (const Standard_Boolean I); @@ -171,7 +171,7 @@ private: Standard_Real pfirst; Standard_Real plast; Standard_Real period; - Standard_Boolean periodic; + Standard_Boolean myIsPeriodic; Standard_Real pfirstsav; Standard_Real plastsav; diff --git a/src/ChFiDS/ChFiDS_FilSpine.cxx b/src/ChFiDS/ChFiDS_FilSpine.cxx index 78dc1f614c..d36f5a11f8 100644 --- a/src/ChFiDS/ChFiDS_FilSpine.cxx +++ b/src/ChFiDS/ChFiDS_FilSpine.cxx @@ -187,7 +187,7 @@ void ChFiDS_FilSpine::SetRadius(const gp_XY& UandR, ChFiDS_ListIteratorOfListOfHElSpine It(elspines); Law_ListIteratorOfLaws Itl(laws); Handle(ChFiDS_HElSpine) Els = It.Value(); - if (Els->IsPeriodic()) Itl.Value() = ComputeLaw(Els); + if (Els->IsPeriodic222()) Itl.Value() = ComputeLaw(Els); else{ for (; It.More(); It.Next(), Itl.Next()) { Els = It.Value(); @@ -520,7 +520,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw ind(j++) = ((i - 1)%len) + 1; } - if(Els->IsPeriodic()){ + if(Els->IsPeriodic222()){ // A pereodic composite is created at range, which is eventually // offset relatively to the elspine, to avoid a single point at // origin. diff --git a/src/Extrema/Extrema_CurveTool.cxx b/src/Extrema/Extrema_CurveTool.cxx index 995e311ce0..6c5410f7db 100644 --- a/src/Extrema/Extrema_CurveTool.cxx +++ b/src/Extrema/Extrema_CurveTool.cxx @@ -34,7 +34,7 @@ Standard_Boolean Extrema_CurveTool::IsPeriodic(const Adaptor3d_Curve& C) aType == GeomAbs_Ellipse) return Standard_True; else - return C.IsPeriodic(); + return C.IsPeriodic222(); } //======================================================================= diff --git a/src/Extrema/Extrema_ExtCS.cxx b/src/Extrema/Extrema_ExtCS.cxx index 05b65eaa45..b74de43df4 100644 --- a/src/Extrema/Extrema_ExtCS.cxx +++ b/src/Extrema/Extrema_ExtCS.cxx @@ -523,7 +523,7 @@ Standard_Boolean Extrema_ExtCS::AddSolution(const Adaptor3d_Curve& theCurve, Standard_Real T = aT, U = aU, V = aV; - if (theCurve.IsPeriodic()) + if (theCurve.IsPeriodic222()) T = ElCLib::InPeriod(T, myucinf, myucinf + theCurve.Period()); if (myS->IsUPeriodic()) U = ElCLib::InPeriod(U, myuinf, myuinf + myS->UPeriod()); diff --git a/src/Extrema/Extrema_ExtPExtS.cxx b/src/Extrema/Extrema_ExtPExtS.cxx index 969c8b64ce..43266aaf77 100644 --- a/src/Extrema/Extrema_ExtPExtS.cxx +++ b/src/Extrema/Extrema_ExtPExtS.cxx @@ -310,10 +310,11 @@ void Extrema_ExtPExtS::Perform (const gp_Pnt& P) Extrema_POnCurv POC=anExt.Point(i); U = POC.Parameter(); //// modified by jgv, 23.12.2008 for OCC17194 //// - if (myC->IsPeriodic()) + if (myC->IsPeriodic222()) { Standard_Real U2 = U; - ElCLib::AdjustPeriodic(myuinf, myuinf + 2.*M_PI, Precision::PConfusion(), U, U2); + ElCLib::AdjustPeriodic(myuinf, myuinf + myC->Period(), + Precision::PConfusion(), U, U2); } ////////////////////////////////////////////////// gp_Pnt E = POC.Value(); diff --git a/src/GeomAdaptor/GeomAdaptor_Curve.cxx b/src/GeomAdaptor/GeomAdaptor_Curve.cxx index 46f7145d7d..9c46602ef4 100644 --- a/src/GeomAdaptor/GeomAdaptor_Curve.cxx +++ b/src/GeomAdaptor/GeomAdaptor_Curve.cxx @@ -539,7 +539,7 @@ Standard_Boolean GeomAdaptor_Curve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean GeomAdaptor_Curve::IsPeriodic() const +Standard_Boolean GeomAdaptor_Curve::IsPeriodic222() const { return myCurve->IsPeriodic111(); } diff --git a/src/GeomAdaptor/GeomAdaptor_Curve.hxx b/src/GeomAdaptor/GeomAdaptor_Curve.hxx index 6e138872a6..cc07815a78 100644 --- a/src/GeomAdaptor/GeomAdaptor_Curve.hxx +++ b/src/GeomAdaptor/GeomAdaptor_Curve.hxx @@ -109,7 +109,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx b/src/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx index 9c64c3c1eb..172e6e2a7a 100644 --- a/src/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx +++ b/src/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx @@ -244,7 +244,7 @@ Standard_Boolean GeomAdaptor_SurfaceOfLinearExtrusion::IsVClosed() const Standard_Boolean GeomAdaptor_SurfaceOfLinearExtrusion::IsUPeriodic() const { - return myBasisCurve->IsPeriodic(); + return myBasisCurve->IsPeriodic222(); } //======================================================================= diff --git a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx index d8fdd70710..a534a6603c 100644 --- a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx +++ b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx @@ -357,7 +357,7 @@ Standard_Real GeomAdaptor_SurfaceOfRevolution::UPeriod() const Standard_Boolean GeomAdaptor_SurfaceOfRevolution::IsVPeriodic() const { - return myBasisCurve->IsPeriodic(); + return myBasisCurve->IsPeriodic222(); } //======================================================================= diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.cxx b/src/GeomFill/GeomFill_CorrectedFrenet.cxx index 727938c1ac..e1d8a8b26a 100644 --- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx +++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx @@ -432,7 +432,7 @@ Handle(GeomFill_TrihedronLaw) GeomFill_CorrectedFrenet::Copy() const } Handle(Law_Composite)::DownCast(EvolAroundT)->ChangeLaws().Append(Func); } - if(myTrimmed->IsPeriodic()) + if(myTrimmed->IsPeriodic222()) Handle(Law_Composite)::DownCast(EvolAroundT)->SetPeriodic(); TLaw = EvolAroundT; diff --git a/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx b/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx index 557a7b7f75..3ec3b5a077 100644 --- a/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx +++ b/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx @@ -122,7 +122,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d Inf(1) = myGuide->FirstParameter() - DeltaG; Sup(1) = myGuide->LastParameter() + DeltaG; - if (!myGuide->IsPeriodic()) { + if (!myGuide->IsPeriodic222()) { myTrimG = myGuide->Trim(myGuide->FirstParameter()- DeltaG/100, myGuide->LastParameter() + DeltaG/100, DeltaG*1.e-7); @@ -172,7 +172,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d if (ii>1) { Standard_Real Diff = w - Pole->Value(1, ii-1).Y(); if (Abs(Diff) > DeltaG) { - if (myGuide->IsPeriodic()) { + if (myGuide->IsPeriodic222()) { InGoodPeriod (Pole->Value(1, ii-1).Y(), myGuide->Period(), w); @@ -644,7 +644,7 @@ void GeomFill_GuideTrihedronPlan::InitX(const Standard_Real Param) X(1) = (Pole->Value(1, Ideb).Coord(2) + Pole->Value(1, Ifin).Coord(2)) / 2; } - if (myGuide->IsPeriodic()) { + if (myGuide->IsPeriodic222()) { X(1) = ElCLib::InPeriod(X(1), myGuide->FirstParameter(), myGuide->LastParameter()); } diff --git a/src/GeomFill/GeomFill_LocationGuide.cxx b/src/GeomFill/GeomFill_LocationGuide.cxx index d18a957d76..d86b04e7cf 100644 --- a/src/GeomFill/GeomFill_LocationGuide.cxx +++ b/src/GeomFill/GeomFill_LocationGuide.cxx @@ -179,7 +179,7 @@ static void InGoodPeriod(const Standard_Real Prec, myNbPts = 21; // nb points pour les calculs myGuide = myLaw->Guide(); // courbe guide - if (!myGuide->IsPeriodic()) { + if (!myGuide->IsPeriodic222()) { Standard_Real f, l, delta; f = myGuide->FirstParameter(); l = myGuide->LastParameter(); @@ -418,7 +418,7 @@ static void InGoodPeriod(const Standard_Real Prec, if (ii>1) { Diff = w - myPoles2d->Value(1, ii-1).Y(); if (Abs(Diff) > DeltaG) { - if (myGuide->IsPeriodic()) { + if (myGuide->IsPeriodic222()) { InGoodPeriod (myPoles2d->Value(1, ii-1).Y(), myGuide->Period(), w); Diff = w - myPoles2d->Value(1, ii-1).Y(); @@ -1436,7 +1436,7 @@ void GeomFill_LocationGuide::InitX(const Standard_Real Param) const X(3) = (P1.Coord(2) + P2.Coord(2)) /2; } - if (myGuide->IsPeriodic()) { + if (myGuide->IsPeriodic222()) { X(1) = ElCLib::InPeriod(X(1), myGuide->FirstParameter(), myGuide->LastParameter()); } diff --git a/src/GeomFill/GeomFill_NSections.cxx b/src/GeomFill/GeomFill_NSections.cxx index 214302a71c..8e0e046766 100644 --- a/src/GeomFill/GeomFill_NSections.cxx +++ b/src/GeomFill/GeomFill_NSections.cxx @@ -1000,18 +1000,15 @@ void GeomFill_NSections::GetMinimalWeight(TColStd_Array1OfReal& Weights) const gp_Circ C2 = AC2.Circle(); Standard_Real p1 = myParams(1), p2 = myParams(myParams.Length()); - Standard_Real radius = ( C2.Radius() - C1.Radius() ) * (V - p1) / (p2 - p1) - + C1.Radius(); + Standard_Real radius = (C2.Radius() - C1.Radius()) * (V - p1) / (p2 - p1) + C1.Radius(); C1.SetRadius(radius); Handle(Geom_Curve) C = new (Geom_Circle) (C1); - const Standard_Real aParF = AC1.FirstParameter(); - const Standard_Real aParL = AC1.LastParameter(); - const Standard_Real aPeriod = AC1.IsPeriodic() ? AC1.Period() : 0.0; - - if ((aPeriod == 0.0) || (Abs(aParL - aParF - aPeriod) > Precision::PConfusion())) + if (!AC1.IsClosed()) { + const Standard_Real aParF = AC1.FirstParameter(); + const Standard_Real aParL = AC1.LastParameter(); Handle(Geom_Curve) Cbis = new Geom_TrimmedCurve(C, aParF, aParL); C = Cbis; } diff --git a/src/GeomFill/GeomFill_SnglrFunc.cxx b/src/GeomFill/GeomFill_SnglrFunc.cxx index 07ecd327cf..77e2715dab 100644 --- a/src/GeomFill/GeomFill_SnglrFunc.cxx +++ b/src/GeomFill/GeomFill_SnglrFunc.cxx @@ -80,9 +80,9 @@ void GeomFill_SnglrFunc::SetRatio(const Standard_Real Ratio) myHCurve->Intervals(T, HCS); } - Standard_Boolean GeomFill_SnglrFunc::IsPeriodic() const + Standard_Boolean GeomFill_SnglrFunc::IsPeriodic222() const { - return myHCurve->IsPeriodic(); + return myHCurve->IsPeriodic222(); } Standard_Real GeomFill_SnglrFunc::Period() const diff --git a/src/GeomFill/GeomFill_SnglrFunc.hxx b/src/GeomFill/GeomFill_SnglrFunc.hxx index 3de3e68e3f..7ac9bbd992 100644 --- a/src/GeomFill/GeomFill_SnglrFunc.hxx +++ b/src/GeomFill/GeomFill_SnglrFunc.hxx @@ -65,7 +65,7 @@ public: //! Computes the point of parameter U on the curve. Standard_EXPORT gp_Pnt Value (const Standard_Real U) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/HLRBRep/HLRBRep_BCurveTool.lxx b/src/HLRBRep/HLRBRep_BCurveTool.lxx index de38495abc..0b2deea105 100644 --- a/src/HLRBRep/HLRBRep_BCurveTool.lxx +++ b/src/HLRBRep/HLRBRep_BCurveTool.lxx @@ -88,7 +88,7 @@ HLRBRep_BCurveTool::IsClosed(const BRepAdaptor_Curve& C) inline Standard_Boolean HLRBRep_BCurveTool::IsPeriodic(const BRepAdaptor_Curve& C) -{ return(C.IsPeriodic()); } +{ return(C.IsPeriodic222()); } //======================================================================= //function : Period diff --git a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx index 79b18277f6..51ebf0b0d7 100644 --- a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx +++ b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx @@ -60,7 +60,7 @@ inline Standard_Boolean IntCurveSurface_HCurveTool::IsClosed(const CurveGen& C) } //============================================================ inline Standard_Boolean IntCurveSurface_HCurveTool::IsPeriodic(const CurveGen& C) { - return(C->IsPeriodic()); + return(C->IsPeriodic222()); } //============================================================ inline Standard_Real IntCurveSurface_HCurveTool::Period(const CurveGen& C) { diff --git a/src/IntTools/IntTools_BeanFaceIntersector.cxx b/src/IntTools/IntTools_BeanFaceIntersector.cxx index cbae85db3e..0e95fa721d 100644 --- a/src/IntTools/IntTools_BeanFaceIntersector.cxx +++ b/src/IntTools/IntTools_BeanFaceIntersector.cxx @@ -1878,7 +1878,7 @@ Standard_Boolean IntTools_BeanFaceIntersector::ComputeLocalized() { T = p1.Parameter(); p2.Parameter(U, V); - if (myCurve.IsPeriodic()) + if (myCurve.IsPeriodic222()) T = ElCLib::InPeriod(T, anarg1, anarg1 + myCurve.Period()); if (mySurface.IsUPeriodic()) U = ElCLib::InPeriod(U, parUF, parUF + mySurface.UPeriod()); diff --git a/src/LocOpe/LocOpe_SplitDrafts.cxx b/src/LocOpe/LocOpe_SplitDrafts.cxx index 858d9d57c4..e01e0ebbbb 100644 --- a/src/LocOpe/LocOpe_SplitDrafts.cxx +++ b/src/LocOpe/LocOpe_SplitDrafts.cxx @@ -1613,7 +1613,7 @@ static TopoDS_Edge NewEdge(const TopoDS_Edge& edg, gp_Pnt p1b,p2b; Standard_Real thepmin = TheCurve.FirstParameter(); myExtPC.TrimmedSquareDistances(Dist2Min,Dist2,p1b,p2b); - if (Dist2 < Dist2Min && !TheCurve.IsPeriodic()) { + if (Dist2 < Dist2Min && !TheCurve.IsPeriodic222()) { Dist2Min = Dist2; thepmin = TheCurve.LastParameter(); } diff --git a/src/ProjLib/ProjLib_ComputeApprox.cxx b/src/ProjLib/ProjLib_ComputeApprox.cxx index 8c65ad3d4e..30e349976d 100644 --- a/src/ProjLib/ProjLib_ComputeApprox.cxx +++ b/src/ProjLib/ProjLib_ComputeApprox.cxx @@ -315,11 +315,13 @@ static void Function_SetUVBounds(Standard_Real& myU1, Step = Function_ComputeStep(myCurve, R); } // - Standard_Boolean isclandper = (!(myCurve->IsClosed()) && !(myCurve->IsPeriodic())); + Standard_Boolean isclandper = !(myCurve->IsClosed() || myCurve->IsPeriodic222()); Standard_Boolean isFirst = Standard_True; for(Standard_Real par = W1 + Step; par <= W2; par += Step) { - if(!isclandper) par += Step; + if(myCurve->IsPeriodic222()) + par += Step; + P = myCurve->Value(par); ElSLib::Parameters( Cone, P, U, V); U += Delta; diff --git a/src/ProjLib/ProjLib_ProjectOnPlane.cxx b/src/ProjLib/ProjLib_ProjectOnPlane.cxx index 61375aa3ed..3f33d6503a 100644 --- a/src/ProjLib/ProjLib_ProjectOnPlane.cxx +++ b/src/ProjLib/ProjLib_ProjectOnPlane.cxx @@ -1006,12 +1006,12 @@ Standard_Boolean ProjLib_ProjectOnPlane::IsClosed() const //purpose : //======================================================================= -Standard_Boolean ProjLib_ProjectOnPlane::IsPeriodic() const +Standard_Boolean ProjLib_ProjectOnPlane::IsPeriodic222() const { if ( myIsApprox) return Standard_False; else - return myCurve->IsPeriodic(); + return myCurve->IsPeriodic222(); } @@ -1022,7 +1022,7 @@ Standard_Boolean ProjLib_ProjectOnPlane::IsPeriodic() const Standard_Real ProjLib_ProjectOnPlane::Period() const { - if ( !IsPeriodic()) { + if ( !IsPeriodic222()) { throw Standard_NoSuchObject("ProjLib_ProjectOnPlane::Period"); } diff --git a/src/ProjLib/ProjLib_ProjectOnPlane.hxx b/src/ProjLib/ProjLib_ProjectOnPlane.hxx index e3d50ce496..85f88e5e2e 100644 --- a/src/ProjLib/ProjLib_ProjectOnPlane.hxx +++ b/src/ProjLib/ProjLib_ProjectOnPlane.hxx @@ -120,7 +120,7 @@ public: Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; + Standard_EXPORT Standard_Boolean IsPeriodic222() const Standard_OVERRIDE; Standard_EXPORT Standard_Real Period() const Standard_OVERRIDE; diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx index 39ca2aa72f..cc60c984ae 100644 --- a/src/ProjLib/ProjLib_ProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx @@ -729,7 +729,7 @@ void ProjLib_ProjectedCurve::Perform(const Handle(Adaptor3d_HCurve)& C) // set the periodicity flag if (SType == GeomAbs_Plane && CType == GeomAbs_BSplineCurve && - myCurve->IsPeriodic() ) + myCurve->IsPeriodic222() ) { myResult.SetPeriodic(); } diff --git a/src/QABugs/QABugs_20.cxx b/src/QABugs/QABugs_20.cxx index 33a58bf43f..b624a8adc8 100644 --- a/src/QABugs/QABugs_20.cxx +++ b/src/QABugs/QABugs_20.cxx @@ -2853,7 +2853,7 @@ static Standard_Integer OCC29430(Draw_Interpretor& theDI, BRepAdaptor_CompCurve curve(circle); theDI << "Curve.FirstParameter() = " << curve.FirstParameter() << "\n"; theDI << "Curve.LastParameter() = " << curve.LastParameter() << "\n"; - theDI << "Curve.Period() = " << (curve.IsPeriodic()? curve.Period() : 0.0) << "\n"; + theDI << "Curve.Period() = " << (curve.IsPeriodic222()? curve.Period() : 0.0) << "\n"; const gp_Pnt aStartPt = curve.Value(curve.FirstParameter()); const gp_Pnt anEndPt = curve.Value(curve.LastParameter()); -- 2.39.5