OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025427: Algorithm of building plane from wire hangs

Browse Source 
Test-case for issue #25427
This commit is contained in:
ifv 2014-11-05 16:44:37 +03:00 committed by bugmaster
parent 3908084224
commit 43dbdb15db
2 changed files with 173 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
src/BRepLib/BRepLib_FindSurface.cxx
View File

@ -58,7 +58,7 @@
//purpose : //purpose :
//======================================================================= //=======================================================================
static Standard_Real Controle(const TColgp_SequenceOfPnt& thePoints, static Standard_Real Controle(const TColgp_SequenceOfPnt& thePoints,
const Handle(Geom_Plane)& thePlane) const Handle(Geom_Plane)& thePlane)
{ {
Standard_Real dfMaxDist=0.; Standard_Real dfMaxDist=0.;
Standard_Real a,b,c,d, dist; Standard_Real a,b,c,d, dist;
@ -79,9 +79,9 @@ static Standard_Real Controle(const TColgp_SequenceOfPnt& thePoints,
// the first vertex of theEdge2 in parametric space of theFace // the first vertex of theEdge2 in parametric space of theFace
//======================================================================= //=======================================================================
inline static Standard_Boolean Is2DConnected(const TopoDS_Edge& theEdge1, inline static Standard_Boolean Is2DConnected(const TopoDS_Edge& theEdge1,
const TopoDS_Edge& theEdge2, const TopoDS_Edge& theEdge2,
const Handle(Geom_Surface)& theSurface, const Handle(Geom_Surface)& theSurface,
const TopLoc_Location& theLocation) const TopLoc_Location& theLocation)
{ {
Standard_Real f,l; Standard_Real f,l;
//TopLoc_Location aLoc; //TopLoc_Location aLoc;
@ -110,8 +110,8 @@ inline static Standard_Boolean Is2DConnected(const TopoDS_Edge& theEdge1,
//======================================================================= //=======================================================================
static Standard_Boolean Is2DClosed(const TopoDS_Shape& theShape, static Standard_Boolean Is2DClosed(const TopoDS_Shape& theShape,
const Handle(Geom_Surface)& theSurface, const Handle(Geom_Surface)& theSurface,
const TopLoc_Location& theLocation) const TopLoc_Location& theLocation)
{ {
try try
{ {
@ -164,9 +164,9 @@ BRepLib_FindSurface::BRepLib_FindSurface()
//purpose : //purpose :
//======================================================================= //=======================================================================
BRepLib_FindSurface::BRepLib_FindSurface(const TopoDS_Shape& S, BRepLib_FindSurface::BRepLib_FindSurface(const TopoDS_Shape& S,
const Standard_Real Tol, const Standard_Real Tol,
const Standard_Boolean OnlyPlane, const Standard_Boolean OnlyPlane,
const Standard_Boolean OnlyClosed) const Standard_Boolean OnlyClosed)
{ {
Init(S,Tol,OnlyPlane,OnlyClosed); Init(S,Tol,OnlyPlane,OnlyClosed);
} }
@ -175,9 +175,9 @@ BRepLib_FindSurface::BRepLib_FindSurface(const TopoDS_Shape& S,
//purpose : //purpose :
//======================================================================= //=======================================================================
void BRepLib_FindSurface::Init(const TopoDS_Shape& S, void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
const Standard_Real Tol, const Standard_Real Tol,
const Standard_Boolean OnlyPlane, const Standard_Boolean OnlyPlane,
const Standard_Boolean OnlyClosed) const Standard_Boolean OnlyClosed)
{ {
myTolerance = Tol; myTolerance = Tol;
myTolReached = 0.; myTolReached = 0.;
@ -214,24 +214,24 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
// check the other edges // check the other edges
for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) { for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) {
if (!E.IsSame(ex.Current())) { if (!E.IsSame(ex.Current())) {
j = 0; j = 0;
for(;;) { for(;;) {
j++; j++;
BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()), BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()),
PPC,SS,L,ff,ll,j); PPC,SS,L,ff,ll,j);
if (SS.IsNull()) { if (SS.IsNull()) {
break; break;
} }
if (SS == mySurface) { if (SS == mySurface) {
break; break;
} }
SS.Nullify(); SS.Nullify();
} }
if (SS.IsNull()) { if (SS.IsNull()) {
mySurface.Nullify(); mySurface.Nullify();
break; break;
} }
} }
} }
@ -284,64 +284,84 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
{ {
case GeomAbs_BezierCurve: case GeomAbs_BezierCurve:
{ {
// Put all poles for bezier // Put all poles for bezier
Handle(Geom_BezierCurve) GC = c.Bezier(); Handle(Geom_BezierCurve) GC = c.Bezier();
Standard_Integer iNbPol = GC->NbPoles(); Standard_Integer iNbPol = GC->NbPoles();
if ( iNbPol < 2) Standard_Real tf = GC->FirstParameter();
// Degenerate Standard_Real tl = GC->LastParameter();
continue; Standard_Real r = (dfUl - dfUf) / (tl - tf);
else r *= iNbPol;
{ if ( iNbPol < 2 || r < 1.)
Handle(TColgp_HArray1OfPnt) aPoles = new (TColgp_HArray1OfPnt) (1, iNbPol); // Degenerate
GC->Poles(aPoles->ChangeArray1()); continue;
gp_Pnt aPolePrev = aPoles->Value(1), aPoleNext; else
Standard_Real dfDistPrev = 0., dfDistNext; {
for (Standard_Integer iPol=1; iPol<=iNbPol; iPol++) Handle(TColgp_HArray1OfPnt) aPoles = new (TColgp_HArray1OfPnt) (1, iNbPol);
{ GC->Poles(aPoles->ChangeArray1());
if (iPol<iNbPol) gp_Pnt aPolePrev = aPoles->Value(1), aPoleNext;
{ Standard_Real dfDistPrev = 0., dfDistNext;
aPoleNext = aPoles->Value(iPol+1); for (Standard_Integer iPol=1; iPol<=iNbPol; iPol++)
dfDistNext = aPolePrev.Distance(aPoleNext); {
} if (iPol<iNbPol)
else {
dfDistNext = 0.; aPoleNext = aPoles->Value(iPol+1);
aPoints.Append (aPolePrev); dfDistNext = aPolePrev.Distance(aPoleNext);
aWeight.Append (dfDistPrev+dfDistNext); }
dfDistPrev = dfDistNext; else
aPolePrev = aPoleNext; dfDistNext = 0.;
} aPoints.Append (aPolePrev);
} aWeight.Append (dfDistPrev+dfDistNext);
dfDistPrev = dfDistNext;
aPolePrev = aPoleNext;
}
}
} }
break; break;
case GeomAbs_BSplineCurve: case GeomAbs_BSplineCurve:
{ {
// Put all poles for bspline // Put all poles for bspline
Handle(Geom_BSplineCurve) GC = c.BSpline(); Handle(Geom_BSplineCurve) GC = c.BSpline();
Standard_Integer iNbPol = GC->NbPoles(); Standard_Integer iNbPol = GC->NbPoles();
if ( iNbPol < 2) Standard_Real tf = GC->FirstParameter();
// Degenerate Standard_Real tl = GC->LastParameter();
continue; Standard_Real r = (dfUl - dfUf) / (tl - tf);
else r *= iNbPol;
{ if ( iNbPol < 2 || r < 1.)
Handle(TColgp_HArray1OfPnt) aPoles = new (TColgp_HArray1OfPnt) (1, iNbPol); // Degenerate
GC->Poles(aPoles->ChangeArray1()); continue;
gp_Pnt aPolePrev = aPoles->Value(1), aPoleNext; else
Standard_Real dfDistPrev = 0., dfDistNext; {
for (Standard_Integer iPol=1; iPol<=iNbPol; iPol++) const Standard_Integer aNbPolMax = 200;
{ Standard_Integer incr = 1;
if (iPol<iNbPol) if(iNbPol > aNbPolMax)
{ {
aPoleNext = aPoles->Value(iPol+1); Standard_Integer nb = iNbPol;
dfDistNext = aPolePrev.Distance(aPoleNext); while(nb > aNbPolMax)
} {
else incr++;
dfDistNext = 0.; nb = (iNbPol-1) / incr;
aPoints.Append (aPolePrev); }
aWeight.Append (dfDistPrev+dfDistNext); }
dfDistPrev = dfDistNext; Handle(TColgp_HArray1OfPnt) aPoles = new (TColgp_HArray1OfPnt) (1, iNbPol);
aPolePrev = aPoleNext; GC->Poles(aPoles->ChangeArray1());
} gp_Pnt aPolePrev = aPoles->Value(1), aPoleNext;
} Standard_Real dfDistPrev = 0., dfDistNext;
Standard_Integer iPol;
for (iPol = 1; iPol <= iNbPol; iPol += incr)
{
if (iPol <= iNbPol - incr)
{
aPoleNext = aPoles->Value(iPol+incr);
dfDistNext = aPolePrev.Distance(aPoleNext);
}
else
dfDistNext = 0.;
aPoints.Append (aPolePrev);
aWeight.Append (dfDistPrev+dfDistNext);
dfDistPrev = dfDistNext;
aPolePrev = aPoleNext;
}
}
} }
break; break;
@ -351,37 +371,37 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
case GeomAbs_Hyperbola: case GeomAbs_Hyperbola:
case GeomAbs_Parabola: case GeomAbs_Parabola:
if (c.GetType() == GeomAbs_Line) if (c.GetType() == GeomAbs_Line)
// Two points on straight segment // Two points on straight segment
iNbPoints=2; iNbPoints=2;
else else
// Four points on otheranalitical curves // Four points on otheranalitical curves
iNbPoints=4; iNbPoints=4;
default: default:
{ {
// Put some points on other curves // Put some points on other curves
if (iNbPoints==0) if (iNbPoints==0)
iNbPoints = 15 + c.NbIntervals(GeomAbs_C3); iNbPoints = 15 + c.NbIntervals(GeomAbs_C3);
Standard_Real dfDelta = (dfUl-dfUf)/(iNbPoints-1); Standard_Real dfDelta = (dfUl-dfUf)/(iNbPoints-1);
Standard_Integer iPoint; Standard_Integer iPoint;
Standard_Real dfU; Standard_Real dfU;
gp_Pnt aPointPrev = c.Value(dfUf), aPointNext; gp_Pnt aPointPrev = c.Value(dfUf), aPointNext;
Standard_Real dfDistPrev = 0., dfDistNext; Standard_Real dfDistPrev = 0., dfDistNext;
for (iPoint=1, dfU=dfUf+dfDelta; for (iPoint=1, dfU=dfUf+dfDelta;
iPoint<=iNbPoints; iPoint<=iNbPoints;
iPoint++, dfU+=dfDelta) iPoint++, dfU+=dfDelta)
{ {
if (iPoint<iNbPoints) if (iPoint<iNbPoints)
{ {
aPointNext = c.Value(dfU); aPointNext = c.Value(dfU);
dfDistNext = aPointPrev.Distance(aPointNext); dfDistNext = aPointPrev.Distance(aPointNext);
} }
else else
dfDistNext = 0.; dfDistNext = 0.;
aPoints.Append (aPointPrev); aPoints.Append (aPointPrev);
aWeight.Append (dfDistPrev+dfDistNext); aWeight.Append (dfDistPrev+dfDistNext);
dfDistPrev = dfDistNext; dfDistPrev = dfDistNext;
aPointPrev = aPointNext; aPointPrev = aPointNext;
} }
} // default: } // default:
} // switch (c.GetType()) ... } // switch (c.GetType()) ...
} // for (ex.Init(S,TopAbs_EDGE); ex.More() && control; ex.Next()) ... } // for (ex.Init(S,TopAbs_EDGE); ex.More() && control; ex.Next()) ...
@ -414,14 +434,14 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
gp_XYZ p=aPoints(iPoint).XYZ()-aBaryCenter; gp_XYZ p=aPoints(iPoint).XYZ()-aBaryCenter;
Standard_Real w=aWeight(iPoint)/dfMaxWeight; Standard_Real w=aWeight(iPoint)/dfMaxWeight;
aMat(1,1)+=w*p.X()*p.X(); aMat(1,1)+=w*p.X()*p.X();
aMat(1,2)+=w*p.X()*p.Y(); aMat(1,2)+=w*p.X()*p.Y();
aMat(1,3)+=w*p.X()*p.Z(); aMat(1,3)+=w*p.X()*p.Z();
aMat(2,1)+=w*p.Y()*p.X(); aMat(2,1)+=w*p.Y()*p.X();
aMat(2,2)+=w*p.Y()*p.Y(); aMat(2,2)+=w*p.Y()*p.Y();
aMat(2,3)+=w*p.Y()*p.Z(); aMat(2,3)+=w*p.Y()*p.Z();
aMat(3,1)+=w*p.Z()*p.X(); aMat(3,1)+=w*p.Z()*p.X();
aMat(3,2)+=w*p.Z()*p.Y(); aMat(3,2)+=w*p.Z()*p.Y();
aMat(3,3)+=w*p.Z()*p.Z(); aMat(3,3)+=w*p.Z()*p.Z();
aVec(1) -= w*p.X(); aVec(1) -= w*p.X();
aVec(2) -= w*p.Y(); aVec(2) -= w*p.Y();
aVec(3) -= w*p.Z(); aVec(3) -= w*p.Z();
@ -450,26 +470,27 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S,
if (!isSolved || myTolerance < dfDist) { if (!isSolved || myTolerance < dfDist) {
gp_Pnt aFirstPnt=aPoints(1); gp_Pnt aFirstPnt=aPoints(1);
for (iPoint=2; iPoint<=aPoints.Length(); iPoint++) { for (iPoint=2; iPoint<=aPoints.Length(); iPoint++) {
gp_Vec aDir(aFirstPnt,aPoints(iPoint)); const gp_Pnt& aNextPnt = aPoints(iPoint);
gp_Vec aDir(aFirstPnt, aNextPnt);
Standard_Real dfSide=aDir.Magnitude(); Standard_Real dfSide=aDir.Magnitude();
if (dfSide<myTolerance) { if (dfSide<myTolerance) {
continue; // degeneration continue; // degeneration
} }
for (Standard_Integer iP1=iPoint+1; iP1<=aPoints.Length(); iP1++) { for (Standard_Integer iP1=iPoint+1; iP1<=aPoints.Length(); iP1++) {
gp_Vec aCross = gp_Vec(aFirstPnt,aPoints(iP1)) ^ aDir ; gp_Vec aCross = gp_Vec(aFirstPnt,aPoints(iP1)) ^ aDir ;
if (aCross.Magnitude() > dfSide*myTolerance) { if (aCross.Magnitude() > dfSide*myTolerance) {
Handle(Geom_Plane) aPlane2 = new Geom_Plane(aFirstPnt, aCross); Handle(Geom_Plane) aPlane2 = new Geom_Plane(aFirstPnt, aCross);
Standard_Real dfDist2 = Controle (aPoints, aPlane2); Standard_Real dfDist2 = Controle (aPoints, aPlane2);
if (dfDist2 < myTolerance) { if (dfDist2 < myTolerance) {
myTolReached = dfDist2; myTolReached = dfDist2;
mySurface = aPlane2; mySurface = aPlane2;
return; return;
} }
if (dfDist2 < dfDist) { if (dfDist2 < dfDist) {
dfDist = dfDist2; dfDist = dfDist2;
aPlane = aPlane2; aPlane = aPlane2;
} }
} }
} }
} }
} }

17
tests/bugs/modalg_5/bug25427 Normal file
View File

@ -0,0 +1,17 @@
puts "========"
puts "OCC25427"
puts "========"
puts ""
###############################################
# Algorithm of building plane from wire hangs
###############################################
smallview
restore [locate_data_file bug25427_w.brep] w
mkplane p w 1
fit
set only_screen_axo 1