// Created on: 1994-03-09
// Created by: Isabelle GRIGNON
// Copyright (c) 1994-1999 Matra Datavision
-// Copyright (c) 1999-2012 OPEN CASCADE SAS
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
//
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
//
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
-
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
// Modified by skv - Mon Jun 7 18:38:57 2004 OCC5898
// Modified by skv - Thu Aug 21 11:55:58 2008 OCC20222
-#include <ChFi3d_Builder.jxx>
+#include <Adaptor2d_HCurve2d.hxx>
+#include <Adaptor3d_CurveOnSurface.hxx>
+#include <Adaptor3d_HCurveOnSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_TopolTool.hxx>
+#include <AppBlend_Approx.hxx>
+#include <Blend_CurvPointFuncInv.hxx>
+#include <Blend_FuncInv.hxx>
+#include <Blend_Function.hxx>
+#include <Blend_RstRstFunction.hxx>
+#include <Blend_SurfCurvFuncInv.hxx>
+#include <Blend_SurfPointFuncInv.hxx>
+#include <Blend_SurfRstFunction.hxx>
+#include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepAdaptor_Curve2d.hxx>
+#include <BRepAdaptor_HCurve.hxx>
+#include <BRepAdaptor_HCurve2d.hxx>
+#include <BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepAlgo_NormalProjection.hxx>
+#include <BRepBlend_Line.hxx>
+#include <BRepExtrema_ExtCC.hxx>
+#include <BRepLib_MakeEdge.hxx>
+#include <BRepTools.hxx>
+#include <BRepTopAdaptor_TopolTool.hxx>
#include <ChFi3d.hxx>
+#include <ChFi3d_Builder.hxx>
#include <ChFi3d_Builder_0.hxx>
-
-#include <Precision.hxx>
-
-#include <Standard_Failure.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <StdFail_NotDone.hxx>
-
-
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Circ.hxx>
-
+#include <ChFiDS_CommonPoint.hxx>
+#include <ChFiDS_FaceInterference.hxx>
+#include <ChFiDS_HData.hxx>
+#include <ChFiDS_HElSpine.hxx>
+#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
+#include <ChFiDS_Map.hxx>
+#include <ChFiDS_SequenceOfSurfData.hxx>
+#include <ChFiDS_Spine.hxx>
+#include <ChFiDS_Stripe.hxx>
+#include <ChFiDS_SurfData.hxx>
#include <ElCLib.hxx>
#include <ElSLib.hxx>
-
-#include <Geom_Line.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_BezierSurface.hxx>
+#include <Extrema_ExtCC.hxx>
+#include <Extrema_ExtPC.hxx>
+#include <Extrema_ExtPC2d.hxx>
+#include <Extrema_ExtPS.hxx>
+#include <Extrema_LocateExtCC.hxx>
+#include <Extrema_POnCurv.hxx>
#include <Geom2d_BSplineCurve.hxx>
-#include <Geom2dAdaptor_HCurve.hxx>
+#include <Geom2d_Curve.hxx>
+#include <Geom2d_Line.hxx>
#include <Geom2d_TrimmedCurve.hxx>
+#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dInt_GInter.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BoundedCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom_Circle.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_RectangularTrimmedSurface.hxx>
+#include <Geom_Surface.hxx>
#include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
#include <GeomAbs_Shape.hxx>
#include <GeomAdaptor_HCurve.hxx>
-#include <GeomAdaptor_Surface.hxx>
#include <GeomAdaptor_HSurface.hxx>
-#include <Geom_BoundedCurve.hxx>
-#include <GeomLib.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <GeomAPI_ExtremaCurveCurve.hxx>
#include <GeomInt_IntSS.hxx>
+#include <GeomLib.hxx>
#include <GeomProjLib.hxx>
-
-#include <Adaptor3d_HCurveOnSurface.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <BRepAdaptor_HSurface.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_HCurve2d.hxx>
-#include <BRepAdaptor_HCurve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepLib_MakeEdge.hxx>
-#include <BRepAlgo_NormalProjection.hxx>
-#include <BRepExtrema_ExtCC.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepTools.hxx>
-#include <BRep_Builder.hxx>
+#include <gp_Ax3.hxx>
+#include <gp_Circ.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Dir2d.hxx>
+#include <gp_Elips.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
+#include <gp_Vec.hxx>
+#include <gp_Vec2d.hxx>
#include <IntCurveSurface_HInter.hxx>
#include <IntCurveSurface_IntersectionPoint.hxx>
#include <IntRes2d_IntersectionPoint.hxx>
#include <IntRes2d_Transition.hxx>
-#include <Extrema_LocateExtCC.hxx>
-#include <Extrema_POnCurv.hxx>
-#include <Extrema_ExtPC2d.hxx>
-#include <Extrema_ExtPC.hxx>
-#include <Extrema_ExtPS.hxx>
-#include <Extrema_ExtCC.hxx>
-
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-
+#include <Precision.hxx>
+#include <Standard_ConstructionError.hxx>
+#include <Standard_Failure.hxx>
+#include <Standard_NoSuchObject.hxx>
+#include <Standard_NotImplemented.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TColgp_Array1OfPnt2d.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
#include <TopAbs.hxx>
-#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_Orientation.hxx>
+#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopLoc_Location.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-
-#include <TopOpeBRepDS_Point.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopOpeBRepDS_Curve.hxx>
-#include <TopOpeBRepDS_Surface.hxx>
-#include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
#include <TopOpeBRepDS_CurvePointInterference.hxx>
#include <TopOpeBRepDS_DataStructure.hxx>
-#include <TopOpeBRepDS_ListOfInterference.hxx>
+#include <TopOpeBRepDS_HDataStructure.hxx>
+#include <TopOpeBRepDS_Kind.hxx>
#include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
+#include <TopOpeBRepDS_ListOfInterference.hxx>
+#include <TopOpeBRepDS_Point.hxx>
#include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
-#include <TopOpeBRepDS_Kind.hxx>
+#include <TopOpeBRepDS_Surface.hxx>
+#include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
#include <TopOpeBRepDS_Transition.hxx>
#include <TopTools_Array1OfShape.hxx>
-#include <ChFiDS_HData.hxx>
-#include <ChFiDS_SurfData.hxx>
-#include <ChFiDS_CommonPoint.hxx>
-#include <ChFiDS_FaceInterference.hxx>
-#include <ChFiDS_SequenceOfSurfData.hxx>
-#include <ChFiDS_Stripe.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
-#include <ChFiDS_Map.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
-#ifdef DEB
+#ifdef OCCT_DEBUG
# ifdef DRAW
#include <OSD_Chronometer.hxx>
#include <DrawTrSurf.hxx>
#include <math_FunctionSample.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <IntRes2d_IntersectionSegment.hxx>
-// Modified by Sergey KHROMOV - Fri Dec 21 17:08:19 2001 Begin
-Standard_Boolean isTangentFaces(const TopoDS_Edge &theEdge,
- const TopoDS_Face &theFace1,
- const TopoDS_Face &theFace2);
-// Modified by Sergey KHROMOV - Fri Dec 21 17:08:19 2001 End
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BoundedSurface.hxx>
static Standard_Real recadre(const Standard_Real p,
const Standard_Real ref,
// parameter in FaceInterference.
//=======================================================================
-static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb,
- Handle(Adaptor2d_HCurve2d)& pcfb,
- Handle(Adaptor3d_HSurface)& surf,
+static Standard_Boolean Update(const Handle(Adaptor3d_HSurface)& fb,
+ const Handle(Adaptor2d_HCurve2d)& pcfb,
+ const Handle(Adaptor3d_HSurface)& surf,
ChFiDS_FaceInterference& fi,
ChFiDS_CommonPoint& cp,
gp_Pnt2d& p2dbout,
// and <p2dbout>
//=======================================================================
-static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb,
- Handle(Adaptor3d_HCurve)& ct,
+static Standard_Boolean Update(const Handle(Adaptor3d_HSurface)& fb,
+ const Handle(Adaptor3d_HCurve)& ct,
ChFiDS_FaceInterference& fi,
ChFiDS_CommonPoint& cp,
gp_Pnt2d& p2dbout,
if ( Update(HBs,Hc3df,FIop,CPop,FprolUV,isFirst,c3dU) )
return Standard_True;
- if (!isTangentFaces(Eprol,Fprol,Fop))
+ if (!ChFi3d_isTangentFaces(Eprol,Fprol,Fop))
return Standard_False;
Handle(Geom2d_Curve) gpcprol = BRep_Tool::CurveOnSurface(Eprol,Fprol,uf,ul);
// face at end.
//=======================================================================
-static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& face,
- Handle(Adaptor2d_HCurve2d)& edonface,
- Handle(Adaptor3d_HSurface)& surf,
+static Standard_Boolean Update(const Handle(Adaptor3d_HSurface)& face,
+ const Handle(Adaptor2d_HCurve2d)& edonface,
+ const Handle(Adaptor3d_HSurface)& surf,
ChFiDS_FaceInterference& fi,
ChFiDS_CommonPoint& cp,
const Standard_Boolean isfirst)
pared = ponc1.Parameter();
parltg = ponc2.Parameter();
if ((parltg > f) && (parltg < l)) {
-#ifdef OCC23139
- ////modified by jgv, 10.05.2012 for the bug 23139////
+ ////modified by jgv, 10.05.2012 for the bug 23139, 25657////
Handle(Geom2d_Curve) PConF = fi.PCurveOnFace();
if (!PConF.IsNull())
{
Handle(Geom2d_TrimmedCurve) aTrCurve = Handle(Geom2d_TrimmedCurve)::DownCast(PConF);
if (!aTrCurve.IsNull())
PConF = aTrCurve->BasisCurve();
- if (isfirst)
+ if (!PConF->IsPeriodic())
{
- Standard_Real fpar = PConF->FirstParameter();
- if (parltg < fpar)
- parltg = fpar;
- }
- else
- {
- Standard_Real lpar = PConF->LastParameter();
- if (parltg > lpar)
- parltg = lpar;
+ if (isfirst)
+ {
+ Standard_Real fpar = PConF->FirstParameter();
+ if (parltg < fpar)
+ parltg = fpar;
+ }
+ else
+ {
+ Standard_Real lpar = PConF->LastParameter();
+ if (parltg > lpar)
+ parltg = lpar;
+ }
}
}
/////////////////////////////////////////////////////
-#endif
fi.SetParameter(parltg,isfirst);
cp.SetArc(cp.Tolerance(),cp.Arc(),pared,cp.TransitionOnArc());
return Standard_True;
Standard_Integer & prol )
{
if (prol) return;
- Handle(Geom_BSplineSurface) S1;
- Handle(Geom_BezierSurface) S2;
+
+ prol = (S->IsKind (STANDARD_TYPE(Geom_BSplineSurface)) ? 1 :
+ S->IsKind (STANDARD_TYPE(Geom_BezierSurface)) ? 2 : 0);
+ if ( ! prol )
+ return;
+
Standard_Real length,umin,umax,vmin,vmax;
gp_Pnt P1,P2;
S->Bounds(umin,umax,vmin,vmax);
S->D0(umin,vmin,P1);
S->D0(umax,vmax,P2);
length=P1.Distance(P2);
- prol=0;
- S1=Handle(Geom_BSplineSurface)::DownCast(S);
- S2=Handle(Geom_BezierSurface)::DownCast(S);
- if (!S1.IsNull()) {
- GeomLib::ExtendSurfByLength(S1,length,1,Standard_False,
- Standard_True);
- GeomLib::ExtendSurfByLength(S1,length,1,Standard_True,
- Standard_True);
- GeomLib::ExtendSurfByLength(S1,length,1,Standard_False,
- Standard_False);
- GeomLib::ExtendSurfByLength(S1,length,1,Standard_True,
- Standard_False);
- S=S1;
- prol=1;
- }
- if (!S2.IsNull()) {
- GeomLib::ExtendSurfByLength(S2,length,1,Standard_False,
- Standard_True);
- GeomLib::ExtendSurfByLength(S2,length,1,Standard_True,
- Standard_True);
- GeomLib::ExtendSurfByLength(S2,length,1,Standard_False,
- Standard_False);
- GeomLib::ExtendSurfByLength(S2,length,1,Standard_True,
- Standard_False);
- S=S2;
- prol=2;
- }
+ Handle(Geom_BoundedSurface) aBS = Handle(Geom_BoundedSurface)::DownCast(S);
+ GeomLib::ExtendSurfByLength (aBS, length, 1, Standard_False, Standard_True);
+ GeomLib::ExtendSurfByLength (aBS, length, 1, Standard_True, Standard_True);
+ GeomLib::ExtendSurfByLength (aBS, length, 1, Standard_False, Standard_False);
+ GeomLib::ExtendSurfByLength (aBS, length, 1, Standard_True, Standard_False);
+ S = aBS;
}
//=======================================================================
//purpose : calculate the 2d of the curve Ct on face Face
//=======================================================================
-static void ComputeCurve2d (Handle(Geom_Curve )& Ct,
+static void ComputeCurve2d (const Handle(Geom_Curve )& Ct,
TopoDS_Face & Face,
Handle(Geom2d_Curve) & C2d)
{
{
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
-#ifdef DEB
+#ifdef OCCT_DEBUG
OSD_Chronometer ch;// init perf for PerformSetOfKPart
#endif
// the top,
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
TopExp_Explorer ex;
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_InitChron(ch); // init perf condition if (onsame)
#endif
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch,t_same); // result perf condition if (same)
ChFi3d_InitChron(ch); // init perf condition if (inters)
#endif
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch ,t_inter); //result perf condition if (inter)
ChFi3d_InitChron(ch); // init perf condition if (onsame && inters)
#endif
if (!CV2.IsVertex())
ChFi3d_SetPointTolerance(DStr,box2,stripe->IndexPoint(isfirst,2));
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_sameinter);//result perf condition if (same &&inter)
#endif
}
// - top has 3 edges and fillet on one of edges touches
// more than one face
-#ifdef DEB
+#ifdef OCCT_DEBUG
OSD_Chronometer ch;// init perf
#endif
ChFi3d_edge_common_faces(myEFMap(Eadj1),Fga,Fdr);
// Modified by Sergey KHROMOV - Fri Dec 21 17:57:32 2001 Begin
// reg1=BRep_Tool::Continuity(Eadj1,Fga,Fdr)!=GeomAbs_C0;
- reg1=isTangentFaces(Eadj1,Fga,Fdr);
+ reg1 = ChFi3d_isTangentFaces(Eadj1,Fga,Fdr);
// Modified by Sergey KHROMOV - Fri Dec 21 17:57:33 2001 End
if (F2.IsSame(facecouture)) Eadj2=edgecouture;
else ChFi3d_cherche_element(Vtx,EdgeSpine,F2,Eadj2,Vbid1);
ChFi3d_edge_common_faces(myEFMap(Eadj2),Fga,Fdr);
// Modified by Sergey KHROMOV - Fri Dec 21 17:58:22 2001 Begin
// reg2=BRep_Tool::Continuity(Eadj2,Fga,Fdr)!=GeomAbs_C0;
- reg2=isTangentFaces(Eadj2,Fga,Fdr);
+ reg2 = ChFi3d_isTangentFaces(Eadj2,Fga,Fdr);
// Modified by Sergey KHROMOV - Fri Dec 21 17:58:24 2001 End
// two faces common to the edge are found
if (Ishape1 > 0) {
trafil1 = DStr.Shape(Ishape1).Orientation();
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
else {
cout<<"erreur"<<endl;
}
trafil1 = TopAbs::Compose(TopAbs::Reverse(Fi1.Transition()),trafil1);
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
else cout<<"erreur"<<endl;
#endif
// eap, Apr 22 2002, occ 293
else if (nbarete==5) {
//pro15368
// Modified by Sergey KHROMOV - Fri Dec 21 18:07:43 2001 End
- Standard_Boolean isTangent0 = isTangentFaces(Edge[0],F1,Face[0]);
- Standard_Boolean isTangent1 = isTangentFaces(Edge[1],Face[0],Face[1]);
- Standard_Boolean isTangent2 = isTangentFaces(Edge[2],Face[1],Face[2]);
+ Standard_Boolean isTangent0 = ChFi3d_isTangentFaces(Edge[0],F1,Face[0]);
+ Standard_Boolean isTangent1 = ChFi3d_isTangentFaces(Edge[1],Face[0],Face[1]);
+ Standard_Boolean isTangent2 = ChFi3d_isTangentFaces(Edge[2],Face[1],Face[2]);
if ((isTangent0 || isTangent2) && isTangent1) {
// GeomAbs_Shape cont0,cont1,cont2;
// cont0=BRep_Tool::Continuity(Edge[0],F1,Face[0]);
inters.Perform(HC, HGs);
if ( !prolface[nn] && ( !inters.IsDone() || (inters.NbPoints()==0) )) {
// extend surface of conge
- Handle(Geom_BSplineSurface) S1=
- Handle(Geom_BSplineSurface)::DownCast(DStr.Surface(Fd->Surf()).Surface());
+ Handle(Geom_BoundedSurface) S1=
+ Handle(Geom_BoundedSurface)::DownCast(DStr.Surface(Fd->Surf()).Surface());
if (!S1.IsNull()) {
Standard_Real length = 0.5 * Max(Fi1Length,Fi2Length);
GeomLib::ExtendSurfByLength(S1,length,1,Standard_False,!isfirst);
inters.Perform(HC, HGs);
if (inters.IsDone()&& inters.NbPoints()!=0) {
Fd->ChangeSurf(DStr.AddSurface(TopOpeBRepDS_Surface(S1, DStr.ChangeSurface(Isurf).Tolerance())));
+ //update history
+ if (myEVIMap.IsBound(EdgeSpine))
+ {
+ TColStd_ListIteratorOfListOfInteger itl(myEVIMap.ChangeFind(EdgeSpine));
+ for (; itl.More(); itl.Next())
+ if (itl.Value() == Isurf)
+ {
+ myEVIMap.ChangeFind(EdgeSpine).Remove(itl);
+ break;
+ }
+ myEVIMap.ChangeFind(EdgeSpine).Append(Fd->Surf());
+ }
+ else
+ {
+ TColStd_ListOfInteger IndexList;
+ IndexList.Append(Fd->Surf());
+ myEVIMap.Bind(EdgeSpine, IndexList);
+ }
+ ////////////////
Isurf=Fd->Surf();
}
}
Pl=C1->Value(C1->LastParameter());
//Standard_Boolean sens;
sens=Pl.Distance(pext)<tolpt;
- GeomLib::ExtendCurveToPoint(C1,CV1.Point(),1,sens);
+ GeomLib::ExtendCurveToPoint (C1, CV1.Point(), 1, sens != 0);
csau=C1;
}
}
Pl=C1->Value(C1->LastParameter());
//Standard_Boolean sens;
sens=Pl.Distance(pext)<tolpt;
- GeomLib::ExtendCurveToPoint(C1,CV2.Point(),1,sens);
+ GeomLib::ExtendCurveToPoint (C1, CV2.Point(), 1, sens != 0);
csau=C1;
}
}
const TopoDS_Face& Favoid) const
{
if (P1.IsVertex() || P2.IsVertex()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
cout<<"change of face on vertex"<<endl;
#endif
}
return Standard_False;
}
TopTools_ListIteratorOfListOfShape It,Jt;
- Standard_Boolean Found = Standard_False, ContainsV = Standard_False;
+ Standard_Boolean Found = Standard_False;
for(It.Initialize(myEFMap(P1.Arc()));It.More() && !Found;It.Next()) {
Fv = TopoDS::Face(It.Value());
if(!Fv.IsSame(Favoid)){
}
}
}
+#ifdef OCCT_DEBUG
+ Standard_Boolean ContainsV = Standard_False;
if (Found) {
for(It.Initialize(myVFMap(V));It.More();It.Next()) {
if (TopoDS::Face(It.Value()).IsSame(Fv)) {
}
}
}
-#ifdef DEB
if(!ContainsV){
cout<<"FindFace : the extremity of the spine is not in the end face"<<endl;
}
+#else
+ (void)V; // avoid compiler warning on unused variable
#endif
return Found;
}
{
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
-#ifdef DEB
+#ifdef OCCT_DEBUG
OSD_Chronometer ch;// init perf pour PerformSetOfKPart
#endif
// The fillet is returned,
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
TopExp_Explorer ex;
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_InitChron(ch); // init perf condition
#endif
{
if(!CV1.IsOnArc() && !CV2.IsOnArc())
Standard_Failure::Raise("Corner intersmore : no point on arc");
else if(CV1.IsOnArc() && CV2.IsOnArc()){
- Standard_Boolean sur1 = 0, sur2 = 0;
+ Standard_Boolean sur2 = 0;
for(ex.Init(CV1.Arc(),TopAbs_VERTEX); ex.More(); ex.Next()){
if(Vtx.IsSame(ex.Current())) {
- sur1 = 1;
break;
}
}
inters = Update(HBs,Hc3df,FiopArc,CPopArc,p2dbout,isfirst,wop);
// Modified by Sergey KHROMOV - Fri Dec 21 18:08:27 2001 Begin
// if(!inters && BRep_Tool::Continuity(Arcprol,Fv,Fop) != GeomAbs_C0){
- if(!inters && isTangentFaces(Arcprol,Fv,Fop)){
+ if(!inters && ChFi3d_isTangentFaces(Arcprol,Fv,Fop)){
// Modified by Sergey KHROMOV - Fri Dec 21 18:08:29 2001 End
// Arcprol is an edge of tangency, ultimate adjustment by an extrema curve/curve is attempted.
Standard_Real ff,ll;
pced->ChangeCurve2d().Initialize(CPadArc.Arc(),Fv);
Update(HBs,pced,HGs,FiadArc,CPadArc,isfirst);
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch,t_same); // result perf condition if (same)
ChFi3d_InitChron(ch); // init perf condition if (inters)
#endif
}
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch ,t_inter); //result perf condition if (inter)
ChFi3d_InitChron(ch); // init perf condition if ( inters)
#endif
if (!CV2.IsVertex())
ChFi3d_SetPointTolerance(DStr,box2,stripe->IndexPoint(isfirst,2));
-#ifdef DEB
+#ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_sameinter);//result perf condition if (same &&inter)
#endif
}
projects / occt.git / blobdiff