From: nbv Date: Thu, 26 Oct 2017 14:56:42 +0000 (+0300) Subject: Adaptor2d_Curve X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=da113e0ffb1ec6c8a262758843d3c166c79e4a44;p=occt-copy.git Adaptor2d_Curve d:\nbv-29115\occt\src\GCPnts\GCPnts_AbscissaPoint.pxx, line 259 D:\nbv-29115\occt\src\BRepCheck\BRepCheck_Wire.cxx, line 989 && 1078 D:\nbv-29115\occt\src\HLRBRep\HLRBRep_PolyAlgo.cxx, line 884 && 1051 D:\nbv-29115\occt\src\ChFi3d\ChFi3d_Builder_SpKP.cxx, line 854 --- diff --git a/src/Adaptor2d/Adaptor2d_Curve2d.cxx b/src/Adaptor2d/Adaptor2d_Curve2d.cxx index aabbf95842..f3f62450fa 100644 --- a/src/Adaptor2d/Adaptor2d_Curve2d.cxx +++ b/src/Adaptor2d/Adaptor2d_Curve2d.cxx @@ -129,7 +129,7 @@ Standard_Boolean Adaptor2d_Curve2d::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor2d_Curve2d::IsPeriodic() const +Standard_Boolean Adaptor2d_Curve2d::IsPeriodic222() const { throw Standard_NotImplemented("Adaptor2d_Curve2d::IsPeriodic"); } diff --git a/src/Adaptor2d/Adaptor2d_Curve2d.hxx b/src/Adaptor2d/Adaptor2d_Curve2d.hxx index c845bcef7a..d769e3acd0 100644 --- a/src/Adaptor2d/Adaptor2d_Curve2d.hxx +++ b/src/Adaptor2d/Adaptor2d_Curve2d.hxx @@ -86,7 +86,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/Adaptor2d/Adaptor2d_HCurve2d.hxx b/src/Adaptor2d/Adaptor2d_HCurve2d.hxx index 1e2f815751..5d0aff8b9f 100644 --- a/src/Adaptor2d/Adaptor2d_HCurve2d.hxx +++ b/src/Adaptor2d/Adaptor2d_HCurve2d.hxx @@ -76,7 +76,7 @@ public: Standard_Boolean IsClosed() const; - Standard_Boolean IsPeriodic() const; + Standard_Boolean IsPeriodic222() const; Standard_Real Period() const; diff --git a/src/Adaptor2d/Adaptor2d_HCurve2d.lxx b/src/Adaptor2d/Adaptor2d_HCurve2d.lxx index c8d728dc03..bc77dfedc4 100644 --- a/src/Adaptor2d/Adaptor2d_HCurve2d.lxx +++ b/src/Adaptor2d/Adaptor2d_HCurve2d.lxx @@ -92,9 +92,9 @@ inline Standard_Real Adaptor2d_HCurve2d::FirstParameter() const //purpose : //======================================================================= - inline Standard_Boolean Adaptor2d_HCurve2d::IsPeriodic() const + inline Standard_Boolean Adaptor2d_HCurve2d::IsPeriodic222() const { - return Curve2d().IsPeriodic(); + return Curve2d().IsPeriodic222(); } //======================================================================= diff --git a/src/Adaptor2d/Adaptor2d_Line2d.cxx b/src/Adaptor2d/Adaptor2d_Line2d.cxx index d9c117832d..7363ded0f7 100644 --- a/src/Adaptor2d/Adaptor2d_Line2d.cxx +++ b/src/Adaptor2d/Adaptor2d_Line2d.cxx @@ -161,7 +161,7 @@ Standard_Boolean Adaptor2d_Line2d::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor2d_Line2d::IsPeriodic() const +Standard_Boolean Adaptor2d_Line2d::IsPeriodic222() const { return Standard_False; } diff --git a/src/Adaptor2d/Adaptor2d_Line2d.hxx b/src/Adaptor2d/Adaptor2d_Line2d.hxx index f365e50804..63f65e0487 100644 --- a/src/Adaptor2d/Adaptor2d_Line2d.hxx +++ b/src/Adaptor2d/Adaptor2d_Line2d.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/Adaptor2d/Adaptor2d_OffsetCurve.cxx b/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx index 4c4fa9b832..aaa05e1d44 100644 --- a/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx +++ b/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx @@ -276,9 +276,9 @@ Standard_Boolean Adaptor2d_OffsetCurve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Adaptor2d_OffsetCurve::IsPeriodic() const +Standard_Boolean Adaptor2d_OffsetCurve::IsPeriodic222() const { - return myCurve->IsPeriodic(); + return myCurve->IsPeriodic222(); } //======================================================================= diff --git a/src/Adaptor2d/Adaptor2d_OffsetCurve.hxx b/src/Adaptor2d/Adaptor2d_OffsetCurve.hxx index b1b1c356f3..2d22c68114 100644 --- a/src/Adaptor2d/Adaptor2d_OffsetCurve.hxx +++ b/src/Adaptor2d/Adaptor2d_OffsetCurve.hxx @@ -105,7 +105,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_CurveOnSurface.cxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx index b2dd23a2c5..f977b24650 100644 --- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx +++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx @@ -954,7 +954,7 @@ Standard_Boolean Adaptor3d_CurveOnSurface::IsClosed() const Standard_Boolean Adaptor3d_CurveOnSurface::IsPeriodic() const { - return myCurve->IsPeriodic(); + return myCurve->IsPeriodic222(); } //======================================================================= diff --git a/src/BRepBlend/BRepBlend_HCurve2dTool.lxx b/src/BRepBlend/BRepBlend_HCurve2dTool.lxx index 04654ca2c3..afa99993df 100644 --- a/src/BRepBlend/BRepBlend_HCurve2dTool.lxx +++ b/src/BRepBlend/BRepBlend_HCurve2dTool.lxx @@ -58,7 +58,7 @@ inline Standard_Boolean BRepBlend_HCurve2dTool::IsClosed(const Handle(Adaptor2d_ } //============================================================ inline Standard_Boolean BRepBlend_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_HCurve2d)& C) { - return(C->IsPeriodic()); + return(C->IsPeriodic222()); } //============================================================ inline Standard_Real BRepBlend_HCurve2dTool::Period(const Handle(Adaptor2d_HCurve2d)& C) { diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx index 06706a749a..3938b0e1be 100644 --- a/src/BRepCheck/BRepCheck_Wire.cxx +++ b/src/BRepCheck/BRepCheck_Wire.cxx @@ -997,7 +997,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F, // C1.Load(pcu); // To avoid exeption in Segment if C1 is BSpline - IFV - if(!C1.IsPeriodic()) { + if(!C1.IsPeriodic222()) { if(C1.FirstParameter() > first1) { first1 = C1.FirstParameter(); } @@ -1086,7 +1086,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F, if (!tabCur(j).IsNull() && last2 > first2) { C2.Load(tabCur(j)); // To avoid exeption in Segment if C2 is BSpline - IFV - if(!C2.IsPeriodic()) { + if(!C2.IsPeriodic222()) { if(C2.FirstParameter() > first2) { first2 = C2.FirstParameter(); } diff --git a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx index a4b2cd2298..2a4926954b 100644 --- a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx +++ b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx @@ -851,14 +851,14 @@ Standard_Boolean ChFi3d_Builder::SplitKPart // Parsing of domains by increasing parameters, // if there is a 2d circle on a plane, one goes on 2D line of opposite face. Standard_Real period1 = 0., period2 = 0.; - if(ll1.IsPeriodic()) { + if(ll1.IsPeriodic222()) { if(!Tri(H2,iH2,Ind2,wref,0.,pitol,Nb2)) return 0; period1 = ll1.Period(); if(!Tri(H1,iH1,Ind1,wref,period1,pitol,Nb1)) return 0; } else{ if(!Tri(H1,iH1,Ind1,wref,0.,pitol,Nb1)) return 0; - if(ll2.IsPeriodic()) { period2 = ll2.Period(); } + if(ll2.IsPeriodic222()) { period2 = ll2.Period(); } if(!Tri(H2,iH2,Ind2,wref,period2,pitol,Nb2)) return 0; } diff --git a/src/Contap/Contap_HCurve2dTool.lxx b/src/Contap/Contap_HCurve2dTool.lxx index a25cae31f2..ccba2e0fa2 100644 --- a/src/Contap/Contap_HCurve2dTool.lxx +++ b/src/Contap/Contap_HCurve2dTool.lxx @@ -60,7 +60,7 @@ inline Standard_Boolean Contap_HCurve2dTool::IsClosed(const Handle(Adaptor2d_HCu } //============================================================ inline Standard_Boolean Contap_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_HCurve2d)& C) { - return(C->IsPeriodic()); + return(C->IsPeriodic222()); } //============================================================ inline Standard_Real Contap_HCurve2dTool::Period(const Handle(Adaptor2d_HCurve2d)& C) { diff --git a/src/Extrema/Extrema_Curve2dTool.lxx b/src/Extrema/Extrema_Curve2dTool.lxx index ade79f652a..60f05c20e4 100644 --- a/src/Extrema/Extrema_Curve2dTool.lxx +++ b/src/Extrema/Extrema_Curve2dTool.lxx @@ -93,7 +93,7 @@ inline Standard_Real Extrema_Curve2dTool::FirstParameter(const Adaptor2d_Curve2d inline Standard_Boolean Extrema_Curve2dTool::IsPeriodic(const Adaptor2d_Curve2d& C) { - return C.IsPeriodic(); + return C.IsPeriodic222(); } //======================================================================= diff --git a/src/GCPnts/GCPnts_AbscissaPoint.pxx b/src/GCPnts/GCPnts_AbscissaPoint.pxx index 231d3b3d5a..222e06d5bb 100644 --- a/src/GCPnts/GCPnts_AbscissaPoint.pxx +++ b/src/GCPnts/GCPnts_AbscissaPoint.pxx @@ -256,7 +256,7 @@ static void AdvCompute(CPnts_AbscissaPoint& theComputer, // Push a little bit outside the limits (hairy !!!) - Standard_Boolean nonperiodic = !C.IsPeriodic(); + Standard_Boolean nonperiodic = true/*!C.IsPeriodic222()*/; Ui = U0 + sign*0.1; Standard_Real U1 = U0 + sign*.2; if(nonperiodic) { diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx b/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx index e34f5a3e94..0f17427cf2 100644 --- a/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx +++ b/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx @@ -541,7 +541,7 @@ Standard_Boolean Geom2dAdaptor_Curve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean Geom2dAdaptor_Curve::IsPeriodic() const +Standard_Boolean Geom2dAdaptor_Curve::IsPeriodic222() const { return myCurve->IsPeriodic111(); } diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx b/src/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx index a230c342f6..1107cf19f0 100644 --- a/src/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx +++ b/src/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx @@ -105,7 +105,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/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx index 4571e19c34..8dd9131cf8 100644 --- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx +++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx @@ -888,7 +888,7 @@ InitBiPointsWithConnexity (const Standard_Integer e, #endif aNode12Indices->Flag |= NMsk_Edge; TIMultiply(XTI2,YTI2,ZTI2); - if (Pol1(1) == Pol1(nbPol) && myPC.IsPeriodic()) + if (Pol1(1) == Pol1(nbPol) && myPC.IsPeriodic222()) U2 = U2 - myPC.Period(); if (nbPol == 2 && BRep_Tool::Degenerated(E)) { @@ -1055,7 +1055,7 @@ InitBiPointsWithConnexity (const Standard_Integer e, aNode12Indices->Flag |= NMsk_Edge; Nod22Indices->Flag |= NMsk_Edge; TIMultiply(XTI2,YTI2,ZTI2); - if (Pol1(1) == Pol1(nbPol1) && myPC.IsPeriodic()) + if (Pol1(1) == Pol1(nbPol1) && myPC.IsPeriodic222()) U2 = U2 - myPC.Period(); if (nbPol1 == 2 && BRep_Tool::Degenerated(E)) { diff --git a/src/IntPatch/IntPatch_HCurve2dTool.lxx b/src/IntPatch/IntPatch_HCurve2dTool.lxx index 0348595864..f1585911e7 100644 --- a/src/IntPatch/IntPatch_HCurve2dTool.lxx +++ b/src/IntPatch/IntPatch_HCurve2dTool.lxx @@ -60,7 +60,7 @@ inline Standard_Boolean IntPatch_HCurve2dTool::IsClosed(const Handle(Adaptor2d_H } //============================================================ inline Standard_Boolean IntPatch_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_HCurve2d)& C) { - return(C->IsPeriodic()); + return(C->IsPeriodic222()); } //============================================================ inline Standard_Real IntPatch_HCurve2dTool::Period(const Handle(Adaptor2d_HCurve2d)& C) { diff --git a/src/IntTools/IntTools_FaceFace.cxx b/src/IntTools/IntTools_FaceFace.cxx index 0da39771d9..e4111c542a 100644 --- a/src/IntTools/IntTools_FaceFace.cxx +++ b/src/IntTools/IntTools_FaceFace.cxx @@ -2099,7 +2099,7 @@ Standard_Boolean IsCurveValid (const Handle(Geom2d_Curve)& thePCurve) pntf = thePCurve->Value(pf); pntl = thePCurve->Value(pl); PCA.Load(thePCurve); - if(!PCA.IsPeriodic()) { + if(!PCA.IsPeriodic222()) { if(PCA.FirstParameter() > pf) pf = PCA.FirstParameter(); if(PCA.LastParameter() < pl) pl = PCA.LastParameter(); } diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx index 656e99be76..39ca2aa72f 100644 --- a/src/ProjLib/ProjLib_ProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx @@ -970,7 +970,7 @@ Standard_Boolean ProjLib_ProjectedCurve::IsClosed() const //purpose : //======================================================================= -Standard_Boolean ProjLib_ProjectedCurve::IsPeriodic() const +Standard_Boolean ProjLib_ProjectedCurve::IsPeriodic222() const { return myResult.IsPeriodic(); } diff --git a/src/ProjLib/ProjLib_ProjectedCurve.hxx b/src/ProjLib/ProjLib_ProjectedCurve.hxx index c788587cd3..7bcf53b529 100644 --- a/src/ProjLib/ProjLib_ProjectedCurve.hxx +++ b/src/ProjLib/ProjLib_ProjectedCurve.hxx @@ -146,7 +146,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;