ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-27 21:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to DEV version of OpenCASCADE

Browse Source
This commit is contained in:
jfa 2017-02-10 14:05:59 +03:00
parent 4f8b67f9b1
commit 01cd54d814
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GEOMImpl/GEOMImpl_Fillet1d.cxx
View File

@ -22,6 +22,8 @@
#include "GEOMImpl_Fillet1d.hxx" #include "GEOMImpl_Fillet1d.hxx"
#include <Basics_OCCTVersion.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx> #include <BRepBuilderAPI_MakeEdge.hxx>
@ -39,6 +41,8 @@
#include <IntRes2d_IntersectionSegment.hxx> #include <IntRes2d_IntersectionSegment.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <Standard_NotImplemented.hxx>
/** /**
* This function returns Standard_True if it is possible to divide edge, i.e. * This function returns Standard_True if it is possible to divide edge, i.e.
@ -156,8 +160,8 @@ static Standard_Boolean isRadiusIntersected(const Handle(Geom2d_Curve)& theCurve
{ {
const Standard_Real aTol = Precision::Confusion(); const Standard_Real aTol = Precision::Confusion();
const Standard_Real anAngTol = Precision::Angular(); const Standard_Real anAngTol = Precision::Angular();
Geom2dAPI_InterCurveCurve anInter(theCurve, new Geom2d_Line(theStart, Handle(Geom2d_Line) aRadiusLine = new Geom2d_Line (theStart, gp_Dir2d(gp_Vec2d(theStart, theEnd)));
gp_Dir2d(gp_Vec2d(theStart, theEnd))), aTol); Geom2dAPI_InterCurveCurve anInter (theCurve, aRadiusLine, aTol);
Standard_Integer a; Standard_Integer a;
gp_Pnt2d aPoint; gp_Pnt2d aPoint;
for(a = anInter.NbPoints(); a > 0; a--) for(a = anInter.NbPoints(); a > 0; a--)
@ -173,6 +177,16 @@ static Standard_Boolean isRadiusIntersected(const Handle(Geom2d_Curve)& theCurve
Handle(Geom2d_Curve) aCurve; Handle(Geom2d_Curve) aCurve;
for(a = anInter.NbSegments(); a > 0; a--) for(a = anInter.NbSegments(); a > 0; a--)
{ {
// Porting to DEV version of OCCT 10.02.2017 BEGIN
#if OCC_VERSION_LARGE > 0x07010000
Standard_NotImplemented::Raise("The treatment of tangential intersection is not implemented");
#else
// This piece of code seems never worked, because:
// 1. In case of two curves intersection
// method Segment with TWO output curves HAS TO be used.
// 2. Method Segment with ONE output curve (as below) just raises
// Standard_NotImplemented exception since 05.03.2012 (at least)
// and that is why has been eliminated 03.02.2017.
anInter.Segment(a, aCurve); anInter.Segment(a, aCurve);
aPoint = aCurve->Value(aCurve->FirstParameter()); aPoint = aCurve->Value(aCurve->FirstParameter());
if (aPoint.Distance(theStart) < aTol) if (aPoint.Distance(theStart) < aTol)
@ -190,6 +204,8 @@ static Standard_Boolean isRadiusIntersected(const Handle(Geom2d_Curve)& theCurve
return Standard_True; return Standard_True;
if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol)) if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol))
return Standard_True; return Standard_True;
#endif
// Porting to DEV version of OCCT 10.02.2017 END
} }
return Standard_False; return Standard_False;
} }