OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

Correct the algorithm of merging edges, applying more strict requirement to planarity when creating a circle. This gives more accurate output.

Browse Source
This commit is contained in:
msv 2016-08-05 11:57:20 +03:00 committed by ema
parent fc5399d2e2
commit fbc3f28c6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ShapeUpgrade/ShapeUpgrade_CombineToCylinder.cxx
View File

@ -632,22 +632,25 @@ static TopoDS_Edge createCurveEdge(const TopTools_ListOfShape& theChain,
// Check if all points are in plane perpendicular to the cylinder axis; // Check if all points are in plane perpendicular to the cylinder axis;
// in such case the curve is a circle // in such case the curve is a circle
TColgp_Array1OfPnt aPnts(1, theChain.Extent()+1); TColgp_Array1OfPnt aPnts(1, theChain.Extent()+1);
Standard_Real aTol = 0.;
Standard_Integer i = 1; Standard_Integer i = 1;
for (itL.Init(theChain); itL.More(); itL.Next(), i++) for (itL.Init(theChain); itL.More(); itL.Next(), i++)
{ {
const TopoDS_Edge& aE = TopoDS::Edge(itL.Value()); const TopoDS_Edge& aE = TopoDS::Edge(itL.Value());
TopoDS_Shape aV = TopExp::FirstVertex(aE, Standard_True); TopoDS_Shape aV = TopExp::FirstVertex(aE, Standard_True);
aPnts(i) = BRep_Tool::Pnt(TopoDS::Vertex(aV)); aPnts(i) = BRep_Tool::Pnt(TopoDS::Vertex(aV));
aTol = Max(aTol, BRep_Tool::Tolerance(aE));
} }
aPnts(i) = BRep_Tool::Pnt(aVL); aPnts(i) = BRep_Tool::Pnt(aVL);
gp_XYZ aMidPnt(0, 0, 0); gp_XYZ aMidPnt(0, 0, 0);
for (i = 1; i <= aPnts.Length(); i++) for (i = 1; i <= aPnts.Length(); i++)
aMidPnt += aPnts(i).XYZ(); aMidPnt += aPnts(i).XYZ();
aMidPnt /= aPnts.Length(); aMidPnt /= aPnts.Length();
aTol = Min(aTol, theLinTol);
for (i = 1; i <= aPnts.Length(); i++) for (i = 1; i <= aPnts.Length(); i++)
{ {
Standard_Real aDist = fabs((aPnts(i).XYZ() - aMidPnt) * aCylDir.XYZ()); Standard_Real aDist = fabs((aPnts(i).XYZ() - aMidPnt) * aCylDir.XYZ());
if (aDist > theLinTol) if (aDist > aTol)
break; break;
} }
Standard_Boolean isCircle = (i > aPnts.Length()); Standard_Boolean isCircle = (i > aPnts.Length());
@ -705,7 +708,7 @@ static TopoDS_Edge createCurveEdge(const TopTools_ListOfShape& theChain,
Standard_Integer aDegMin = 3; Standard_Integer aDegMin = 3;
Standard_Integer aDegMax = 3; Standard_Integer aDegMax = 3;
GeomAbs_Shape aCont = GeomAbs_C2; GeomAbs_Shape aCont = GeomAbs_C2;
GeomAPI_PointsToBSpline aCreator(aPntA, aDegMin, aDegMax, aCont, theLinTol); GeomAPI_PointsToBSpline aCreator(aPntA, aDegMin, aDegMax, aCont, aTol);
if (aCreator.IsDone()) if (aCreator.IsDone())
{ {
const Handle(Geom_BSplineCurve)& aCurve = aCreator.Curve(); const Handle(Geom_BSplineCurve)& aCurve = aCreator.Curve();