From 32c19c4cd4c76d55d302be3b7c6ea7aece0eb863 Mon Sep 17 00:00:00 2001
From: astromko <astromko@opencascade.com>
Date: Mon, 9 Sep 2024 15:12:11 +0100
Subject: [PATCH] 0033759: Modeling Algorithms - Offset is in wrong direction

Changed the condition to avoid reversing offset
  for reversed edges.
Added a test case.
---
 src/BRepFill/BRepFill_OffsetWire.cxx |  6 ++---
 tests/bugs/modalg_5/bug25334_2       |  2 +-
 tests/bugs/modalg_5/bug25334_4       |  2 +-
 tests/bugs/modalg_8/bug33759         | 39 ++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 tests/bugs/modalg_8/bug33759

diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx
index dae07a5bb3..db15151a6a 100644
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -264,12 +264,12 @@ static Standard_Boolean KPartCircle
     }
     else if (AHC->GetType() == GeomAbs_Circle)
     {
-      if (E.Orientation() == TopAbs_FORWARD)
-        anOffset *= -1;
-      if (!BRep_Tool::IsClosed(E))
+      // Reverse the offset function when the edge is FORWARD and CLOSED
+      if (E.Orientation() == TopAbs_FORWARD && BRep_Tool::IsClosed(E))
       {
         anOffset *= -1;
       }
+
       gp_Circ2d theCirc = AHC->Circle();
       if (anOffset > 0. || Abs(anOffset) < theCirc.Radius())
         OC = new Geom2d_Circle (theCirc.Position(), theCirc.Radius() + anOffset);
diff --git a/tests/bugs/modalg_5/bug25334_2 b/tests/bugs/modalg_5/bug25334_2
index b5f90d7539..3f16c789c7 100644
--- a/tests/bugs/modalg_5/bug25334_2
+++ b/tests/bugs/modalg_5/bug25334_2
@@ -23,7 +23,7 @@ vori result
 
 fit
 
-checkprops result -l 613.39 
+checkprops result -l 644.509 
 checkshape result 
 checksection result
 
diff --git a/tests/bugs/modalg_5/bug25334_4 b/tests/bugs/modalg_5/bug25334_4
index 40b13eb67e..d22bb01edc 100644
--- a/tests/bugs/modalg_5/bug25334_4
+++ b/tests/bugs/modalg_5/bug25334_4
@@ -23,7 +23,7 @@ vori result
 
 fit
 
-checkprops result -l 354.958 
+checkprops result -l 386.077 
 checkshape result 
 checksection result
 
diff --git a/tests/bugs/modalg_8/bug33759 b/tests/bugs/modalg_8/bug33759
new file mode 100644
index 0000000000..35355f984e
--- /dev/null
+++ b/tests/bugs/modalg_8/bug33759
@@ -0,0 +1,39 @@
+puts "==========================================================="
+puts "0033759: Modeling Algorithms - Offset is in wrong direction"
+puts "==========================================================="
+puts ""
+
+pload MODELING
+circle c1 0 0 0 30
+
+# make and check FORWARD, NOT CLOSED edge
+mkedge e1 c1 1.5*pi 0
+wire w1 e1
+plane pln1 0 0 0  0 0 1  1 0 0
+mkface f1 pln1 w1
+openoffset of1 f1 1 7
+checkprops of1_1 -l 58.1195
+
+# make and check REVERSED, NOT CLOSED edge
+complement e1
+wire w1 e1
+plane pln1 0 0 0  0 0 1  1 0 0
+mkface f1 pln1 w1
+openoffset of1 f1 1 7
+checkprops of1_1 -l 58.1195
+
+# make and check FORWARD CLOSED edge
+mkedge e1 c1 0 0
+wire w1 e1
+plane pln1 0 0 0  0 0 1  1 0 0
+mkface f1 pln1 w1
+openoffset of1 f1 1 7
+checkprops of1_1 -l 232.478
+
+# make and check REVERSED CLOSED edge
+complement e1
+wire w1 e1
+plane pln1 0 0 0  0 0 1  1 0 0
+mkface f1 pln1 w1
+openoffset of1 f1 1 7
+checkprops of1_1 -l 232.478