From ae7c4964bf232de490499fedc55097fc36c61550 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Tue, 15 Mar 2005 12:06:31 +0000
Subject: [PATCH] PAL8395: Improve RemoveExtraEdges

---
 src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
index c5f774d82..fb9e3f27f 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
@@ -65,16 +65,35 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
     ShapeAnalysis::GetFaceUVBounds(aFace,Umin, Umax, Vmin, Vmax);
     Standard_Real PI2 = PI/2.;
     if(Vmax > PI2 - Precision::PConfusion() || Vmin < -PI2+::Precision::PConfusion()) {
+      Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(S);
+      gp_Sphere sp = aSphere->Sphere();
+      gp_Ax3 ax3 = sp.Position();
       if(Abs(Vmax-Vmin) < PI2) {
-        Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(S);
-        gp_Sphere sp = aSphere->Sphere();
-        gp_Ax3 ax3 = sp.Position();
         gp_Ax3 axnew3(ax3.Axis().Location(), ax3.Direction()^ax3.XDirection(),ax3.XDirection());
         sp.SetPosition(axnew3);
         Handle(Geom_SphericalSurface) aNewSphere = new Geom_SphericalSurface(sp);
         aNewSurface = aNewSphere;
         return Standard_True;
       }
+      else {
+        gp_Pnt PC = ax3.Location();
+        Standard_Real Vpar;
+        if(fabs(PI2-Vmax)>fabs(-PI2-Vmin))
+          Vpar = (PI2+Vmax)/2.;
+        else
+          Vpar = (-PI2+Vmin)/2.;
+        Standard_Real Upar = (Umin+Umax)/2.;;
+        gp_Pnt PN,PX;
+        S->D0(Upar,Vpar,PN);
+        S->D0(Upar+PI2,0.,PX);
+        gp_Dir newNorm(gp_Vec(PC,PN));
+        gp_Dir newDirX(gp_Vec(PC,PX));
+        gp_Ax3 axnew3(ax3.Axis().Location(), newNorm, newDirX);
+        sp.SetPosition(axnew3);
+        Handle(Geom_SphericalSurface) aNewSphere = new Geom_SphericalSurface(sp);
+        aNewSurface = aNewSphere;
+        return Standard_True;
+      }
     }
   }
   return Standard_False;
@@ -221,4 +240,3 @@ GeomAbs_Shape BlockFix_SphereSpaceModifier::Continuity(const TopoDS_Edge& E,cons
 {
   return BRep_Tool::Continuity(E,F1,F2);
 }
-