ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-25 14:12:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0021683: EDF 678 GEOM: Partition failure

Browse Source
This commit is contained in:
jfa 2012-07-05 13:52:07 +00:00
parent b659aaf41b
commit dccdaf0d56
1 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/GEOMAlgo/GEOMAlgo_Tools_1.cxx
View File

@ -19,10 +19,9 @@
// File: GEOMAlgo_Tools_1.cxx // File: GEOMAlgo_Tools_1.cxx
// Created: Thu May 6 10:46:21 2010 // Created: Thu May 6 10:46:21 2010
// Author: Peter KURNEV // Author: Peter KURNEV
// <pkv@irinox>
#include <GEOMAlgo_Tools.hxx> #include <GEOMAlgo_Tools.hxx>
//
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
@ -71,7 +70,7 @@ static
//function : CorrectWires //function : CorrectWires
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean GEOMAlgo_Tools::CorrectWires(const TopoDS_Shape& aShape) Standard_Boolean GEOMAlgo_Tools::CorrectWires(const TopoDS_Shape& aShape)
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
TopoDS_Iterator aItF; TopoDS_Iterator aItF;
@ -90,7 +89,10 @@ static
const Handle(Geom_Surface)& aS=BRep_Tool::Surface(aF, aLoc); const Handle(Geom_Surface)& aS=BRep_Tool::Surface(aF, aLoc);
aGAS.Load(aS); aGAS.Load(aS);
aTS=aGAS.GetType(); aTS=aGAS.GetType();
if (aTS==GeomAbs_Cylinder || aTS==GeomAbs_Plane) { //modified by NIZNHY-PKV Mon Jul 02 13:58:30 2012f
if (aTS==GeomAbs_Cylinder || aTS==GeomAbs_Plane || aTS==GeomAbs_BSplineSurface) {
//if (aTS==GeomAbs_Cylinder || aTS==GeomAbs_Plane) {
//modified by NIZNHY-PKV Mon Jul 02 13:58:33 2012t
aItF.Initialize(aF); aItF.Initialize(aF);
for (; aItF.More(); aItF.Next()) { for (; aItF.More(); aItF.Next()) {
const TopoDS_Wire& aW=*((TopoDS_Wire*)&aItF.Value()); const TopoDS_Wire& aW=*((TopoDS_Wire*)&aItF.Value());
@ -103,6 +105,7 @@ static
} }
return bRet; return bRet;
} }
//======================================================================= //=======================================================================
//class: GEOMAlgo_InfoEdge //class: GEOMAlgo_InfoEdge
//purpose : //purpose :
@ -196,6 +199,7 @@ typedef GEOMAlgo_DataMapOfShapeInfoEdge::Iterator GEOMAlgo_DataMapIteratorOfData
return; return;
} }
} }
//======================================================================= //=======================================================================
//function : CorrectWire //function : CorrectWire
//purpose : //purpose :
@ -290,11 +294,13 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
} }
// //
Standard_Integer i, aNbP; Standard_Integer i, aNbP;
Standard_Real aIP_ParamOnFirst, aIP_ParamOnSecond; Standard_Real aIP_ParamOnFirst, aIP_ParamOnSecond, aDTresh, aDT;
gp_Pnt aP3D1, aP3D2; gp_Pnt aP3D1, aP3D2;
gp_Pnt2d aP2D1, aP2D2; gp_Pnt2d aP2D1, aP2D2;
IntRes2d_Transition aTr1, aTr2; IntRes2d_Transition aTr1, aTr2;
// //
aDTresh=0.001;
//
aNbP=aInter.NbPoints(); aNbP=aInter.NbPoints();
for (i=1; i<=aNbP; ++i) { for (i=1; i<=aNbP; ++i) {
const IntRes2d_IntersectionPoint& aIP = aInter.Point(i); const IntRes2d_IntersectionPoint& aIP = aInter.Point(i);
@ -327,7 +333,14 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
aD2=aPV.Distance(aP3D2); aD2=aPV.Distance(aP3D2);
aDmax=(aD1>aD2)? aD1 : aD2; aDmax=(aD1>aD2)? aD1 : aD2;
if (aDmax>aCoeff*aTolV) { if (aDmax>aCoeff*aTolV) {
if (aDmax<10.*aTolV){ //modified by NIZNHY-PKV Mon Jul 02 13:56:35 2012f
aDT=10.*aTolV;
if (aDT<aDTresh) {
aDT=aDTresh;
}
if (aDmax<aDT){
//if (aDmax<10.*aTolV){
//modified by NIZNHY-PKV Mon Jul 02 13:56:40 2012t
aBB.UpdateVertex(aV, aDmax); aBB.UpdateVertex(aV, aDmax);
bRet=Standard_True; bRet=Standard_True;
} }
@ -337,5 +350,3 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
}//for(; aItDMVLE.More(); aItDMVLE.Next()) { }//for(; aItDMVLE.More(); aItDMVLE.Next()) {
return bRet; return bRet;
} }