0033420: Modeling Algorithm - Missing inner part after offset operation

Added condition to not remove face image, consisting only of invalid edges for artifactically invalid face.
This face image should be connected with other image faces minimum through the edge.

diff --git a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
index 758ed4a7130d0089e0e14a5281a12e896efe6b9d..216f095f7370a962eb4a22263aa1f545e575ed77 100644 (file)
--- a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
@@ -1177,6 +1177,45 @@ void BRepOffset_BuildOffsetFaces::IntersectTrimmedEdges (const Message_ProgressR
   UpdateIntersectedEdges (aLA, aGFE);
 }
 
+namespace
+{
+  //=======================================================================
+  //function : CheckConnectionsOfFace
+  //purpose  : Checks number of connections for theFace with theLF
+  //           Returns true if number of connections more than 1
+  //=======================================================================
+  static Standard_Boolean checkConnectionsOfFace(const TopoDS_Shape& theFace,
+    const TopTools_ListOfShape& theLF)
+  {
+    TopTools_IndexedMapOfShape aShapeVert;
+    for (TopTools_ListOfShape::Iterator aFImIterator(theLF); aFImIterator.More(); aFImIterator.Next())
+    {
+      const TopoDS_Shape& aShape = aFImIterator.Value();
+      if (aShape.IsSame(theFace))
+      {
+        continue;
+      }
+      TopExp::MapShapes(aShape, TopAbs_VERTEX, aShapeVert);
+    }
+    Standard_Integer aNbConnections = 0;
+    TopTools_IndexedMapOfShape aFaceVertices;
+    TopExp::MapShapes(theFace, TopAbs_VERTEX, aFaceVertices);
+    for (TopTools_IndexedMapOfShape::Iterator aVertIter(aFaceVertices); aVertIter.More(); aVertIter.Next())
+    {
+      const TopoDS_Shape& aVert = aVertIter.Value();
+      if (aShapeVert.Contains(aVert))
+      {
+        ++aNbConnections;
+      }
+      if (aNbConnections > 1)
+      {
+        return Standard_True;
+      }
+    }
+    return Standard_False;
+  }
+}
+
 //=======================================================================
 //function : BuildSplitsOfFaces
 //purpose  : Building the splits of offset faces and
@@ -1268,6 +1307,10 @@ void BRepOffset_BuildOffsetFaces::BuildSplitsOfFaces (const Message_ProgressRang
       for (TopTools_ListIteratorOfListOfShape aItLFIm (aLFImages1); aItLFIm.More();)
       {
         Standard_Boolean bAllInv = Standard_True;
+        // Additional check for artificial case 
+        // if current image face consist only of edges from aMapEInv and aMENInv
+        // then recheck current face for the futher processing
+        Standard_Boolean aToReCheckFace = bArtificialCase;
         const TopoDS_Shape& aFIm = aItLFIm.Value();
         TopExp_Explorer aExpE (aFIm, TopAbs_EDGE);
         for (; aExpE.More(); aExpE.Next())
@@ -1278,12 +1321,19 @@ void BRepOffset_BuildOffsetFaces::BuildSplitsOfFaces (const Message_ProgressRang
             bAllInv = Standard_False;
             if (!aMENInv.Contains (aE))
             {
+              aToReCheckFace = Standard_False;
               break;
             }
           }
         }
-        //
-        if (!aExpE.More())
+        // if current image face is to recheck then check number of connections for this face
+        // with other image faces for current face
+        if (!aExpE.More() && aToReCheckFace)
+        {
+          aToReCheckFace = checkConnectionsOfFace(aFIm, aLFImages1);
+        }
+        // do not delete image face from futher processing if aToReCheckFace is true
+        if (!aExpE.More() && !aToReCheckFace)
         {
           if (bAllInv)
           {

diff --git a/tests/offset/shape_type_i_c/AA1 b/tests/offset/shape_type_i_c/AA1
new file mode 100644 (file)
index 0000000..bbce4b8
--- /dev/null
+++ b/tests/offset/shape_type_i_c/AA1
@@ -0,0 +1,7 @@
+restore [locate_data_file bug33420.brep] s
+
+OFFSETSHAPE 35 {} $calcul $type
+
+checkprops result -v 4.04602e+07
+
+checknbshapes result -face 43 -shell 1

diff --git a/tests/offset/shape_type_i_c/ZC6 b/tests/offset/shape_type_i_c/ZC6
index 7ac9472b197e765b63973546b7de7ce4f60bd015..7aeea5e9213bf08c58f6485ca531a17297fd3a85 100644 (file)
--- a/tests/offset/shape_type_i_c/ZC6
+++ b/tests/offset/shape_type_i_c/ZC6
@@ -1,3 +1,5 @@
+puts "TODO OCC27414 ALL: Error : The area of result shape is"
+
 restore [locate_data_file bug26917_M2_trim33.brep] s
 
 OFFSETSHAPE 8 {} $calcul $type

diff --git a/tests/offset/shape_type_i_c/ZS1 b/tests/offset/shape_type_i_c/ZS1
index bb9a044df649bd77788c924e4fd0cc6703b911a9..3f409e5c7c0fe92be4d6f96d52ef9a0226b22888 100644 (file)
--- a/tests/offset/shape_type_i_c/ZS1
+++ b/tests/offset/shape_type_i_c/ZS1
@@ -7,4 +7,4 @@ offsetperform result
 checkprops result -s 6.21471e+06 -v 8.95633e+08
 
 unifysamedom result_unif result
-checknbshapes result_unif -wire 140 -face 138 -shell 1 -solid 1
+checknbshapes result_unif -wire 142 -face 140 -shell 1 -solid 1