OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0027679: Wrong offset: overlapping edges, regression comparing with OCCT670

Browse Source
This commit is contained in:
ifv
2016-07-15 10:14:09 +03:00
parent 5c64b759be
commit 67b1b0e720
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@@ -1934,6 +1934,14 @@ void UpdateDetromp (TopTools_ListOfShape& Detromp1,
TopoDS_Vertex V1,V2; TopoDS_Vertex V1,V2;
Handle(Geom2d_Curve) Bis = Bisec.Value(); Handle(Geom2d_Curve) Bis = Bisec.Value();
Standard_Boolean ForceAdd = Standard_False;
Handle(Geom2d_TrimmedCurve) aTC = Handle(Geom2d_TrimmedCurve)::DownCast(Bis);
if(!aTC.IsNull() && aTC->BasisCurve()->IsPeriodic())
{
gp_Pnt2d Pf = Bis->Value(Bis->FirstParameter());
gp_Pnt2d Pl = Bis->Value(Bis->LastParameter());
ForceAdd = Pf.Distance(Pl) <= Precision::Confusion();
}
U1 = Bis->FirstParameter(); U1 = Bis->FirstParameter();
@@ -1948,7 +1956,7 @@ void UpdateDetromp (TopTools_ListOfShape& Detromp1,
V2 = TopoDS::Vertex(Vertices.Value(ii)); V2 = TopoDS::Vertex(Vertices.Value(ii));
gp_Pnt2d P = Bis->Value((U2 + U1)*0.5); gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
if (!Trim.IsInside(P)) { if (!Trim.IsInside(P) || ForceAdd) {
if (!V1.IsNull()) { if (!V1.IsNull()) {
Detromp1.Append(V1); Detromp1.Append(V1);
Detromp2.Append(V1); Detromp2.Append(V1);
@@ -1966,7 +1974,7 @@ void UpdateDetromp (TopTools_ListOfShape& Detromp1,
if (!EOnE) { if (!EOnE) {
if (!Precision::IsInfinite(U2)) { if (!Precision::IsInfinite(U2)) {
gp_Pnt2d P = Bis->Value((U2 + U1)*0.5); gp_Pnt2d P = Bis->Value((U2 + U1)*0.5);
if (!Trim.IsInside(P)) { if (!Trim.IsInside(P) || ForceAdd) {
if (!V1.IsNull()) { if (!V1.IsNull()) {
Detromp1.Append(V1); Detromp1.Append(V1);
Detromp2.Append(V1); Detromp2.Append(V1);
@@ -2143,16 +2151,17 @@ void TrimEdge (const TopoDS_Edge& E,
#ifdef DRAW #ifdef DRAW
if ( AffichEdge) { if ( AffichEdge) {
sprintf(name,"TRIMEDGE_%d",NbTRIMEDGES); sprintf(name,"TRIMEDGE_%d",++NbTRIMEDGES);
DBRep::Set(name,NewEdge); DBRep::Set(name,NewEdge);
} }
if (Affich2d) { if (Affich2d || AffichEdge) {
if(!AffichEdge) ++NbTRIMEDGES;
TopLoc_Location L; TopLoc_Location L;
Standard_Real f,l; Standard_Real f,l;
Handle(Geom_Surface) Surf; Handle(Geom_Surface) Surf;
Handle(Geom2d_Curve) C; Handle(Geom2d_Curve) C;
BRep_Tool::CurveOnSurface(NewEdge,C,Surf,L,f,l); BRep_Tool::CurveOnSurface(NewEdge,C,Surf,L,f,l);
sprintf(name,"OFFSET2d_%d",NbTRIMEDGES++); sprintf(name,"OFFSET2d_%d",NbTRIMEDGES);
Handle(Geom2d_TrimmedCurve) C2d = new Geom2d_TrimmedCurve(C,f,l); Handle(Geom2d_TrimmedCurve) C2d = new Geom2d_TrimmedCurve(C,f,l);
Handle(DrawTrSurf_Curve2d) dr = Handle(DrawTrSurf_Curve2d) dr =
new DrawTrSurf_Curve2d(C2d,Standard_False); new DrawTrSurf_Curve2d(C2d,Standard_False);