ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix of regression

Browse Source
This commit is contained in:
jgv 2020-04-01 21:43:11 +03:00
parent 47c785f741
commit 0074a6e2c3
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/BlockFix/BlockFix.cxx
View File

@ -52,6 +52,7 @@
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include <BRepBndLib.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <BRepTools_Modifier.hxx> #include <BRepTools_Modifier.hxx>
@ -272,7 +273,16 @@ TopoDS_Shape BlockFix::RefillProblemFaces (const TopoDS_Shape& aShape)
{ {
TopoDS_Face aFace = TopoDS::Face(itl.Value()); TopoDS_Face aFace = TopoDS::Face(itl.Value());
aFace.Orientation(TopAbs_FORWARD); aFace.Orientation(TopAbs_FORWARD);
//Compute proper tolerance
Standard_Real MaxTolOfFace = ComputeMaxTolOfFace(aFace); Standard_Real MaxTolOfFace = ComputeMaxTolOfFace(aFace);
Bnd_Box aBndBox;
BRepBndLib::Add(aFace, aBndBox);
Standard_Real Xmin, Ymin, Zmin, Xmax, Ymax, Zmax;
aBndBox.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
Standard_Real LinSize = Min(Xmax - Xmin, Min(Ymax - Ymin, Zmax - Zmin));
Standard_Real LinTol = Max(0.001*LinSize, 1.5*MaxTolOfFace);
BRepAdaptor_Surface BAsurf(aFace, Standard_False); BRepAdaptor_Surface BAsurf(aFace, Standard_False);
BRepOffsetAPI_MakeFilling Filler(3, 10); BRepOffsetAPI_MakeFilling Filler(3, 10);
TopExp_Explorer Explo(aFace, TopAbs_EDGE); TopExp_Explorer Explo(aFace, TopAbs_EDGE);
@ -327,15 +337,19 @@ TopoDS_Shape BlockFix::RefillProblemFaces (const TopoDS_Shape& aShape)
} }
} }
Standard_Real MaxDist = Sqrt(MaxSqDist); Standard_Real MaxDist = Sqrt(MaxSqDist);
if (MaxDist < Max(1.e-4, 1.5*MaxTolOfFace)) if (MaxDist < LinTol)
{ {
TopTools_IndexedMapOfShape Emap; TopTools_IndexedMapOfShape Emap;
TopTools_MapOfShape Vmap;
TopExp::MapShapes(aFace, TopAbs_EDGE, Emap); TopExp::MapShapes(aFace, TopAbs_EDGE, Emap);
for (Standard_Integer i = 1; i <= Emap.Extent(); i++) for (Standard_Integer i = 1; i <= Emap.Extent(); i++)
{ {
TopoDS_Edge anEdge = TopoDS::Edge(Emap(i)); TopoDS_Edge anEdge = TopoDS::Edge(Emap(i));
anEdge.Orientation(TopAbs_FORWARD); anEdge.Orientation(TopAbs_FORWARD);
TopTools_ListOfShape Ledge; TopoDS_Vertex V1, V2;
TopExp::Vertices(anEdge, V1, V2);
TopTools_ListOfShape Ledge, ListV1, ListV2;
if (!BRep_Tool::Degenerated(anEdge) && if (!BRep_Tool::Degenerated(anEdge) &&
!BRepTools::IsReallyClosed(anEdge, aFace)) !BRepTools::IsReallyClosed(anEdge, aFace))
{ {
@ -344,8 +358,27 @@ TopoDS_Shape BlockFix::RefillProblemFaces (const TopoDS_Shape& aShape)
TopoDS_Edge NewEdge = TopoDS::Edge(Ledges.First()); TopoDS_Edge NewEdge = TopoDS::Edge(Ledges.First());
Ledge.Append(NewEdge.Oriented(TopAbs_FORWARD)); Ledge.Append(NewEdge.Oriented(TopAbs_FORWARD));
} }
TopoDS_Vertex NewV1 = TopoDS::Vertex(Filler.Generated(V1).First());
ListV1.Append(NewV1.Oriented(TopAbs_FORWARD));
if (!V1.IsSame(V2))
{
TopoDS_Vertex NewV2 = TopoDS::Vertex(Filler.Generated(V2).First());
ListV2.Append(NewV2.Oriented(TopAbs_FORWARD));
}
} }
aSubst.Substitute(anEdge, Ledge); aSubst.Substitute(anEdge, Ledge);
if (!Vmap.Contains(V1))
{
aSubst.Substitute(V1, ListV1);
Vmap.Add(V1);
}
if (!Vmap.Contains(V2))
{
aSubst.Substitute(V2.Oriented(TopAbs_FORWARD), ListV2);
Vmap.Add(V2);
}
} }
TopTools_ListOfShape Lface; TopTools_ListOfShape Lface;
BRepAdaptor_Surface NewBAsurf(aNewFace); BRepAdaptor_Surface NewBAsurf(aNewFace);