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

Mantis issues 0020573 and 0020603: Partition problems. A fix by Peter KURNEV.

Browse Source
This commit is contained in:
jfa 2009-12-09 12:21:17 +00:00
parent cb234e2462
commit 499b281dc4
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
View File

@ -86,7 +86,10 @@
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx> #include <TopTools_MapIteratorOfMapOfShape.hxx>
// //
#include <GeomAdaptor_Surface.hxx>
//
static static
Standard_Boolean FindFacePairs (const TopoDS_Edge& , Standard_Boolean FindFacePairs (const TopoDS_Edge& ,
const TopTools_ListOfShape& , const TopTools_ListOfShape& ,
@ -98,7 +101,6 @@ static
const gp_Dir& , const gp_Dir& ,
const gp_Dir& ); const gp_Dir& );
//modified by NIZNHY-PKV Tue Jul 14 07:24:10 2009f
static static
void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aE, void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aE,
const TopoDS_Face& aF, const TopoDS_Face& aF,
@ -106,7 +108,6 @@ static
gp_Pnt& aPF, gp_Pnt& aPF,
gp_Dir& aDNF, gp_Dir& aDNF,
IntTools_Context& aCtx); IntTools_Context& aCtx);
//modified by NIZNHY-PKV Tue Jul 14 07:24:15 2009t
//======================================================================= //=======================================================================
//function : IsInternalFace //function : IsInternalFace
@ -264,13 +265,11 @@ static
// 3 // 3
bRet=Standard_False; bRet=Standard_False;
// //
//modified by NIZNHY-PKV Tue Jul 14 07:22:38 2009f
GetApproxNormalToFaceOnEdge (aE1, theFace1, aT, aPF1, aDNF1, theContext); GetApproxNormalToFaceOnEdge (aE1, theFace1, aT, aPF1, aDNF1, theContext);
GetApproxNormalToFaceOnEdge (aE2, theFace2, aT, aPF2, aDNF2, theContext); GetApproxNormalToFaceOnEdge (aE2, theFace2, aT, aPF2, aDNF2, theContext);
//BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (aE1, theFace1, aT, aPF1, aDNF1); //BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (aE1, theFace1, aT, aPF1, aDNF1);
//BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (aE2, theFace2, aT, aPF2, aDNF2); //BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (aE2, theFace2, aT, aPF2, aDNF2);
//modified by NIZNHY-PKV Tue Jul 14 07:22:42 2009t
// //
aTwoPI=2.*PI; aTwoPI=2.*PI;
gp_Vec aVBF (aPx, aPF ); gp_Vec aVBF (aPx, aPF );
@ -1045,7 +1044,6 @@ Standard_Real AngleWithRef(const gp_Dir& theD1,
} }
return aBeta; return aBeta;
} }
//modified by NIZNHY-PKV Tue Jul 14 07:49:55 2009f
//======================================================================= //=======================================================================
//function : GetApproxNormalToFaceOnEdge //function : GetApproxNormalToFaceOnEdge
//purpose : //purpose :
@ -1062,6 +1060,9 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
gp_Dir aDTT, aDNFT, aDBT; gp_Dir aDTT, aDNFT, aDBT;
gp_Pnt aPFT, aPFx; gp_Pnt aPFT, aPFx;
Handle(Geom_Curve) aC3D; Handle(Geom_Curve) aC3D;
Handle(Geom_Surface) aS;
GeomAdaptor_Surface aGAS;
GeomAbs_SurfaceType aTS;
TopoDS_Face aF; TopoDS_Face aF;
TopoDS_Edge aE; TopoDS_Edge aE;
// //
@ -1073,7 +1074,6 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
aE.Reverse(); aE.Reverse();
// //
aF.Orientation(TopAbs_FORWARD); aF.Orientation(TopAbs_FORWARD);
//GEOMAlgo_Tools3D::GetEdgeOnFace(aEx, aF, aE);
} }
// //
// Point at aT // Point at aT
@ -1090,6 +1090,30 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
aDBT=aDNFT^aDTT; aDBT=aDNFT^aDTT;
// //
dT=BOPTools_Tools3D::MinStepIn2d();//~1.e-5; dT=BOPTools_Tools3D::MinStepIn2d();//~1.e-5;
dT=10.*dT;
//----------------------------------------------
{
aS=BRep_Tool::Surface(aF);
aGAS.Load(aS);
aTS=aGAS.GetType();
if (aTS==GeomAbs_BSplineSurface ||
aTS==GeomAbs_BezierSurface ||
aTS==GeomAbs_Plane) {//modified by NIZNHY-PKV Fri Dec 4 08:23:24 2009ft
Standard_Real aTolEx, aTolFx, aTol, dUR, dVR, dR;
//
aTolEx=BRep_Tool::Tolerance(aEx);
aTolFx=BRep_Tool::Tolerance(aFx);
aTol=2.*aTolEx+aTolFx;
dUR=aGAS.UResolution(aTol);
dVR=aGAS.VResolution(aTol);
dR=(dUR>dVR)? dUR : dVR;
if (dR>dT) {
dT=dR;
}
}
}
//----------------------------------------------
//
aPFx.SetXYZ(aPFT.XYZ()+dT*aDBT.XYZ()); aPFx.SetXYZ(aPFT.XYZ()+dT*aDBT.XYZ());
// //
aPF=aPFx; aPF=aPFx;
@ -1099,12 +1123,10 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
} }
// //
GeomAPI_ProjectPointOnSurf& aProjector=aCtx.ProjPS(aF); GeomAPI_ProjectPointOnSurf& aProjector=aCtx.ProjPS(aF);
//
aProjector.Perform(aPFx); aProjector.Perform(aPFx);
if(aProjector.IsDone()) { if(aProjector.IsDone()) {
Handle(Geom_Surface) aS;
//
aProjector.LowerDistanceParameters (aU, aV); aProjector.LowerDistanceParameters (aU, aV);
aS=BRep_Tool::Surface(aF);
aS->D0(aU, aV, aPF); aS->D0(aU, aV, aPF);
BOPTools_Tools3D::GetNormalToSurface (aS, aU, aV, aDNF); BOPTools_Tools3D::GetNormalToSurface (aS, aU, aV, aDNF);
if (bReverse){ if (bReverse){
@ -1112,4 +1134,3 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
} }
} }
} }
//modified by NIZNHY-PKV Tue Jul 14 07:49:58 2009t