1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

Correction of tolerances according to OCC26619

This commit is contained in:
jgv
2016-01-20 13:14:02 +03:00
parent 9b56be72d6
commit ac7315780c

View File

@@ -353,8 +353,8 @@ static Standard_Boolean isTreatAnalityc(const TopoDS_Face& theF1,
const Standard_Real Tolang = 1.e-8;
const Standard_Real aTolF1=BRep_Tool::Tolerance(theF1);
const Standard_Real aTolF2=BRep_Tool::Tolerance(theF2);
//const Standard_Real aTolSum = aTolF1 + aTolF2;
const Standard_Real aTolSum = Min(aTolF1, aTolF2);
const Standard_Real aTolSum = aTolF1 + aTolF2 + Precision::Confusion();
//const Standard_Real aTolSum = Min(aTolF1, aTolF2);
Standard_Real aHigh = 0.0;
const BRepAdaptor_Surface aBAS1(theF1), aBAS2(theF2);
@@ -483,8 +483,8 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
const Standard_Real aTolF1=BRep_Tool::Tolerance(myFace1);
const Standard_Real aTolF2=BRep_Tool::Tolerance(myFace2);
//Standard_Real TolArc = aTolF1 + aTolF2;
Standard_Real TolArc = Min(aTolF1, aTolF2);
Standard_Real TolArc = aTolF1 + aTolF2 + Precision::Confusion();
//Standard_Real TolArc = Min(aTolF1, aTolF2);
Standard_Real TolTang = TolArc;
const Standard_Boolean isFace1Quad = (aType1 == GeomAbs_Cylinder ||
@@ -546,7 +546,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
return;
}//if(aType1==GeomAbs_Plane && aType2==GeomAbs_Plane){
if ((aType1==GeomAbs_Plane) && isFace2Quad)
if ((aType1==GeomAbs_Plane)/* && isFace2Quad*/)
{
Standard_Real umin, umax, vmin, vmax;
// F1
@@ -563,7 +563,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
hasCone = Standard_True;
}
}
else if ((aType2==GeomAbs_Plane) && isFace1Quad)
else if ((aType2==GeomAbs_Plane)/* && isFace1Quad*/)
{
Standard_Real umin, umax, vmin, vmax;
//F1