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

0026470: BRepFill_Evolved: exception and invalid result

Browse Source 
Test-cases for issue #26470
This commit is contained in:
ifv 2015-10-20 12:18:26 +03:00 committed by bugmaster
parent 98a4340017
commit df573a26ed
6 changed files with 1291 additions and 1227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/BRepFill/BRepFill_ApproxSeewing.cxx
View File

@ -96,6 +96,14 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
MP.SetPoint2d(2, PF1);
MP.SetPoint2d(3, PF2);
MLS.SetValue (1, MP);
#ifdef DUMP_ML
i = 1;
cout << "--Point " << i << endl;
cout << "P3d: " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
#endif
Standard_Real DCorde = Length / ( NbPoints - 1);
Standard_Real Corde = DCorde;
@ -107,6 +115,11 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
U = LP(Index-1).Y() + Alpha * ( LP(Index).Y() - LP(Index-1).Y());
AppDef_MultiPointConstraint MPC( 1, 2);
ML.Value3dOnF1OnF2(U,P3d,PF1,PF2);
#ifdef DUMP_ML
cout << "--Point " << i << endl;
cout << "P3d: " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
#endif
MPC.SetPoint (1, P3d);
MPC.SetPoint2d(2, PF1);
MPC.SetPoint2d(3, PF2);
@ -115,11 +128,17 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
}
AppDef_MultiPointConstraint MPE( 1, 2);
ML.Value3dOnF1OnF2(U2,P3d,PF1,PF2);
#ifdef DUMP_ML
i = NbPoints;
cout << "--Point " << i << endl;
cout << "P3d: " << P3d.X() << " " << P3d.Y() << " " << P3d.Z() << endl;
cout << "P2d1;2: " << PF1.X() << " " << PF1.Y() << " ; " << PF2.X() << " " << PF2.Y() << endl;
#endif
MPE.SetPoint (1, P3d);
MPE.SetPoint2d(2, PF1);
MPE.SetPoint2d(3, PF2);
MLS.SetValue (NbPoints, MPE);
AppDef_Compute Fit(MLS);
Standard_Integer NbCurves = Fit.NbMultiCurves();

1973
src/BRepFill/BRepFill_Evolved.cxx
View File

File diff suppressed because it is too large Load Diff

283
src/BRepFill/BRepFill_MultiLine.cxx
View File

@ -60,7 +60,7 @@ static Standard_Integer NbProj = 1;
//=======================================================================
static Standard_Boolean isIsoU(const TopoDS_Face& Face,
const TopoDS_Edge& Edge )
const TopoDS_Edge& Edge )
{
Handle(Geom2d_Curve) C;
Handle(Geom2d_Line) Li;
@ -70,7 +70,7 @@ static Standard_Boolean isIsoU(const TopoDS_Face& Face,
if ( C.IsNull()) {
Standard_ConstructionError::Raise ("BRepFill_MultiLine : Edge without PCurve");
}
gp_Dir2d D = C->DN(f,1);
if (Abs(D.Dot(gp::DX2d())) < Abs(D.Dot(gp::DY2d())))
@ -98,17 +98,21 @@ BRepFill_MultiLine::BRepFill_MultiLine()
//=======================================================================
BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
const TopoDS_Face& Face2,
const TopoDS_Edge& Edge1,
const TopoDS_Edge& Edge2,
const Standard_Boolean Inv1,
const Standard_Boolean Inv2,
const Handle(Geom2d_Curve)& Bissec)
: myFace1(Face1 ),
const TopoDS_Face& Face2,
const TopoDS_Edge& Edge1,
const TopoDS_Edge& Edge2,
const Standard_Boolean Inv1,
const Standard_Boolean Inv2,
const Handle(Geom2d_Curve)& Bissec)
: myFace1(Face1 ),
myFace2(Face2 ),
myBis (Bissec),
myKPart(0)
{
//
const Standard_Real mult = 5.;
const Standard_Real eps = mult * Precision::Confusion();
//
myNbPnt2d = 2;
myNbPnt = 1;
@ -136,7 +140,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
First = Standard_False;
Umin = Min(P1.X(),P2.X());
Umax = Max(P1.X(),P2.X());
Vmin = Min(P1.Y(),P2.Y());
Vmax = Max(P1.Y(),P2.Y());
}
@ -165,16 +169,16 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
UU1 = S->UIso(Umin);
GeomAdaptor_Curve Dummy(UU1);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU1 = S->UIso(Umax);
Dummy.Circle().Radius() < eps) {
UU1 = S->UIso(Umax);
}
}
else {
UU1 = S->UIso(Umax);
GeomAdaptor_Curve Dummy(UU1);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU1 = S->UIso(Umin);
Dummy.Circle().Radius() < eps) {
UU1 = S->UIso(Umin);
}
}
VV1 = S->VIso(Vmin);
@ -184,16 +188,16 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
UU1 = S->VIso(Vmin);
GeomAdaptor_Curve Dummy(UU1);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU1 = S->VIso(Vmax);
Dummy.Circle().Radius() < eps) {
UU1 = S->VIso(Vmax);
}
}
else {
UU1 = S->VIso(Vmax);
GeomAdaptor_Curve Dummy(UU1);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU1 = S->VIso(Vmin);
Dummy.Circle().Radius() < eps) {
UU1 = S->VIso(Vmin);
}
}
VV1 = S->UIso(Umin);
@ -213,36 +217,36 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
if ( UU1->IsPeriodic()) {
ElCLib::AdjustPeriodic(UU1->FirstParameter(),
UU1->LastParameter(),
Precision::PConfusion(),
Umin, Umax);
UU1->LastParameter(),
Precision::PConfusion(),
Umin, Umax);
}
if ( VV1->IsPeriodic()) {
ElCLib::AdjustPeriodic(VV1->FirstParameter(),
VV1->LastParameter(),
Precision::PConfusion(),
Vmin, Vmax);
VV1->LastParameter(),
Precision::PConfusion(),
Vmin, Vmax);
}
if (GAS1.GetType() == GeomAbs_Sphere) {
if (myIsoU1)
ElCLib::AdjustPeriodic(-M_PI/2.,M_PI/2.,
Precision::PConfusion(),
Umin, Umax);
Precision::PConfusion(),
Umin, Umax);
else
ElCLib::AdjustPeriodic(-M_PI/2.,M_PI/2.,
Precision::PConfusion(),
Vmin, Vmax);
Precision::PConfusion(),
Vmin, Vmax);
}
// end try duplication
myU1 = Geom2dAdaptor_Curve(GeomProjLib::Curve2d(UU1, BasisPlane),
Umin, Umax);
Umin, Umax);
UU1->D1(Umin, P, DZ);
RefPlane = new Geom_Plane(gp_Ax3(P,DZ,gp::DZ()));
myV1 = Geom2dAdaptor_Curve(GeomProjLib::Curve2d(VV1, RefPlane),
Vmin, Vmax);
Vmin, Vmax);
First = Standard_True;
@ -253,7 +257,7 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
First = Standard_False;
Umin = Min(P1.X(),P2.X());
Umax = Max(P1.X(),P2.X());
Vmin = Min(P1.Y(),P2.Y());
Vmax = Max(P1.Y(),P2.Y());
}
@ -281,16 +285,16 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
UU2 = S->UIso(Umin);
GeomAdaptor_Curve Dummy(UU2);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU2 = S->UIso(Umax);
Dummy.Circle().Radius() < eps) {
UU2 = S->UIso(Umax);
}
}
else {
UU2 = S->UIso(Umax);
GeomAdaptor_Curve Dummy(UU2);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU2 = S->UIso(Umin);
Dummy.Circle().Radius() < eps) {
UU2 = S->UIso(Umin);
}
}
VV2 = S->VIso(Vmin);
@ -300,21 +304,21 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
UU2 = S->VIso(Vmin);
GeomAdaptor_Curve Dummy(UU2);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU2 = S->VIso(Vmax);
Dummy.Circle().Radius() < eps) {
UU2 = S->VIso(Vmax);
}
}
else {
UU2 = S->VIso(Vmax);
GeomAdaptor_Curve Dummy(UU2);
if (Dummy.GetType() == GeomAbs_Circle &&
Dummy.Circle().Radius() < Precision::Confusion()) {
UU2 = S->VIso(Vmin);
Dummy.Circle().Radius() < eps) {
UU2 = S->VIso(Vmin);
}
}
VV2 = S->UIso(Umin);
}
if ( myIsoU2) {
Standard_Real dummyUmin = Umin, dummyUmax = Umax;
Umin = Vmin;
@ -329,35 +333,35 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
if ( UU2->IsPeriodic()) {
ElCLib::AdjustPeriodic(UU2->FirstParameter(),
UU2->LastParameter(),
Precision::PConfusion(),
Umin, Umax);
UU2->LastParameter(),
Precision::PConfusion(),
Umin, Umax);
}
if ( VV2->IsPeriodic()) {
ElCLib::AdjustPeriodic(VV2->FirstParameter(),
VV2->LastParameter(),
Precision::PConfusion(),
Vmin, Vmax);
VV2->LastParameter(),
Precision::PConfusion(),
Vmin, Vmax);
}
if (GAS2.GetType() == GeomAbs_Sphere) {
if (myIsoU2)
ElCLib::AdjustPeriodic(-M_PI/2.,M_PI/2.,
Precision::PConfusion(),
Umin, Umax);
Precision::PConfusion(),
Umin, Umax);
else
ElCLib::AdjustPeriodic(-M_PI/2.,M_PI/2.,
Precision::PConfusion(),
Vmin, Vmax);
Precision::PConfusion(),
Vmin, Vmax);
}
// end try duplication
myU2 = Geom2dAdaptor_Curve(GeomProjLib::Curve2d(UU2, BasisPlane),
Umin, Umax);
Umin, Umax);
UU2->D1(Umin, P, DZ);
RefPlane = new Geom_Plane(gp_Ax3(P,DZ,gp::DZ()));
myV2 = Geom2dAdaptor_Curve(GeomProjLib::Curve2d(VV2, RefPlane),
Vmin, Vmax);
Vmin, Vmax);
// eval if in a particular case.
// Particular case if :
@ -373,14 +377,14 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
gp_Pnt2d aPnt1 = ValueOnF1(myBis.FirstParameter() + 0.1*DeltaU);
gp_Pnt2d aPnt2 = ValueOnF1(myBis.FirstParameter() + 0.9*DeltaU);
if ( myIsoU1) {
if ( Abs(aPnt1.Y() - aPnt2.Y()) < Precision::Confusion())
myKPart = 1;
if ( Abs(aPnt1.Y() - aPnt2.Y()) < eps)
myKPart = 1;
}
else {
if ( Abs(aPnt1.X() - aPnt2.X()) < Precision::Confusion())
myKPart = 1;
if ( Abs(aPnt1.X() - aPnt2.X()) < eps)
myKPart = 1;
}
if ( myKPart == 1)
myCont = GeomAbs_G1;
@ -408,8 +412,8 @@ Standard_Boolean BRepFill_MultiLine::IsParticularCase() const
//=======================================================================
void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
Handle(Geom2d_Curve)& PCurve1,
Handle(Geom2d_Curve)& PCurve2) const
Handle(Geom2d_Curve)& PCurve1,
Handle(Geom2d_Curve)& PCurve2) const
{
if ( myKPart == 1) {
gp_Pnt2d P1,P2,PMil;
@ -422,73 +426,73 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
// the ends can be degenerated points.
PMil = ValueOnF1(0.5*(myBis.FirstParameter() + myBis.LastParameter()));
TopLoc_Location L;
Handle(Geom_Surface) S = BRep_Tool::Surface(myFace1,L);
if (!L.IsIdentity())
S = Handle(Geom_Surface)::DownCast(S->Transformed(L.Transformation()));
Standard_Boolean Sens;
if ( !myIsoU1) {
Curve = S->UIso(PMil.X());
Sens = P1.Y() < P2.Y();
if ( Sens)
Curve = new Geom_TrimmedCurve(Curve, P1.Y(), P2.Y(), Sens);
Curve = new Geom_TrimmedCurve(Curve, P1.Y(), P2.Y(), Sens);
else
Curve = new Geom_TrimmedCurve(Curve, P2.Y(), P1.Y(), Sens);
Curve = new Geom_TrimmedCurve(Curve, P2.Y(), P1.Y(), Sens);
f = Curve->FirstParameter();
l = Curve->LastParameter();
if ( Sens)
PCurve1 = new Geom2d_Line(gp_Pnt2d(PMil.X(),P1.Y() - f), gp::DY2d());
PCurve1 = new Geom2d_Line(gp_Pnt2d(PMil.X(),P1.Y() - f), gp::DY2d());
else
PCurve1 = new Geom2d_Line(gp_Pnt2d(PMil.X(),P1.Y() + f),-gp::DY2d());
PCurve1 = new Geom2d_Line(gp_Pnt2d(PMil.X(),P1.Y() + f),-gp::DY2d());
PCurve1 = new Geom2d_TrimmedCurve( PCurve1 ,f ,l);
}
else {
Curve = S->VIso(PMil.Y());
Sens = P1.X() < P2.X();
if (Sens)
Curve = new Geom_TrimmedCurve(Curve, P1.X(), P2.X(), Sens);
Curve = new Geom_TrimmedCurve(Curve, P1.X(), P2.X(), Sens);
else
Curve = new Geom_TrimmedCurve(Curve, P2.X(), P1.X(), Sens);
Curve = new Geom_TrimmedCurve(Curve, P2.X(), P1.X(), Sens);
f = Curve->FirstParameter();
l = Curve->LastParameter();
if ( Sens)
PCurve1 = new Geom2d_Line(gp_Pnt2d(P1.X() - f,PMil.Y()), gp::DX2d());
PCurve1 = new Geom2d_Line(gp_Pnt2d(P1.X() - f,PMil.Y()), gp::DX2d());
else
PCurve1 = new Geom2d_Line(gp_Pnt2d(P1.X() + f,PMil.Y()), -gp::DX2d());
PCurve1 = new Geom2d_Line(gp_Pnt2d(P1.X() + f,PMil.Y()), -gp::DX2d());
PCurve1 = new Geom2d_TrimmedCurve( PCurve1 ,f ,l);
}
P1 = ValueOnF2(myBis.FirstParameter());
P2 = ValueOnF2(myBis.LastParameter());
PMil = ValueOnF2(0.5*(myBis.FirstParameter() + myBis.LastParameter()));
if (!myIsoU2) {
Sens = P1.Y() < P2.Y();
if ( Sens)
PCurve2 = new Geom2d_Line(gp_Pnt2d(PMil.X(),(P1.Y() - f)), gp::DY2d());
PCurve2 = new Geom2d_Line(gp_Pnt2d(PMil.X(),(P1.Y() - f)), gp::DY2d());
else
PCurve2 = new Geom2d_Line(gp_Pnt2d(PMil.X(),(P1.Y() + f)), -gp::DY2d());
PCurve2 = new Geom2d_Line(gp_Pnt2d(PMil.X(),(P1.Y() + f)), -gp::DY2d());
}
else {
Sens = P1.X() < P2.X();
if ( Sens)
PCurve2 = new Geom2d_Line(gp_Pnt2d(P1.X() - f ,PMil.Y()), gp::DX2d());
PCurve2 = new Geom2d_Line(gp_Pnt2d(P1.X() - f ,PMil.Y()), gp::DX2d());
else
PCurve2 = new Geom2d_Line(gp_Pnt2d(P1.X() + f ,PMil.Y()), -gp::DX2d());
PCurve2 = new Geom2d_Line(gp_Pnt2d(P1.X() + f ,PMil.Y()), -gp::DX2d());
}
PCurve2 = new Geom2d_TrimmedCurve( PCurve2 ,f ,l);
}
else if ( myKPart == 2) {
TopLoc_Location L;
Handle(Geom_Surface) S = BRep_Tool::Surface(myFace1,L);
if (!L.IsIdentity())
S = Handle(Geom_Surface)::DownCast(S->Transformed(L.Transformation()));
if (S->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface)))
S = Handle(Geom_RectangularTrimmedSurface)::DownCast(S)->BasisSurface();
@ -497,12 +501,12 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
gp_Pnt2d P = myBis.Line().Location();
gp_Dir2d D = myBis.Line().Direction();
Handle(Geom_Line) Line = new Geom_Line(gp_Pnt(P.X(),P.Y(),0.),
gp_Dir(D.X(),D.Y(),0.) );
gp_Dir(D.X(),D.Y(),0.) );
Handle(Geom_TrimmedCurve) TLine =
new Geom_TrimmedCurve(Line, myBis.FirstParameter(),
myBis.LastParameter());
myBis.LastParameter());
Curve = GeomProjLib::ProjectOnPlane(TLine, Plane,
gp::DZ(), Standard_False);
gp::DZ(), Standard_False);
#ifdef DRAW
if ( AffichCurve) {
@ -519,7 +523,7 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
// eval PCurve1
PCurve1 = GeomProjLib::Curve2d(Curve,Plane);
// eval PCurve2
S = BRep_Tool::Surface(myFace2,L);
if (!L.IsIdentity())
@ -581,27 +585,30 @@ gp_Pnt BRepFill_MultiLine::Value(const Standard_Real U) const
//=======================================================================
static gp_Pnt2d ValueOnFace(const Standard_Real U,
const Geom2dAdaptor_Curve& TheBis,
const Geom2dAdaptor_Curve& TheU,
const Geom2dAdaptor_Curve& TheV,
const Standard_Boolean IsIsoU)
const Geom2dAdaptor_Curve& TheBis,
const Geom2dAdaptor_Curve& TheU,
const Geom2dAdaptor_Curve& TheV,
const Standard_Boolean IsIsoU)
{
gp_Pnt2d P = TheBis.Value(U);
Geom2dAPI_ProjectPointOnCurve Ext(P,TheU.Curve(),
TheU.FirstParameter(),
TheU.LastParameter());
TheU.FirstParameter(),
TheU.LastParameter());
#ifdef DRAW
if (AffichCurve) {
char* TheUname = "TheU";
char* PP1name = "PP1";
DrawTrSurf::Set(TheUname,TheU.Curve());
DrawTrSurf::Set(PP1name,P);
// DrawTrSurf::Set("TheU",TheU.Curve());
// DrawTrSurf::Set("PP1",P);
// DrawTrSurf::Set("TheU",TheU.Curve());
// DrawTrSurf::Set("PP1",P);
}
#endif
//
const Standard_Real mult = 5.;
const Standard_Real eps = mult * Precision::Confusion();
//
Standard_Real UU =0., Dist = Precision::Infinite(), D1, D2;
if ( Ext.NbPoints() != 0 ) {
@ -612,23 +619,23 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
D1 = P.Distance(TheU.Value(TheU.FirstParameter()));
D2 = P.Distance(TheU.Value(TheU.LastParameter()));
if (D1 < Dist || D2 < Dist) {
if ( Abs( D1 - D2) < Precision::Confusion()) {
if (D1 < Dist || D2 < Dist || Abs(D1 - Dist) < eps || Abs(D2 - Dist) < eps) {
if ( Abs( D1 - D2) < eps) {
if ( TheU.GetType() == GeomAbs_Circle) {
gp_Vec2d Axis = TheU.Circle().XAxis().Direction();
gp_Vec2d D12d = TheBis.DN(TheBis.FirstParameter(),1);
Standard_Real Ang = Axis.Angle(D12d);
if ( !TheU.Circle().IsDirect()) Ang = -Ang;
UU = ElCLib::InPeriod( Ang, TheU.FirstParameter(),
TheU.FirstParameter() + 2*M_PI);
Dist = TheU.Circle().Radius();
gp_Vec2d Axis = TheU.Circle().XAxis().Direction();
gp_Vec2d D12d = TheBis.DN(TheBis.FirstParameter(),1);
Standard_Real Ang = Axis.Angle(D12d);
if ( !TheU.Circle().IsDirect()) Ang = -Ang;
UU = ElCLib::InPeriod( Ang, TheU.FirstParameter(),
TheU.FirstParameter() + 2*M_PI);
Dist = TheU.Circle().Radius();
}
else {
#ifdef OCCT_DEBUG
cout << "MultiLine : D1 = D2 and the Curve is not a circle" << endl;
cout << " ---> ValueOnFace failed at parameter U = " << U << endl;
cout << "MultiLine : D1 = D2 and the Curve is not a circle" << endl;
cout << " ---> ValueOnFace failed at parameter U = " << U << endl;
#endif
Standard_ConstructionError::Raise("BRepFill_MultiLine: ValueOnFace");
Standard_ConstructionError::Raise("BRepFill_MultiLine: ValueOnFace");
}
}
else if ( D1 < D2) {
@ -641,12 +648,12 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
}
}
Standard_Real Tol = Precision::Confusion();
const Standard_Real Tol = Precision::Confusion();
Standard_Real VV;
gp_Pnt2d PF = TheV.Value(TheV.FirstParameter());
gp_Pnt2d PL = TheV.Value(TheV.LastParameter());
if (Abs(Dist - Abs(PF.Y())) < Tol) {
VV = TheV.FirstParameter();
}
@ -656,10 +663,10 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
else {
// test if the curve is at the side `negative Y`.
if ( Min( PF.Y(),PL.Y()) < -Tol) Dist = -Dist;
Handle(Geom2d_Line) Line
= new Geom2d_Line(gp_Pnt2d(0., Dist), gp::DX2d());
#ifdef DRAW
if (AffichCurve) {
static Standard_CString aTheV = "TheV" ;
@ -668,10 +675,10 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
DrawTrSurf::Set(aLINF1,Line);
}
#endif
Geom2dAdaptor_Curve Cu1 = TheV;
Geom2dAdaptor_Curve Cu2( Line);
Standard_Real TolConf = 0.;
Geom2dInt_GInter Intersector(Cu1,Cu2,TolConf,Tol);
@ -685,26 +692,26 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
}
else {
if ( Intersector.NbPoints() > 0) {
VV = Intersector.Point(1).ParamOnFirst();
VV = Intersector.Point(1).ParamOnFirst();
}
else if ( Intersector.NbSegments() > 0) {
IntRes2d_IntersectionSegment Seg = Intersector.Segment(1);
Standard_Real VS1 = Seg.FirstPoint().ParamOnFirst();
Standard_Real VS2 = Seg.LastPoint().ParamOnFirst();
gp_Pnt2d PS1 = TheV.Value(VS1);
gp_Pnt2d PS2 = TheV.Value(VS2);
Standard_Real Alp = (Dist - PS1.Y())/(PS2.Y() - PS1.Y());
VV = Alp*(VS2 - VS1) + VS1;
IntRes2d_IntersectionSegment Seg = Intersector.Segment(1);
Standard_Real VS1 = Seg.FirstPoint().ParamOnFirst();
Standard_Real VS2 = Seg.LastPoint().ParamOnFirst();
gp_Pnt2d PS1 = TheV.Value(VS1);
gp_Pnt2d PS2 = TheV.Value(VS2);
Standard_Real Alp = (Dist - PS1.Y())/(PS2.Y() - PS1.Y());
VV = Alp*(VS2 - VS1) + VS1;
}
else {
#ifdef OCCT_DEBUG
cout << "Intersector done, but no points found" << endl;
cout << " ---> ValueonFace failed at parameter U = " << U << endl;
cout << "Intersector done, but no points found" << endl;
cout << " ---> ValueonFace failed at parameter U = " << U << endl;
#endif
if (Abs(Dist - PL.Y()) < Abs(Dist - PF.Y()))
VV = TheV.LastParameter();
else
VV = TheV.FirstParameter();
if (Abs(Dist - PL.Y()) < Abs(Dist - PF.Y()))
VV = TheV.LastParameter();
else
VV = TheV.FirstParameter();
}
}
}
@ -742,10 +749,10 @@ gp_Pnt2d BRepFill_MultiLine::ValueOnF2(const Standard_Real U) const
//=======================================================================
void BRepFill_MultiLine::Value3dOnF1OnF2(const Standard_Real U,
gp_Pnt& P3d,
gp_Pnt2d& PF1,
gp_Pnt2d& PF2)
const
gp_Pnt& P3d,
gp_Pnt2d& PF1,
gp_Pnt2d& PF2)
const
{
PF1 = ValueOnFace(U,myBis,myU1,myV1,myIsoU1);
PF2 = ValueOnFace(U,myBis,myU2,myV2,myIsoU2);
@ -774,14 +781,14 @@ GeomAbs_Shape BRepFill_MultiLine::Continuity() const
//=======================================================================
Standard_Boolean BRepFill_MultiLine::Value(const Standard_Real theT,
NCollection_Array1<gp_Pnt2d>& thePnt2d,
NCollection_Array1<gp_Pnt>& thePnt) const
{
thePnt(1) = Value(theT);
thePnt2d(1) = ValueOnF1(theT);
thePnt2d(2) = ValueOnF2(theT);
return Standard_True;
}
NCollection_Array1<gp_Pnt2d>& thePnt2d,
NCollection_Array1<gp_Pnt>& thePnt) const
{
thePnt(1) = Value(theT);
thePnt2d(1) = ValueOnF1(theT);
thePnt2d(2) = ValueOnF2(theT);
return Standard_True;
}
//=======================================================================
//function : Value
@ -789,8 +796,8 @@ Standard_Boolean BRepFill_MultiLine::Value(const Standard_Real theT,
//=======================================================================
Standard_Boolean BRepFill_MultiLine::D1(const Standard_Real /*theT*/,
NCollection_Array1<gp_Vec2d>& /*theVec2d*/,
NCollection_Array1<gp_Vec>& /*theVec*/) const
NCollection_Array1<gp_Vec2d>& /*theVec2d*/,
NCollection_Array1<gp_Vec>& /*theVec*/) const
{
return Standard_False;
}

218
src/BRepFill/BRepFill_TrimSurfaceTool.cxx
View File

@ -63,6 +63,7 @@
#include <TopoDS_Face.hxx>
#include <TopoDS_Vertex.hxx>
//#define DRAW
#include <stdio.h>
#ifdef DRAW
#include <DrawTrSurf.hxx>
@ -70,7 +71,7 @@
#endif
#ifdef OCCT_DEBUG
static Standard_Boolean Affich = Standard_False;
static Standard_Integer NBCALL = 1;
static Standard_Integer NBCALL = 0;
#endif
//=======================================================================
@ -84,44 +85,43 @@ static Standard_Integer NBCALL = 1;
//=======================================================================
BRepFill_TrimSurfaceTool::BRepFill_TrimSurfaceTool
(const Handle(Geom2d_Curve)& Bis,
const TopoDS_Face& Face1,
const TopoDS_Face& Face2,
const TopoDS_Edge& Edge1,
const TopoDS_Edge& Edge2,
const Standard_Boolean Inv1,
const Standard_Boolean Inv2 ) :
(const Handle(Geom2d_Curve)& Bis,
const TopoDS_Face& Face1,
const TopoDS_Face& Face2,
const TopoDS_Edge& Edge1,
const TopoDS_Edge& Edge2,
const Standard_Boolean Inv1,
const Standard_Boolean Inv2 ) :
myFace1(Face1),
myFace2(Face2),
myEdge1(Edge1),
myEdge2(Edge2),
myInv1(Inv1),
myInv2(Inv2),
myBis (Bis)
myFace2(Face2),
myEdge1(Edge1),
myEdge2(Edge2),
myInv1(Inv1),
myInv2(Inv2),
myBis (Bis)
{
#ifdef OCCT_DEBUG
if ( Affich) {
NBCALL++;
cout << " ---------->TrimSurfaceTool : NBCALL = " << NBCALL << endl;
#ifdef DRAW
char name[256];
sprintf(name,"FACE1_%d",NBCALL);
DBRep::Set(name,myFace1);
sprintf(name,"FACE2_%d",NBCALL);
DBRep::Set(name,myFace2);
sprintf(name,"EDGE1_%d",NBCALL);
DBRep::Set(name,myEdge1);
sprintf(name,"EDGE2_%d",NBCALL);
DBRep::Set(name,myEdge2);
sprintf(name,"BISSEC_%d",NBCALL);
DrawTrSurf::Set(name,myBis);
#endif
NBCALL++;
}
#endif
}
@ -142,8 +142,8 @@ static void Bubble(TColgp_SequenceOfPnt& Seq)
gp_Pnt P1 = Seq.Value(i);
gp_Pnt P2 = Seq.Value(i+1);
if (P2.X()<P1.X()) {
Seq.Exchange(i,i+1);
Invert = Standard_True;
Seq.Exchange(i,i+1);
Invert = Standard_True;
}
}
}
@ -156,9 +156,9 @@ static void Bubble(TColgp_SequenceOfPnt& Seq)
//=======================================================================
static Standard_Real EvalPhase(const TopoDS_Edge& Edge,
const TopoDS_Face& Face,
const GeomAdaptor_Surface& GAS,
const gp_Ax3& Axis)
const TopoDS_Face& Face,
const GeomAdaptor_Surface& GAS,
const gp_Ax3& Axis)
{
gp_Pnt2d PE1,PE2,PF1,PF2;
Standard_Real VDeg;
@ -174,7 +174,7 @@ static Standard_Real EvalPhase(const TopoDS_Edge& Edge,
}
}
gp_Pnt P = GAS.Value(0., V);
if ( gp_Vec(Axis.Location(), P).Dot(Axis.XDirection()) < 0.)
return M_PI;
else
@ -188,9 +188,9 @@ static Standard_Real EvalPhase(const TopoDS_Edge& Edge,
//=======================================================================
static void EvalParameters(const TopoDS_Edge& Edge,
const TopoDS_Face& Face,
const Handle(Geom2d_Curve)& Bis ,
TColgp_SequenceOfPnt& Seq )
const TopoDS_Face& Face,
const Handle(Geom2d_Curve)& Bis ,
TColgp_SequenceOfPnt& Seq )
{
Standard_Boolean Degener = BRep_Tool::Degenerated(Edge);
// return curves 3d associated to edges.
@ -206,11 +206,11 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Standard_Real U1, U2;
gp_Pnt P;//,PSeq;
// Standard_Real Tol = Precision::Intersection();
// Standard_Real Tol = Precision::Intersection();
// modified by NIZHNY-EAP Wed Dec 22 15:00:51 1999 ___BEGIN___
Standard_Real Tol = 1.e-6; // BRepFill_Precision();
Standard_Real TolC = 0.;
if ( !Degener) {
Handle(Geom_Curve) C = BRep_Tool::Curve(Edge,L,f,l);
CT = new Geom_TrimmedCurve(C,f,l);
@ -222,19 +222,19 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Geom2dAdaptor_Curve ABis(Bis);
Intersector = Geom2dInt_GInter(ABis, AC, TolC, Tol);
if ( !Intersector.IsDone()) {
StdFail_NotDone::Raise("BRepFill_TrimSurfaceTool::IntersectWith");
}
NbPoints = Intersector.NbPoints();
if (NbPoints < 1) {
// try to elongate curves and enlarge tolerance
// don't do it rightaway from the beginning in order not to get
// extra solutions those would cause *Exception*: incoherent intersection
GeomAbs_CurveType CType = AC.GetType(), BisType = ABis.GetType();
Standard_Boolean canElongateC = !(CType == GeomAbs_BezierCurve ||
CType == GeomAbs_BSplineCurve ||
@ -247,70 +247,70 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Handle(Geom2d_TrimmedCurve) TBis = Handle(Geom2d_TrimmedCurve)::DownCast(Bis);
Handle(Geom2d_TrimmedCurve) TC2d = Handle(Geom2d_TrimmedCurve)::DownCast(C2d);
if (canElongateC) {
TC2d->SetTrim(TC2d->FirstParameter() - Tol, TC2d->LastParameter() + Tol);
AC.Load(TC2d);
TC2d->SetTrim(TC2d->FirstParameter() - Tol, TC2d->LastParameter() + Tol);
AC.Load(TC2d);
}
if (canElongateBis) {
TBis->SetTrim(TBis->FirstParameter() - Tol, TBis->LastParameter() + Tol);
ABis.Load(TBis);
TBis->SetTrim(TBis->FirstParameter() - Tol, TBis->LastParameter() + Tol);
ABis.Load(TBis);
}
Intersector = Geom2dInt_GInter(ABis, AC, TolC, Tol*10);
if ( !Intersector.IsDone()) {
StdFail_NotDone::Raise("BRepFill_TrimSurfaceTool::IntersectWith");
}
StdFail_NotDone::Raise("BRepFill_TrimSurfaceTool::IntersectWith");
}
NbPoints = Intersector.NbPoints();
}
// modified by NIZHNY-EAP Wed Dec 22 15:00:56 1999 ___END___
if (NbPoints > 0) {
for ( Standard_Integer i = 1; i <= NbPoints; i++) {
U1 = Intersector.Point(i).ParamOnFirst();
U2 = Intersector.Point(i).ParamOnSecond();
P = gp_Pnt(U1,U2,0.);
Seq.Append(P);
U1 = Intersector.Point(i).ParamOnFirst();
U2 = Intersector.Point(i).ParamOnSecond();
P = gp_Pnt(U1,U2,0.);
Seq.Append(P);
}
}
NbSegments = Intersector.NbSegments();
if (NbSegments > 0) {
#ifdef OCCT_DEBUG
cout << " IntersectWith : " << NbSegments
<< " Segments of intersection" << endl;
<< " Segments of intersection" << endl;
#endif
IntRes2d_IntersectionSegment Seg;
for ( Standard_Integer i = 1; i <= NbSegments; i++) {
Seg = Intersector.Segment(i);
U1 = Seg.FirstPoint().ParamOnFirst();
U1 += Seg.LastPoint().ParamOnFirst();
U1 /= 2.;
U2 = Seg.FirstPoint().ParamOnSecond();
U2 += Seg.LastPoint().ParamOnSecond();
U2 /= 2.;
P = gp_Pnt(U1,U2,0.);
Seq.Append(P);
Seg = Intersector.Segment(i);
U1 = Seg.FirstPoint().ParamOnFirst();
U1 += Seg.LastPoint().ParamOnFirst();
U1 /= 2.;
U2 = Seg.FirstPoint().ParamOnSecond();
U2 += Seg.LastPoint().ParamOnSecond();
U2 /= 2.;
P = gp_Pnt(U1,U2,0.);
Seq.Append(P);
}
}
// Order the sequence by increasing parameter on the bissectrice.
Bubble( Seq);
// modified by NIZHNY-EAP Fri Dec 24 18:47:24 1999 ___BEGIN___
// modified by NIZHNY-EAP Fri Dec 24 18:47:24 1999 ___BEGIN___
// Remove double points
gp_Pnt P1, P2;
for ( Standard_Integer i = 1; i < NbPoints; i++) {
P1 = Seq.Value(i);
P2 = Seq.Value(i+1);
if ( P2.X()-P1.X() < Tol ) {
// cout<<"REMOVE "<<P1.X()<<endl;
Seq.Remove(i--);
NbPoints--;
// cout<<"REMOVE "<<P1.X()<<endl;
Seq.Remove(i--);
NbPoints--;
}
}
// modified by NIZHNY-EAP Fri Dec 24 18:47:28 1999 ___END___
// modified by NIZHNY-EAP Fri Dec 24 18:47:28 1999 ___END___
}
else {
// the edge is degenerated : the point and it is found if it is
@ -321,20 +321,20 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Standard_Real UBis = Bis->FirstParameter();
gp_Pnt2d PBis = Bis->Value( UBis);
// modified by NIZHNY-EAP Wed Jan 12 11:41:30 2000 ___BEGIN___
// modified by NIZHNY-EAP Wed Jan 12 11:41:30 2000 ___BEGIN___
// inside gp_Pnt2d::Distance
// Infinite * Infinite => Exception: DefaultNumericError
// Case encounered: UBis < Precision::Infinite()
// but PBis.X() > Precision::Infinite()
if (Precision::IsPositiveInfinite(Abs(PBis.X())) ||
Precision::IsPositiveInfinite(Abs(PBis.Y())) ||
PBis.Distance(P2d) > Tol) {
// modified by NIZHNY-EAP Wed Jan 12 11:41:40 2000 ___END___
UBis = Bis->LastParameter();
if (UBis >= Precision::Infinite()) return;
PBis = Bis->Value( UBis);
if ( PBis.Distance(P2d) > Tol) return;
Precision::IsPositiveInfinite(Abs(PBis.Y())) ||
PBis.Distance(P2d) > Tol) {
// modified by NIZHNY-EAP Wed Jan 12 11:41:40 2000 ___END___
UBis = Bis->LastParameter();
if (UBis >= Precision::Infinite()) return;
PBis = Bis->Value( UBis);
if ( PBis.Distance(P2d) > Tol) return;
}
// evaluate parameter intersection.
@ -345,7 +345,7 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Standard_Real Phase = 0.;
switch ( GAS.GetType()) {
case GeomAbs_Sphere:
Axis = GAS.Sphere().Position(); break;
case GeomAbs_Cone: {
@ -356,7 +356,7 @@ static void EvalParameters(const TopoDS_Edge& Edge,
Axis = GAS.Cone().Position();
Phase = EvalPhase(Edge,Face,GAS,Axis);
break;
}
}
case GeomAbs_Torus:
Axis = GAS.Torus().Position(); break;
case GeomAbs_Cylinder:
@ -367,21 +367,21 @@ static void EvalParameters(const TopoDS_Edge& Edge,
// of parameter 0 0 on the cone => phase = M_PI.
//----------------------------------------------------------
Handle(Geom_SurfaceOfRevolution) GSRev =
Handle(Geom_SurfaceOfRevolution)::DownCast(GS);
Handle(Geom_SurfaceOfRevolution)::DownCast(GS);
Handle(GeomAdaptor_HCurve) HC =
new GeomAdaptor_HCurve(GSRev->BasisCurve());
new GeomAdaptor_HCurve(GSRev->BasisCurve());
Adaptor3d_SurfaceOfRevolution ASRev(HC,GAS.AxeOfRevolution());
Axis = ASRev.Axis();
Phase = EvalPhase(Edge,Face,GAS,Axis);
break;
}
}
default:
Standard_NotImplemented::Raise(" BRepFill_TrimSurfaceTool");
}
gp_Vec2d D12d = Bis->DN(UBis,1);
gp_Vec D1( D12d.X(), D12d.Y(), 0.);
Standard_Real U = Axis.XDirection().
AngleWithRef(D1,Axis.XDirection()^Axis.YDirection());
U += Phase;
@ -399,11 +399,23 @@ static void EvalParameters(const TopoDS_Edge& Edge,
//=======================================================================
void BRepFill_TrimSurfaceTool::IntersectWith
(const TopoDS_Edge& EdgeOnF1,
const TopoDS_Edge& EdgeOnF2,
TColgp_SequenceOfPnt& Points )
const
(const TopoDS_Edge& EdgeOnF1,
const TopoDS_Edge& EdgeOnF2,
TColgp_SequenceOfPnt& Points )
const
{
#ifdef DRAW
if ( Affich) {
char name[256];
Standard_Integer i1 = 0, i2 = 2;
sprintf(name,"EdgeOnF1_%d_%d",i1, NBCALL);
DBRep::Set(name,EdgeOnF1);
sprintf(name,"EdgeOnF2_%d_%d",i2, NBCALL);
DBRep::Set(name,EdgeOnF2);
}
#endif
Points.Clear();
TColgp_SequenceOfPnt Points2;
@ -412,7 +424,7 @@ const
StdFail_NotDone_Raise_if
( Points.Length() != Points2.Length(),
"BRepFill_TrimSurfaceTool::IntersectWith: incoherent intersection");
"BRepFill_TrimSurfaceTool::IntersectWith: incoherent intersection");
gp_Pnt PSeq;
Standard_Integer NbPoints = Points.Length();
@ -420,7 +432,7 @@ const
PSeq = Points(i);
PSeq.SetZ((Points2.Value(i)).Y());
Points.SetValue(i,PSeq);
// cout<<"BisPar "<<PSeq.X()<<endl;
// cout<<"BisPar "<<PSeq.X()<<endl;
}
}
@ -431,7 +443,7 @@ const
//=======================================================================
Standard_Boolean BRepFill_TrimSurfaceTool::IsOnFace
(const gp_Pnt2d& Point) const
(const gp_Pnt2d& Point) const
{
gp_Pnt P( Point.X(), Point.Y(), 0.);
gp_Lin Line( P, gp::DZ());
@ -439,14 +451,14 @@ Standard_Boolean BRepFill_TrimSurfaceTool::IsOnFace
BRepIntCurveSurface_Inter Inter;
// eval if is on face 1
// modified by NIZHNY-EAP Fri Jan 21 09:49:09 2000 ___BEGIN___
// modified by NIZHNY-EAP Fri Jan 21 09:49:09 2000 ___BEGIN___
Inter.Init(myFace1, Line,1e-6);//Precision::PConfusion());
if (Inter.More()) return Standard_True;
// eval if is on face 2
Inter.Init(myFace2, Line, 1e-6);//Precision::PConfusion());
return Inter.More();
// modified by NIZHNY-EAP Fri Jan 21 09:49:14 2000 ___END___
// modified by NIZHNY-EAP Fri Jan 21 09:49:14 2000 ___END___
}
@ -456,17 +468,17 @@ Standard_Boolean BRepFill_TrimSurfaceTool::IsOnFace
//=======================================================================
Standard_Real BRepFill_TrimSurfaceTool::ProjOn(const gp_Pnt2d& Point,
const TopoDS_Edge& Edge) const
const TopoDS_Edge& Edge) const
{
TopLoc_Location L;
Standard_Real f,l;
Handle(Geom_Curve) C1 = BRep_Tool::Curve(Edge,L,f,l);
Handle(Geom_TrimmedCurve) CT = new Geom_TrimmedCurve(C1,f,l);
CT->Transform(L.Transformation());
// projection of curves 3d in the plane xOy
Handle(Geom_Plane) Plane = new Geom_Plane(0,0,1,0);
Handle(Geom2d_Curve) C2d = GeomProjLib::Curve2d(CT,Plane);
@ -493,18 +505,18 @@ Standard_Real BRepFill_TrimSurfaceTool::ProjOn(const gp_Pnt2d& Point,
//=======================================================================
void BRepFill_TrimSurfaceTool::Project
(const Standard_Real U1,
const Standard_Real U2,
Handle(Geom_Curve)& Curve,
Handle(Geom2d_Curve)& PCurve1,
Handle(Geom2d_Curve)& PCurve2,
GeomAbs_Shape& Cont) const
(const Standard_Real U1,
const Standard_Real U2,
Handle(Geom_Curve)& Curve,
Handle(Geom2d_Curve)& PCurve1,
Handle(Geom2d_Curve)& PCurve2,
GeomAbs_Shape& Cont) const
{
Handle(Geom2d_TrimmedCurve) CT =
new Geom2d_TrimmedCurve(myBis,U1,U2);
BRepFill_MultiLine ML(myFace1,myFace2,
myEdge1,myEdge2,myInv1,myInv2,CT);
myEdge1,myEdge2,myInv1,myInv2,CT);
Cont = ML.Continuity();
if ( ML.IsParticularCase()) {

11
tests/bugs/modalg_6/bug26470_1 Normal file
View File

@ -0,0 +1,11 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof1.brep] b
evolved res a b o

12
tests/bugs/modalg_6/bug26470_2 Normal file
View File

@ -0,0 +1,12 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof2.brep] b
evolved res a b o
checkshape res