0028473: Incorrect result of 3D offset operation in mode Complete, Join type Intersec...

Looking for inverted edges among the neutral ones while checking the offset edges on validity (BRepOffset_MakeOffset_1::FindInvalidEdges).

Test cases for the issue.

diff --git a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
index 826244e819cacf84097313efb77e634258cb5aec..77f34739f9799114b2474d1d22adfc1f18276776 100644 (file)
--- a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
@@ -196,7 +196,6 @@ static
                                  const TopTools_DataMapOfShapeListOfShape& theOEImages,
                                  const TopTools_DataMapOfShapeListOfShape& theOEOrigins,
                                  const TopTools_DataMapOfShapeListOfShape& theEdgesOrigins,
-                                 const TopTools_IndexedDataMapOfShapeListOfShape& theDMEF,
                                  const TopTools_IndexedDataMapOfShapeListOfShape& theDMVE,
                                  const TopTools_IndexedMapOfShape& theMEdges,
                                  TopTools_MapOfShape& theMEInverted);
@@ -1675,7 +1674,7 @@ void FindInvalidEdges(const TopoDS_Face& theF,
       // check if the edge has been inverted
       Standard_Boolean bInverted = !aNbE ? Standard_False :
         CheckInverted(aEIm, aFOr, theOEImages, theOEOrigins,
-          theEdgesOrigins, aDMEF, aDMVE, aMEdges, theMEInverted);
+          theEdgesOrigins, aDMVE, aMEdges, theMEInverted);
       //
       if (!bInverted || !aNbVOr) {
         theValidEdges.Add(aEIm);
@@ -2162,16 +2161,11 @@ Standard_Boolean CheckInverted(const TopoDS_Edge& theEIm,
                                const TopTools_DataMapOfShapeListOfShape& theOEImages,
                                const TopTools_DataMapOfShapeListOfShape& theOEOrigins,
                                const TopTools_DataMapOfShapeListOfShape& theEdgesOrigins,
-                               const TopTools_IndexedDataMapOfShapeListOfShape& theDMEF,
                                const TopTools_IndexedDataMapOfShapeListOfShape& theDMVE,
                                const TopTools_IndexedMapOfShape& theMEdges,
                                TopTools_MapOfShape& theMEInverted)
 {
-  if (theDMEF.FindFromKey(theEIm).Extent() > 1) {
-    return Standard_False;
-  }
-  //
-  // it is necessary to compare the direction from first vertex
+  // It is necessary to compare the direction from first vertex
   // to the last vertex on the original edge with the
   // same direction on the new edge. If the directions
   // will be different - the edge has been inverted.

diff --git a/tests/offset/begin b/tests/offset/begin
index 4308b170c25f552f964a4a268a31f97d3dcf05e8..adc2b73152d20aa8ab5f66cd3a081697c895ad82 100644 (file)
--- a/tests/offset/begin
+++ b/tests/offset/begin
@@ -15,7 +15,7 @@ if { [info exists test_image ] == 0 } {
 proc OFFSETSHAPE {distance faces  calcul type} {
     global GlobFaces
     set GlobFaces $faces
-    uplevel #0 explode s f
+    if {[llength $faces] > 0} {uplevel #0 explode s f}
     uplevel #0 offsetparameter 1e-7 $calcul $type
     uplevel #0 offsetload s $distance $faces
     uplevel #0 offsetperform result

diff --git a/tests/offset/shape_type_i_c/XC1 b/tests/offset/shape_type_i_c/XC1
index 5f1185871b8106f42905d06fe2b21113a66bfa4f..60a62df0dae428947718fe92fc66f966f6887a92 100644 (file)
--- a/tests/offset/shape_type_i_c/XC1
+++ b/tests/offset/shape_type_i_c/XC1
@@ -1,6 +1,5 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO OCC27414 ALL: Error : The volume of result shape is"
+puts "TODO OCC27414 ALL: Error : The area of result shape is"
 
 restore [locate_data_file bug26917_input.dom7742_trim1.brep] s
 

diff --git a/tests/offset/shape_type_i_c/XC2 b/tests/offset/shape_type_i_c/XC2
index 4deae08b4db6a44d2e0ace788256016141816ce0..08e73642decdc911053819eb136726e1e6604edf 100755 (executable)
--- a/tests/offset/shape_type_i_c/XC2
+++ b/tests/offset/shape_type_i_c/XC2
@@ -1,6 +1,5 @@
 puts "TODO OCC27414 ALL: Error : The volume of result shape is"
 puts "TODO OCC27414 ALL: Error : The area of result shape is"
-puts "TODO OCC27414 ALL: is not equal to zero"
 
 restore [locate_data_file bug26917_input.dom7742_trim2.brep] s
 

diff --git a/tests/offset/shape_type_i_c/YK5 b/tests/offset/shape_type_i_c/YK5
new file mode 100644 (file)
index 0000000..c3b38fc
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YK5
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input.brep] s
+
+OFFSETSHAPE 10 {} $calcul $type
+
+checkprops result -v 1.57511e+008 -s 2.91387e+006
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 19 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YK6 b/tests/offset/shape_type_i_c/YK6
new file mode 100644 (file)
index 0000000..a09d172
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YK6
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input.brep] s
+
+OFFSETSHAPE 15 {} $calcul $type
+
+checkprops result -v 1.72351e+008 -s 3.02233e+006
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 19 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YK7 b/tests/offset/shape_type_i_c/YK7
new file mode 100644 (file)
index 0000000..9715c00
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YK7
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input.brep] s
+
+OFFSETSHAPE 20 {} $calcul $type
+
+checkprops result -v 1.87736e+008 -s 3.13198e+006
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 19 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YK8 b/tests/offset/shape_type_i_c/YK8
new file mode 100644 (file)
index 0000000..3bf17b4
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YK8
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input_trim.brep] s
+
+OFFSETSHAPE 10 {} $calcul $type
+
+checkprops result -v 126000 -s 16200
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 6 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YK9 b/tests/offset/shape_type_i_c/YK9
new file mode 100644 (file)
index 0000000..78b3991
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YK9
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input_trim.brep] s
+
+OFFSETSHAPE 15 {} $calcul $type
+
+checkprops result -v 224000 -s 23200
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 6 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YL1 b/tests/offset/shape_type_i_c/YL1
new file mode 100644 (file)
index 0000000..582c5fd
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YL1
@@ -0,0 +1,10 @@
+restore [locate_data_file bug28473_input_trim.brep] s
+
+OFFSETSHAPE 20 {} $calcul $type
+
+checkprops result -v 360000 -s 31400
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 6 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/offset/shape_type_i_c/YL2 b/tests/offset/shape_type_i_c/YL2
new file mode 100644 (file)
index 0000000..20dc8ed
--- /dev/null
+++ b/tests/offset/shape_type_i_c/YL2
@@ -0,0 +1,24 @@
+restore [locate_data_file bug28473_input.brep] s
+
+offsetparameter 1e-7 c i r
+offsetload s 10
+
+foreach f [explode s f] {
+  mksurface surf $f
+  set found [regexp {Axis   :([-0-9.+eE]*), ([-0-9.+eE]*), ([-0-9.+eE]*)} [dump surf] full x y z]
+  if {$found == 0} {
+    continue
+  }
+  # set offset value for top faces only
+  if {abs($z + 1) < 1.e-7 } {
+    offsetonface $f 15
+  }
+}
+offsetperform result
+
+checkprops result -v 1.62264e+008 -s 2.94663e+006
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 25 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png