X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_EdgeBuilder.cpp;h=85828425c2aaee9eb5e56004d8c001554101eb30;hb=b61a166879fa2a8a57b0941908a1c18b086e39ab;hp=d6ba70d19919110cfe07087731d15cd75995457f;hpb=08f1aef6629e6a63cc4671d271ded4de6e826948;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp
index d6ba70d19..85828425c 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <GeomAlgoAPI_EdgeBuilder.h>
@@ -35,52 +34,45 @@
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
 
+static GeomEdgePtr createLine(const gp_Pnt& theStart, const gp_Pnt& theEnd)
+{
+  GeomEdgePtr aRes;
+  if (!theStart.IsEqual(theEnd, Precision::Confusion()) &&
+    Abs(theStart.SquareDistance(theEnd)) < 1.e+100) {
+    BRepBuilderAPI_MakeEdge anEdgeBuilder(theStart, theEnd);
+    TopoDS_Edge anEdge = anEdgeBuilder.Edge();
+    aRes = GeomEdgePtr(new GeomAPI_Edge);
+    aRes->setImpl(new TopoDS_Shape(anEdge));
+  }
+  return aRes;
+}
+
 std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::line(
     std::shared_ptr<GeomAPI_Pnt> theStart, std::shared_ptr<GeomAPI_Pnt> theEnd)
 {
   const gp_Pnt& aStart = theStart->impl<gp_Pnt>();
   const gp_Pnt& anEnd = theEnd->impl<gp_Pnt>();
-
-  if (aStart.IsEqual(anEnd, Precision::Confusion()))
-    return std::shared_ptr<GeomAPI_Edge>();
-  if (Abs(aStart.SquareDistance(anEnd)) > 1.e+100)
-    return std::shared_ptr<GeomAPI_Edge>();
-  BRepBuilderAPI_MakeEdge anEdgeBuilder(aStart, anEnd);
-  std::shared_ptr<GeomAPI_Edge> aRes(new GeomAPI_Edge);
-  TopoDS_Edge anEdge = anEdgeBuilder.Edge();
-  aRes->setImpl(new TopoDS_Shape(anEdge));
-  return aRes;
+  return createLine(aStart, anEnd);
 }
 std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::line(
     double theDX, double theDY, double theDZ)
 {
-
   const gp_Pnt& aStart = gp_Pnt(0, 0, 0);
   const gp_Pnt& anEnd = gp_Pnt(theDX, theDY, theDZ);
-
-  if (aStart.IsEqual(anEnd, Precision::Confusion()))
-    return std::shared_ptr<GeomAPI_Edge>();
-  if (Abs(aStart.SquareDistance(anEnd)) > 1.e+100)
-    return std::shared_ptr<GeomAPI_Edge>();
-  BRepBuilderAPI_MakeEdge anEdgeBuilder(aStart, anEnd);
-  std::shared_ptr<GeomAPI_Edge> aRes(new GeomAPI_Edge);
-  TopoDS_Edge anEdge = anEdgeBuilder.Edge();
-  aRes->setImpl(new TopoDS_Shape(anEdge));
-  return aRes;
+  return createLine(aStart, anEnd);
 }
 
 std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::line(
     const std::shared_ptr<GeomAPI_Lin> theLin)
 {
-  if(!theLin.get()) {
-    return std::shared_ptr<GeomAPI_Edge>();
+  GeomEdgePtr aRes;
+  if (theLin.get()) {
+    const gp_Lin& aLin = theLin->impl<gp_Lin>();
+    BRepBuilderAPI_MakeEdge anEdgeBuilder(aLin);
+    TopoDS_Edge anEdge = anEdgeBuilder.Edge();
+    aRes = GeomEdgePtr(new GeomAPI_Edge);
+    aRes->setImpl(new TopoDS_Shape(anEdge));
   }
-
-  const gp_Lin& aLin = theLin->impl<gp_Lin>();
-  BRepBuilderAPI_MakeEdge anEdgeBuilder(aLin);
-  std::shared_ptr<GeomAPI_Edge> aRes(new GeomAPI_Edge());
-  TopoDS_Edge anEdge = anEdgeBuilder.Edge();
-  aRes->setImpl(new TopoDS_Shape(anEdge));
   return aRes;
 }
 
@@ -140,7 +132,9 @@ std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::cylinderAxis(
   aParamMax += aDelta * 0.1;
 
   gp_Pnt aStart(aParamMin * anAxis.Direction().XYZ() + anAxis.Location().XYZ());
+  aStart.Transform(aLoc.Transformation());
   gp_Pnt anEnd(aParamMax * anAxis.Direction().XYZ() + anAxis.Location().XYZ());
+  anEnd.Transform(aLoc.Transformation());
   /*
   gp_Pnt aStart(anAxis.Location().Transformed(aLoc.Transformation()));
   // edge length is 100, "-" because cylinder of extrusion has negative direction with the cylinder
@@ -176,15 +170,14 @@ std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::lineCircle(
 std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_EdgeBuilder::lineCircle(
     std::shared_ptr<GeomAPI_Circ> theCircle)
 {
-  if(!theCircle.get()) {
-    return std::shared_ptr<GeomAPI_Edge>();
+  GeomEdgePtr aRes;
+  if (theCircle.get()) {
+    const gp_Circ& aCirc = theCircle->impl<gp_Circ>();
+    BRepBuilderAPI_MakeEdge anEdgeBuilder(aCirc);
+    TopoDS_Edge anEdge = anEdgeBuilder.Edge();
+    aRes = GeomEdgePtr(new GeomAPI_Edge);
+    aRes->setImpl(new TopoDS_Shape(anEdge));
   }
-
-  const gp_Circ& aCirc = theCircle->impl<gp_Circ>();
-  BRepBuilderAPI_MakeEdge anEdgeBuilder(aCirc);
-  std::shared_ptr<GeomAPI_Edge> aRes(new GeomAPI_Edge());
-  TopoDS_Edge anEdge = anEdgeBuilder.Edge();
-  aRes->setImpl(new TopoDS_Shape(anEdge));
   return aRes;
 }