[bos #36169] EDF 25230 - Conversion xyz => uv => xyz. Replace all calls of ShapeAnaly...

diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx
index 2efe14556eeb13f0f82a717a38bc101d50003dce..13c6c9b21a0940feed76f7f3016820db3402d04f 100644 (file)
--- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx
+++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx
@@ -26,8 +26,6 @@
 
 #include <BlockFix_SphereSpaceModifier.hxx>
 
-#include <ShapeAnalysis.hxx>
-
 #include <ShapeFix_Edge.hxx>
 
 #include <TopExp.hxx>
@@ -109,7 +107,7 @@ static Standard_Boolean ModifySurface(const TopoDS_Face&          theFace,
 
   if (aSurf->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) {
     Standard_Real Umin, Umax, Vmin, Vmax;
-    ShapeAnalysis::GetFaceUVBounds (aFace, Umin, Umax, Vmin, Vmax);
+    BRepTools::UVBounds(aFace, Umin, Umax, Vmin, Vmax);
     Standard_Real PI2 = M_PI/2.;
     Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(aSurf);
     gp_Sphere sp = aSphere->Sphere();

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index 7f6fbf71decf454f800d85e6714f580bc9a538fa..00d66594dd7fa0b649a7d6cb2ebaa5871ba07b59 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -73,7 +73,6 @@
 #include <Geom_Plane.hxx>
 #include <GProp_GProps.hxx>
 #include <GProp_PrincipalProps.hxx>
-#include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -2797,7 +2796,7 @@ Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByParam
 
   //Compute the parameters
   Standard_Real U1,U2,V1,V2;
-  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  BRepTools::UVBounds(F,U1,U2,V1,V2);
   Standard_Real U = U1 + (U2-U1)*theUParam;
   Standard_Real V = V1 + (V2-V1)*theVParam;
 
@@ -2870,7 +2869,7 @@ Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByParam
 
   //Compute the parameters
   Standard_Real U1,U2,V1,V2;
-  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  BRepTools::UVBounds(F,U1,U2,V1,V2);
   Standard_Real U = U1 + (U2-U1)*theUParam;
   Standard_Real V = V1 + (V2-V1)*theVParam;
 

diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
index a29b34fc655a4f8644790f6940221fd2e75919f8..3bdf3004ec128d61b0fd8e75b19c535df04ccfc7 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
@@ -33,7 +33,7 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
-#include <ShapeAnalysis.hxx>
+#include <BRepTools.hxx>
 
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
@@ -152,7 +152,7 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(Handle(TFunction_Logbook)& log) c
     Standard_Real aKoefU = aPI.GetParameterU();
     Standard_Real aKoefV = aPI.GetParameterV();
     Standard_Real aUmin,aUmax,aVmin,aVmax;
-    ShapeAnalysis::GetFaceUVBounds(aFace,aUmin,aUmax,aVmin,aVmax);
+    BRepTools::UVBounds(aFace,aUmin,aUmax,aVmin,aVmax);
     Standard_Real aDeltaU = aUmax - aUmin;
     Standard_Real aDeltaV = aVmax - aVmin;
     Standard_Real aParamU =  aUmin + aDeltaU*aKoefU;

diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
index 932d9e9917659e7be788b869c40f97b41d41b397..6cb28d155a158c352d0a2d507d0a2efc214f2de2 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
@@ -30,13 +30,12 @@
 #include <GEOM_Function.hxx>
 #include <GEOMAlgo_AlgoTools.hxx>
 
-#include <ShapeAnalysis.hxx>
-
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepTools.hxx>
 
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
@@ -282,8 +281,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) c
     TopoDS_Face F = TopoDS::Face(aRefShape);
     Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
     Standard_Real U1,U2,V1,V2;
-    //aSurf->Bounds(U1,U2,V1,V2);
-    ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+    BRepTools::UVBounds(F,U1,U2,V1,V2);
     Standard_Real U = U1 + (U2-U1) * aPI.GetParameter();
     Standard_Real V = V1 + (V2-V1) * aPI.GetParameter2();
     aPnt = aSurf->Value(U,V);

diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
index c85c46675eff9db4d93c2d32b67f1cca7cb2b5d7..3d00b9ac766f1f854da21e29eba27e89d69b4e6b 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
@@ -56,9 +56,9 @@
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
+#include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
 
-#include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
 
 #include <TNaming_CopyShape.hxx>
@@ -869,7 +869,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) c
 
       // Construct a real geometric parameter.
       aFace.Orientation(TopAbs_FORWARD);
-      ShapeAnalysis::GetFaceUVBounds(aFace,U1,U2,V1,V2);
+      BRepTools::UVBounds(aFace,U1,U2,V1,V2);
 
       if (isUIso) {
         aParam = U1 + (U2 - U1)*aParam;
@@ -934,7 +934,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) c
 
          // Get U, V bounds of the face.
         aFace.Orientation(TopAbs_FORWARD);
-        ShapeAnalysis::GetFaceUVBounds(aFace, aU1, aU2, aV1, aV2);
+        BRepTools::UVBounds(aFace, aU1, aU2, aV1, aV2);
 
         // Get the surface of original type
         while (aType == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) {
@@ -1820,7 +1820,7 @@ TopoDS_Shape GEOMImpl_ShapeDriver::ExtendFace
   Standard_Real        aV2;
 
   // Get U, V bounds of the face.
-  ShapeAnalysis::GetFaceUVBounds(theFace, aU1, aU2, aV1, aV2);
+  BRepTools::UVBounds(theFace, aU1, aU2, aV1, aV2);
 
   const Standard_Real aURange = aU2 - aU1;
   const Standard_Real aVRange = aV2 - aV1;
@@ -2045,6 +2045,7 @@ GetCreationInformation(std::string&             theOperationName,
 IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver)
 
 //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
+/*
 #include <TopoDS_Iterator.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
@@ -2057,7 +2058,6 @@ IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver)
 //function : KeepEdgesOrder
 //purpose  : 
 //=======================================================================
-/*
 void KeepEdgesOrder(const Handle(TopTools_HSequenceOfShape)& aEdges,
                     const Handle(TopTools_HSequenceOfShape)& aWires)
 {

diff --git a/src/GEOMUtils/GEOMUtils.cxx b/src/GEOMUtils/GEOMUtils.cxx
index 8e4f1075ac2272d97ba73005e78a367c978c8168..045712102958c2286c436ce26792ba184e4597f6 100644 (file)
--- a/src/GEOMUtils/GEOMUtils.cxx
+++ b/src/GEOMUtils/GEOMUtils.cxx
@@ -87,7 +87,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Lin.hxx>
 
-#include <ShapeAnalysis.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 
@@ -180,9 +179,7 @@ namespace
 
         // non solid case or any periodic surface (Mantis 22454).
         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);