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

0032619: [Regression] Modelling Algorithms - UnifySameDomain ignores shared face

Browse Source 
Correct method ShapeUpgrade_UnifySameDomain::UnifyFaces: exclude free boundary edges from unification.
This commit is contained in:
jgv 2021-10-15 07:53:48 +03:00 committed by jfa
parent 1e74e3eacd
commit f9481b4f21
3 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
View File

@ -2618,11 +2618,29 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
TopExp::MapShapes (myShape, TopAbs_FACE, aFaceMap);
for (Standard_Integer i = 1; i <= aFaceMap.Extent(); i++)
TopExp::MapShapesAndAncestors (aFaceMap(i), TopAbs_EDGE, TopAbs_FACE, aGMapEdgeFaces);
// creating map of free boundaries
TopTools_MapOfShape aFreeBoundMap;
// look at only shells not belonging to solids
TopExp_Explorer anExplo (myShape, TopAbs_SHELL, TopAbs_SOLID);
for (; anExplo.More(); anExplo.Next())
{
const TopoDS_Shape& aShell = anExplo.Current();
TopTools_IndexedDataMapOfShapeListOfShape aEFmap;
TopExp::MapShapesAndAncestors (aShell, TopAbs_EDGE, TopAbs_FACE, aEFmap);
for (Standard_Integer ii = 1; ii <= aEFmap.Extent(); ii++)
{
const TopoDS_Edge& anEdge = TopoDS::Edge (aEFmap.FindKey(ii));
const TopTools_ListOfShape& aFaceList = aEFmap(ii);
if (!BRep_Tool::Degenerated (anEdge) && aFaceList.Extent() == 1)
aFreeBoundMap.Add (anEdge);
}
}
// unify faces in each shell separately
TopExp_Explorer exps;
for (exps.Init(myShape, TopAbs_SHELL); exps.More(); exps.Next())
IntUnifyFaces(exps.Current(), aGMapEdgeFaces);
IntUnifyFaces(exps.Current(), aGMapEdgeFaces, aFreeBoundMap);
// gather all faces out of shells in one compound and unify them at once
BRep_Builder aBB;
@ -2633,7 +2651,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
aBB.Add(aCmp, exps.Current());
if (nbf > 0)
IntUnifyFaces(aCmp, aGMapEdgeFaces);
IntUnifyFaces(aCmp, aGMapEdgeFaces, aFreeBoundMap);
myShape = myContext->Apply(myShape);
}
@ -2662,7 +2680,8 @@ static void SetFixWireModes(ShapeFix_Face& theSff)
//=======================================================================
void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape,
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces)
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces,
const TopTools_MapOfShape& theFreeBoundMap)
{
// creating map of edge faces for the shape
TopTools_IndexedDataMapOfShapeListOfShape aMapEdgeFaces;
@ -2719,7 +2738,9 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
// get connectivity of the edge in the global shape
const TopTools_ListOfShape& aGList = theGMapEdgeFaces.FindFromKey(edge);
if (!myAllowInternal && (aGList.Extent() != 2 || myKeepShapes.Contains(edge))) {
if (!myAllowInternal &&
(aGList.Extent() != 2 || myKeepShapes.Contains(edge) || theFreeBoundMap.Contains(edge)))
{
// non manifold case is not processed unless myAllowInternal
continue;
}
@ -2807,7 +2828,8 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
if (aLF.Extent() == 2) {
const TopoDS_Shape& aE = aMapEF.FindKey(i);
const TopTools_ListOfShape& aGLF = theGMapEdgeFaces.FindFromKey(aE);
if (aGLF.Extent() > 2 || myKeepShapes.Contains(aE)) {
if (aGLF.Extent() > 2 || myKeepShapes.Contains(aE) || theFreeBoundMap.Contains(aE))
{
aKeepEdges.Append(aE);
}
}

3
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
View File

@ -172,7 +172,8 @@ protected:
Standard_EXPORT void UnifyEdges();
void IntUnifyFaces(const TopoDS_Shape& theInpShape,
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces);
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces,
const TopTools_MapOfShape& theFreeBoundMap);
//! Splits the sequence of edges into the sequence of chains
Standard_Boolean MergeEdges(TopTools_SequenceOfShape& SeqEdges,

20
tests/bugs/heal/bug32619 Normal file
View File

@ -0,0 +1,20 @@
puts "============================================="
puts "OCC32619: UnifySameDomain ignores shared face"
puts "============================================="
puts ""
restore [locate_data_file bug32619.brep] a
unifysamedom result a
checkshape result
checknbshapes result -t -shell 2 -face 3 -wire 3 -edge 12 -vertex 10
set tolres [checkmaxtol result]
if { ${tolres} > 2.e-7} {
puts "Error: bad tolerance of result"
}
checkview -display result -2d -path ${imagedir}/${test_image}.png