From d42d186778f1b19e6e839b86ce79b992df0964cf Mon Sep 17 00:00:00 2001
From: jgv <jgv@opencascade.com>
Date: Thu, 20 Jun 2013 15:46:20 +0400
Subject: [PATCH] 0023998: Bad result of intersection of two faces: curve has a
 loop Add test case for this fix

---
 src/IntWalk/IntWalk_PWalking_4.gxx | 45 ++++++++++++------------------
 tests/bugs/modalg_5/bug23998       | 32 +++++++++++++++++++++
 2 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100755 tests/bugs/modalg_5/bug23998

diff --git a/src/IntWalk/IntWalk_PWalking_4.gxx b/src/IntWalk/IntWalk_PWalking_4.gxx
index b04f7136ce..26c35e15ac 100755
--- a/src/IntWalk/IntWalk_PWalking_4.gxx
+++ b/src/IntWalk/IntWalk_PWalking_4.gxx
@@ -146,38 +146,29 @@ Standard_Boolean IntWalk_PWalking::
     {  
       if (!DejaReparti) { // recherche si ligne fermee
 
-	Standard_Real u,v,up,vp;
+	Standard_Real u,v;
 	const IntSurf_PntOn2S& POn2S1=line->Value(1);
+        //On S1
 	POn2S1.ParametersOnS1(u,v);
-	gp_Pnt2d P1uv(u,v);
+	gp_Pnt2d P1uvS1(u,v);
 	previousPoint.ParametersOnS1(u,v);
-	up=u; vp=v;
-	gp_Pnt2d Prevuv(u,v);
+	gp_Pnt2d PrevuvS1(u,v);
 	myIntersectionOn2S.Point().ParametersOnS1(u,v);
-	gp_Pnt2d myIntersuv(u,v);
-	Standard_Boolean close2d = (P1uv.XY()-Prevuv.XY())*
-	  (P1uv.XY()-myIntersuv.XY()) <0.0;
-	
-	const gp_Pnt &P1 = line->Value(1).Value();
-	close = (P1.XYZ() - previousPoint.Value().XYZ())*
-	  (P1.XYZ() - myIntersectionOn2S.Point().Value().XYZ()) < 0;  
-	if(close != close2d) { 
-#ifdef DEB
-	  cout<<"\n PWalking_4 TestArret - close2d"<<close2d<<endl;
-#endif
-	}
-	Standard_Boolean autoclose = Standard_False;
-	previousPoint.ParametersOnS2(u,v);
-	if(   myIntersectionOn2S.Function().AuxillarSurface1() 
-	   == myIntersectionOn2S.Function().AuxillarSurface2()) { 
-	  if(Abs(u-up)<=1e-7 && Abs(v-vp)<=1e-7) { 
-	    autoclose=Standard_True;
-	  }
-	}
-	
-
+	gp_Pnt2d myIntersuvS1(u,v);
+	Standard_Boolean close2dS1 = (P1uvS1.XY()-PrevuvS1.XY())*
+	  (P1uvS1.XY()-myIntersuvS1.XY()) < 0.0;
+        //On S2
+        POn2S1.ParametersOnS2(u,v);
+        gp_Pnt2d P1uvS2(u,v);
+        previousPoint.ParametersOnS2(u,v);
+        gp_Pnt2d PrevuvS2(u,v);
+        myIntersectionOn2S.Point().ParametersOnS2(u,v);
+        gp_Pnt2d myIntersuvS2(u,v);
+        Standard_Boolean close2dS2 = (P1uvS2.XY()-PrevuvS2.XY())*
+          (P1uvS2.XY()-myIntersuvS2.XY()) < 0.0;
 
-	return (autoclose || (close&&close2d));
+        close = close2dS1 && close2dS2;
+        return close;
       }
       else return Standard_False;
     }
diff --git a/tests/bugs/modalg_5/bug23998 b/tests/bugs/modalg_5/bug23998
new file mode 100755
index 0000000000..6743a6c611
--- /dev/null
+++ b/tests/bugs/modalg_5/bug23998
@@ -0,0 +1,32 @@
+puts "============"
+puts "OCC23998"
+puts "============"
+puts ""
+#######################################################################
+# Bad result of intersection of two faces: curve has a loop
+#######################################################################
+
+restore [locate_data_file bug23998_m1s.brep] b
+
+explode b
+
+bop b_1 b_2
+
+bopsection result b_1 b_2
+
+checkshape result
+
+set length 67.026
+
+# Analysis of "nbshapes res"
+set nb_v_good 1
+set nb_e_good 1
+set nb_w_good 0
+set nb_f_good 0
+set nb_sh_good 0
+set nb_sol_good 0
+set nb_compsol_good 0
+set nb_compound_good 1
+set nb_shape_good 3
+
+set 2dviewer 0
-- 
2.20.1