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

0028026: Modeling Data - BRepTools::Clean() does not clean all triangulation from shape

Browse Source 
Added flag for force clean triangulation and treatment for it
Command "trinfo" now show number of polygons on triangulation
This commit is contained in:
akaftasev
2020-11-27 18:07:39 +03:00
committed by bugmaster
parent 4925946065
commit 5bae0bebe4
5 changed files with 136 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/BRepTools/BRepTools.cxx
View File

@@ -763,7 +763,7 @@ Standard_Boolean BRepTools::Read(TopoDS_Shape& Sh,
//purpose :
//=======================================================================
void BRepTools::Clean (const TopoDS_Shape& theShape)
void BRepTools::Clean (const TopoDS_Shape& theShape, const Standard_Boolean theForce)
{
if (theShape.IsNull())
return;
@@ -809,8 +809,8 @@ void BRepTools::Clean (const TopoDS_Shape& theShape)
TopExp_Explorer aEdgeIt(aFace, TopAbs_EDGE);
for (; aEdgeIt.More(); aEdgeIt.Next())
{
const TopoDS_Edge& aEdge = TopoDS::Edge(aEdgeIt.Current());
aBuilder.UpdateEdge(aEdge, aNullPoly, aTriangulation, aLoc);
const TopoDS_Edge& anEdge = TopoDS::Edge(aEdgeIt.Current());
aBuilder.UpdateEdge(anEdge, aNullPoly, aTriangulation, aLoc);
}
aBuilder.UpdateFace(aFace, aNullTriangulation);
@@ -821,27 +821,50 @@ void BRepTools::Clean (const TopoDS_Shape& theShape)
TopExp_Explorer aEdgeIt (theShape, TopAbs_EDGE);
for (; aEdgeIt.More (); aEdgeIt.Next ())
{
TopoDS_Edge anEdgeNoLoc = TopoDS::Edge (aEdgeIt.Value());
anEdgeNoLoc.Location (anEmptyLoc);
TopoDS_Edge anEdge = TopoDS::Edge(aEdgeIt.Value());
anEdge.Location(anEmptyLoc);
if (!aShapeMap.Add (anEdgeNoLoc))
if (!aShapeMap.Add(anEdge))
{
// the edge has already been processed
continue;
}
if (!BRep_Tool::IsGeometric (TopoDS::Edge (anEdgeNoLoc)))
if (!BRep_Tool::IsGeometric(TopoDS::Edge(anEdge)))
{
// Do not remove polygon 3d as there is no curve to recompute it.
continue;
}
TopLoc_Location aLoc;
Handle (Poly_Polygon3D) aPoly3d = BRep_Tool::Polygon3D (anEdgeNoLoc, aLoc);
if (aPoly3d.IsNull())
continue;
Handle(Poly_Polygon3D) aPoly3d = BRep_Tool::Polygon3D(anEdge, aLoc);
aBuilder.UpdateEdge (anEdgeNoLoc, aNullPoly3d);
if (!aPoly3d.IsNull())
{
aBuilder.UpdateEdge(anEdge, aNullPoly3d);
}
if (theForce)
{
Handle(BRep_CurveRepresentation) aCR;
BRep_TEdge* aTE = static_cast<BRep_TEdge*>(anEdge.TShape().get());
BRep_ListOfCurveRepresentation& aLCR = aTE->ChangeCurves();
BRep_ListIteratorOfListOfCurveRepresentation anIterCR(aLCR);
// find and remove all representations
while (anIterCR.More())
{
aCR = anIterCR.Value();
if (aCR->IsPolygonOnTriangulation())
{
aLCR.Remove(anIterCR);
}
else
{
anIterCR.Next();
}
}
aTE->Modified(Standard_True);
}
}
}
//=======================================================================
@@ -875,7 +898,6 @@ void BRepTools::CleanGeometry(const TopoDS_Shape& theShape)
for (TopExp_Explorer aEdgeIt2(theShape, TopAbs_EDGE); aEdgeIt2.More(); aEdgeIt2.Next())
{
const TopoDS_Edge& anEdge = TopoDS::Edge(aEdgeIt2.Current());
aBuilder.UpdateEdge(anEdge, Handle(Geom_Curve)(),
TopLoc_Location(), BRep_Tool::Tolerance(anEdge));
}

5
src/BRepTools/BRepTools.hxx
View File

@@ -154,7 +154,10 @@ public:
//! triangulations and polygons 3d of the edges.
//! In case polygonal representation is the only available representation
//! for the shape (shape does not have geometry) it is not removed.
Standard_EXPORT static void Clean (const TopoDS_Shape& S);
//! @param theShape [in] the shape to clean
//! @param theForce [in] allows removing all polygonal representations from the shape,
//! including polygons on triangulations irrelevant for the faces of the given shape.
Standard_EXPORT static void Clean (const TopoDS_Shape& theShape, const Standard_Boolean theForce = Standard_False);
//! Removes geometry (curves and surfaces) from all edges and faces of the shape
Standard_EXPORT static void CleanGeometry(const TopoDS_Shape& theShape);