0028684: BRepOffsetAPI_MakeOffset produces wire with another orientation in compare with source wire

Added flag to reverse resulting shape, if it was reverse in BuildDomains() to bringing to the same direction as the original shape

src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx

@@ -138,7 +138,8 @@ static void BuildDomains(TopoDS_Face&               myFace,
                          BRepFill_ListOfOffsetWire& myAlgos,
                          GeomAbs_JoinType           myJoin,
                          Standard_Boolean           myIsOpenResult,
-                         Standard_Boolean           isPositive)
+                         Standard_Boolean           isPositive,
+                         Standard_Boolean&          isWasReversed)
 {
   BRepAlgo_FaceRestrictor  FR;
   TopoDS_Vertex            VF,VL;
@@ -164,6 +165,7 @@ static void BuildDomains(TopoDS_Face&               myFace,
           const TopoDS_Shape& W = itl.Value();
           LWires.Append(W.Reversed());
         }
+		isWasReversed = Standard_True;
         WorkWires = LWires;
     }
   }
@@ -296,13 +298,13 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
     BRep_Builder    B;
     B.MakeCompound (Res);
     myLastIsLeft = (Offset <= 0);
-
+	Standard_Boolean isWasReversed = Standard_False;
     if( Offset <= 0. )
     {
       if( myLeft.IsEmpty() )
       {
         //  Modified by Sergey KHROMOV - Fri Apr 27 14:35:26 2001 Begin
-        BuildDomains(myFace,myWires,myLeft,myJoin,myIsOpenResult, Standard_False);
+        BuildDomains(myFace,myWires,myLeft,myJoin,myIsOpenResult, Standard_False, isWasReversed);
         //  Modified by Sergey KHROMOV - Fri Apr 27 14:35:26 2001 End
       }
 
@@ -312,9 +314,9 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
         Algo.Perform(Abs(Offset),Alt);
         if (Algo.IsDone() && !Algo.Shape().IsNull())
         {
-          B.Add(Res,Algo.Shape());
+          B.Add(Res,isWasReversed ? Algo.Shape().Reversed() : Algo.Shape());
           if (i == 1)
-            myShape = Algo.Shape();
+            myShape = isWasReversed ? Algo.Shape().Reversed() : Algo.Shape();
 
           i++;
         }
@@ -325,7 +327,7 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
       if (myRight.IsEmpty())
       {
         //  Modified by Sergey KHROMOV - Fri Apr 27 14:35:28 2001 Begin
-        BuildDomains(myFace,myWires,myRight,myJoin,myIsOpenResult, Standard_True);
+        BuildDomains(myFace,myWires,myRight,myJoin,myIsOpenResult, Standard_True, isWasReversed);
         //  Modified by Sergey KHROMOV - Fri Apr 27 14:35:35 2001 End
       }
 
@@ -336,10 +338,10 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
 
         if (Algo.IsDone() && !Algo.Shape().IsNull())
         {
-          B.Add(Res,Algo.Shape());
+          B.Add(Res, isWasReversed ? Algo.Shape().Reversed() : Algo.Shape());
 
           if (i == 1)
-            myShape = Algo.Shape();
+            myShape = isWasReversed ? Algo.Shape().Reversed() : Algo.Shape();
 
           i++;
         }

tests/bugs/modalg_5/bug25298_02

@@ -12,11 +12,15 @@ smallview
 display a
 fit
 
+vori a
+
 if [catch { openoffset resoffset a 1 10 i } ] {
   puts "Error : mkoffset is wrong"
 } else {
   renamevar resoffset_1 result
 
+vori result
+
   checkprops result -l 159.96 
 checkshape result 
 checksection result

tests/bugs/modalg_5/bug25334_1

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 613.39 

tests/bugs/modalg_5/bug25334_10

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 548.106 

tests/bugs/modalg_5/bug25334_11

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 846.702 

tests/bugs/modalg_5/bug25334_12

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 768.339 

tests/bugs/modalg_5/bug25334_13

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 1216.59 

tests/bugs/modalg_5/bug25334_14

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 1132.6 

tests/bugs/modalg_5/bug25334_15

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 1042.35 

tests/bugs/modalg_5/bug25334_16

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 937.174 

tests/bugs/modalg_5/bug25334_17

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 1211.6 

tests/bugs/modalg_5/bug25334_18

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 1143.61 

tests/bugs/modalg_5/bug25334_19

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 752.799 

tests/bugs/modalg_5/bug25334_2

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 644.509 

tests/bugs/modalg_5/bug25334_20

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 705.994 

tests/bugs/modalg_5/bug25334_3

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 354.958 

tests/bugs/modalg_5/bug25334_4

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 386.077 

tests/bugs/modalg_5/bug25334_5

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 840.157 

tests/bugs/modalg_5/bug25334_6

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 782.224 

tests/bugs/modalg_5/bug25334_7

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 559.65 

tests/bugs/modalg_5/bug25334_8

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 533.593 

tests/bugs/modalg_5/bug25334_9

@@ -18,6 +18,9 @@ donly ww
 openoffset res ww 1 -10
 renamevar res_1 result
 
+vori ww 
+vori result
+
 fit
 
 checkprops result -l 558.479 

tests/bugs/modalg_7/bug28684_1

@@ -0,0 +1,31 @@
+puts "============"
+puts "OCC25298: Modeling Algorithms - BRepOffsetAPI_MakeOffset produces wire with another orientation in compare with source wire"
+puts "============"
+puts ""
+
+circle c 0 0 0 100
+mkedge e c
+wire a e
+
+smallview
+display a
+fit
+
+vori a
+
+if [catch { mkoffset resoffset a 1 10 } ] {
+  puts "Error : mkoffset is wrong"
+} else {
+  renamevar resoffset_1 result
+
+  vori result
+
+  checkprops result -l 691.15 
+  checkshape result 
+  checksection result
+
+  display result
+  fit
+}
+
+checkview -screenshot -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_7/bug28684_2

@@ -0,0 +1,31 @@
+puts "============"
+puts "OCC25298: Modeling Algorithms - BRepOffsetAPI_MakeOffset produces wire with another orientation in compare with source wire"
+puts "============"
+puts ""
+
+circle c 0 0 0 100
+mkedge e c
+wire a e
+
+smallview
+display a
+fit
+
+vori a
+
+if [catch { mkoffset resoffset a 1 -10 } ] {
+  puts "Error : mkoffset is wrong"
+} else {
+  renamevar resoffset_1 result
+
+  vori result
+
+  checkprops result -l 565.487 
+  checkshape result 
+  checksection result
+
+  display result
+  fit
+}
+
+checkview -screenshot -2d -path ${imagedir}/${test_image}.png