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

0021018: EDF 1592 GEOM: Problems with the radius input field in the Fillet 1D dialog box

Browse Source
This commit is contained in:
vsr 2010-10-20 08:12:33 +00:00
parent 087dcc5c95
commit 25b91b8d9d
2 changed files with 917 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/GEOMImpl/GEOMImpl_Fillet1d.cxx
View File

@ -223,6 +223,7 @@ void GEOMImpl_Fillet1d::fillDiff(GEOMImpl_Fillet1dPoint* thePoint, Standard_Real
//=======================================================================
Standard_Boolean GEOMImpl_Fillet1d::Perform(const Standard_Real theRadius)
{
myDegreeOfRecursion = 0;
myResultParams.Clear();
myResultOrientation.Clear();
@ -305,10 +306,26 @@ Standard_Boolean GEOMImpl_Fillet1d::processPoint(GEOMImpl_Fillet1dPoint* theLeft
theParameter = theRight->GetParam() - aDX / 100.;
}
// Protection on infinite loop.
myDegreeOfRecursion++;
Standard_Real diffx = 0.001 * aDX;
if (myDegreeOfRecursion > 1000)
{
diffx *= 10.0;
if (myDegreeOfRecursion > 10000)
{
diffx *= 10.0;
if (myDegreeOfRecursion > 100000)
{
return Standard_True;
}
}
}
GEOMImpl_Fillet1dPoint* aPoint1 = theLeft->Copy();
GEOMImpl_Fillet1dPoint* aPoint2 = new GEOMImpl_Fillet1dPoint(theParameter);
fillPoint(aPoint2);
fillDiff(aPoint2, aDX / 10., Standard_True);
fillDiff(aPoint2, diffx, Standard_True);
aPoint1->FilterPoints(aPoint2);
performNewton(aPoint1, aPoint2);

1
src/GEOMImpl/GEOMImpl_Fillet1d.hxx
View File

@ -69,6 +69,7 @@ private:
TColStd_ListOfReal myResultParams;
TColStd_SequenceOfInteger myResultOrientation;
Standard_Boolean myStartSide, myEdgesExchnged;
Standard_Integer myDegreeOfRecursion;
};