From d335fa85ad1b38088f011253a3189276556cc959 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Mon, 14 Aug 2023 14:36:38 +0100
Subject: [PATCH] [bos #36169] EDF 25230 - Conversion xyz => uv => xyz. Replace
 all calls of ShapeAnalysis::GetFaceUVBounds to BRepTools::UVBounds.

---
 src/GeomAlgoAPI/GeomAlgoAPI_BoundingBox.cpp  |  3 +--
 src/GeomAlgoAPI/GeomAlgoAPI_NormalToFace.cpp | 28 +++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_BoundingBox.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_BoundingBox.cpp
index a79527788..4eea551ec 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_BoundingBox.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_BoundingBox.cpp
@@ -26,7 +26,6 @@
 #include <BRepBndLib.hxx>
 #include <BRep_Builder.hxx>
 #include <Geom_Circle.hxx>
-#include <ShapeAnalysis.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <gp_Pln.hxx>
@@ -105,7 +104,7 @@ Standard_Boolean ModifyShape(const TopoDS_Shape  &theShape,
         double U1,U2,V1,V2;
         // changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88
         //S->Bounds(U1,U2,V1,V2); changed by
-        ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
+        BRepTools::UVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
         // end of changes for 020677 (dmv)
         Handle(Geom_RectangularTrimmedSurface) TrS1 =
           new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_NormalToFace.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_NormalToFace.cpp
index d9c773638..22ee6e03a 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_NormalToFace.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_NormalToFace.cpp
@@ -19,23 +19,27 @@
 
 #include "GeomAlgoAPI_NormalToFace.h"
 
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Ax3.hxx>
-#include <Geom_Plane.hxx>
-#include <gp_Pln.hxx>
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <GProp_GProps.hxx>
-#include <BRepGProp.hxx>
-#include <ShapeAnalysis.hxx>
-#include <ShapeAnalysis_Surface.hxx>
+#include <TopoDS_Shape.hxx>
+
+#include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepBndLib.hxx>
-#include <GeomLProp_SLProps.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepGProp.hxx>
+#include <BRepTools.hxx>
+
+#include <ShapeAnalysis_Surface.hxx>
+
+#include <Geom_Plane.hxx>
 #include <GeomAPI_Edge.h>
+#include <GeomLProp_SLProps.hxx>
+#include <GProp_GProps.hxx>
+
+#include <gp_Ax3.hxx>
+#include <gp_Pln.hxx>
 
  /*!
    * \brief Return type of shape for explode. In case of compound it will be a type of its first sub shape.
@@ -155,7 +159,7 @@ bool GeomAlgoAPI_NormalToFace::normal(GeomShapePtr theFace,
   gp_Ax3 aPos = GetPosition(aFace);
   p1 = aPos.Location();
   // Set default starting point using UV bounds
-  ShapeAnalysis::GetFaceUVBounds(aFace, u1, u2, v1, v2);
+  BRepTools::UVBounds(aFace, u1, u2, v1, v2);
   gp_Pnt2d pUV ((u2 + u1) * 0.5, (v2 + v1) * 0.5);
 
   // Change to Vertex coord if selected
-- 
2.39.2