From a7f01520fbcac6a489a25a6657bc8edec6a0eb23 Mon Sep 17 00:00:00 2001
From: dbv <dbv@opencascade.com>
Date: Fri, 22 May 2015 20:01:39 +0300
Subject: [PATCH] Fix for GeomAlgoAPI_FaceBuidler method name change.

---
 src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp | 29 ++++++++++++---------
 src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h   | 12 ++++++---
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp
index d03b76169..fd014f73f 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.cpp
@@ -42,18 +42,6 @@ std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_FaceBuilder::square(
   return aRes;
 }
 
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_FaceBuilder::plane(std::shared_ptr<GeomAPI_Pnt> theCenter,
-                                                              std::shared_ptr<GeomAPI_Dir> theNormal)
-{
-  const gp_Pnt& aCenter = theCenter->impl<gp_Pnt>();
-  const gp_Dir& aDir = theNormal->impl<gp_Dir>();
-  gp_Pln aPlane(aCenter, aDir);
-  BRepBuilderAPI_MakeFace aFaceBuilder(aPlane);
-  std::shared_ptr<GeomAPI_Shape> aRes(new GeomAPI_Shape);
-  aRes->setImpl(new TopoDS_Shape(aFaceBuilder.Face()));
-  return aRes;
-}
-
 std::shared_ptr<GeomAPI_Pln> GeomAlgoAPI_FaceBuilder::plane(
     std::shared_ptr<GeomAPI_Shape> theFace)
 {
@@ -82,6 +70,23 @@ std::shared_ptr<GeomAPI_Pln> GeomAlgoAPI_FaceBuilder::plane(
   return aResult;
 }
 
+std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_FaceBuilder::planarFace(std::shared_ptr<GeomAPI_Ax1> theAxis)
+{
+  return planarFace(theAxis->origin(), theAxis->dir());
+}
+
+std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_FaceBuilder::planarFace(std::shared_ptr<GeomAPI_Pnt> theCenter,
+                                                                   std::shared_ptr<GeomAPI_Dir> theNormal)
+{
+  const gp_Pnt& aCenter = theCenter->impl<gp_Pnt>();
+  const gp_Dir& aDir = theNormal->impl<gp_Dir>();
+  gp_Pln aPlane(aCenter, aDir);
+  BRepBuilderAPI_MakeFace aFaceBuilder(aPlane);
+  std::shared_ptr<GeomAPI_Shape> aRes(new GeomAPI_Shape);
+  aRes->setImpl(new TopoDS_Shape(aFaceBuilder.Face()));
+  return aRes;
+}
+
 std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_FaceBuilder::planarFace(std::shared_ptr<GeomAPI_Pln> thePlane,
              double theX, double theY,
              double theWidth, double theHeight)
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
index 9f15bb5c0..204e0f36c 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
@@ -8,6 +8,7 @@
 #define GeomAlgoAPI_FaceBuilder_H_
 
 #include <GeomAlgoAPI.h>
+#include <GeomAPI_Ax1.h>
 #include <GeomAPI_Shape.h>
 #include <GeomAPI_Pnt.h>
 #include <GeomAPI_Pln.h>
@@ -32,13 +33,16 @@ class GEOMALGOAPI_EXPORT GeomAlgoAPI_FaceBuilder
   static std::shared_ptr<GeomAPI_Shape> square(std::shared_ptr<GeomAPI_Pln> thePlane,
                                                const double theSize);
 
-  /// Creates the plane by given point of the center and normal to the plane.
-  static std::shared_ptr<GeomAPI_Shape> plane(std::shared_ptr<GeomAPI_Pnt> theCenter,
-                                            std::shared_ptr<GeomAPI_Dir> theNormal);
-
   /// Returns the plane of the planar face. If it is not planar, returns empty ptr.
   static std::shared_ptr<GeomAPI_Pln> plane(std::shared_ptr<GeomAPI_Shape> theFace);
 
+  /// Creates the planar face by given axis.
+  static std::shared_ptr<GeomAPI_Shape> planarFace(std::shared_ptr<GeomAPI_Ax1> theAxis);
+
+  /// Creates the planar face by given point of the center and normal to the plane.
+  static std::shared_ptr<GeomAPI_Shape> planarFace(std::shared_ptr<GeomAPI_Pnt> theCenter,
+                                                   std::shared_ptr<GeomAPI_Dir> theNormal);
+
   /// Creates a planar face by given plane, left lower point and size.
   static std::shared_ptr<GeomAPI_Shape> planarFace(std::shared_ptr<GeomAPI_Pln> thePlane,
                                                    double theX, double theY,
-- 
2.30.2