OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

Additional fix to improve robustness.

Browse Source
This commit is contained in:
msv
2015-06-24 09:58:27 +03:00
parent 4cf1941672
commit eafe0b9090
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
View File

@@ -597,7 +597,7 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
//if(!Dir1.IsEqual(Dir2,Precision::Angular())) { //if(!Dir1.IsEqual(Dir2,Precision::Angular())) {
//if(!Dir1.IsParallel(Dir2,Precision::Angular())) { //if(!Dir1.IsParallel(Dir2,Precision::Angular())) {
if(!Dir1.IsParallel(Dir2,Tol)) { if(!Dir1.IsParallel(Dir2,Tol)) {
continue; return Standard_False;
} }
// can union lines => create new edge // can union lines => create new edge
TopoDS_Vertex V1 = sae.FirstVertex(edge1); TopoDS_Vertex V1 = sae.FirstVertex(edge1);
@@ -626,7 +626,8 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
Handle(Geom_Circle) C2 = Handle(Geom_Circle)::DownCast(c3d2); Handle(Geom_Circle) C2 = Handle(Geom_Circle)::DownCast(c3d2);
gp_Pnt P01 = C1->Location(); gp_Pnt P01 = C1->Location();
gp_Pnt P02 = C2->Location(); gp_Pnt P02 = C2->Location();
if (P01.Distance(P02) > Precision::Confusion()) continue; if (P01.Distance(P02) > Precision::Confusion())
return Standard_False;
// can union circles => create new edge // can union circles => create new edge
TopoDS_Vertex V1 = sae.FirstVertex(edge1); TopoDS_Vertex V1 = sae.FirstVertex(edge1);
gp_Pnt PV1 = BRep_Tool::Pnt(V1); gp_Pnt PV1 = BRep_Tool::Pnt(V1);
@@ -638,7 +639,8 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
TopoDS_Edge E; TopoDS_Edge E;
if (!MC.IsDone() || MC.Value().IsNull()) { if (!MC.IsDone() || MC.Value().IsNull()) {
// jfa for Mantis issue 0020228 // jfa for Mantis issue 0020228
if (PV1.Distance(PV2) > Precision::Confusion()) continue; if (PV1.Distance(PV2) > Precision::Confusion())
return Standard_False;
// closed chain // closed chain
B.MakeEdge (E,C1,Precision::Confusion()); B.MakeEdge (E,C1,Precision::Confusion());
B.Add(E,V1); B.Add(E,V1);