X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Pln.cpp;h=8dcce0a701aca40d6bc7748a6b3404dddcaecccf;hb=73502ac782ffc45a3acf665ded34f582b07ec4d5;hp=d018031022c9dcb84c6a11f0f2a6cd9067769fbe;hpb=f11baf398313d8250c878ef7923879c527d1c0e1;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Pln.cpp b/src/GeomAPI/GeomAPI_Pln.cpp
index d01803102..8dcce0a70 100644
--- a/src/GeomAPI/GeomAPI_Pln.cpp
+++ b/src/GeomAPI/GeomAPI_Pln.cpp
@@ -1,36 +1,94 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Pln.cpp
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#include<GeomAPI_Pln.h>
+#include <GeomAPI_Pln.h>
+#include <GeomAPI_Ax3.h>
 #include <GeomAPI_Pnt.h>
 #include <GeomAPI_Dir.h>
+#include <GeomAPI_Lin.h>
+#include <GeomAPI_XYZ.h>
 
-#include<gp_Pln.hxx>
+#include <gp_Pln.hxx>
 
 using namespace std;
 
-GeomAPI_Pln::GeomAPI_Pln(const boost::shared_ptr<GeomAPI_Pnt>& thePoint,
-            const boost::shared_ptr<GeomAPI_Dir>& theNormal)
-: GeomAPI_Interface(new gp_Pln(thePoint->impl<gp_Pnt>(),
-                               theNormal->impl<gp_Dir>()))
+GeomAPI_Pln::GeomAPI_Pln(const std::shared_ptr<GeomAPI_Ax3>& theAxis)
+: GeomAPI_Interface(new gp_Ax3(theAxis->impl<gp_Ax3>()))
+{
+}
+
+GeomAPI_Pln::GeomAPI_Pln(const std::shared_ptr<GeomAPI_Pnt>& thePoint,
+                         const std::shared_ptr<GeomAPI_Dir>& theNormal)
+    : GeomAPI_Interface(new gp_Pln(thePoint->impl<gp_Pnt>(), theNormal->impl<gp_Dir>()))
 {
 }
 
-GeomAPI_Pln::GeomAPI_Pln(
-  const double theA, const double theB, const double theC, const double theD)
-: GeomAPI_Interface(new gp_Pln(theA, theB, theC, theD))
+GeomAPI_Pln::GeomAPI_Pln(const double theA, const double theB, const double theC, const double theD)
+    : GeomAPI_Interface(new gp_Pln(theA, theB, theC, theD))
 {
 }
 
-boost::shared_ptr<GeomAPI_Pnt> GeomAPI_Pln::location()
+std::shared_ptr<GeomAPI_Pnt> GeomAPI_Pln::location() const
 {
   gp_Pnt aLoc = impl<gp_Pln>().Location();
-  return boost::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aLoc.X(), aLoc.Y(), aLoc.Z()));
+  return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aLoc.X(), aLoc.Y(), aLoc.Z()));
 }
 
-boost::shared_ptr<GeomAPI_Dir> GeomAPI_Pln::direction()
+std::shared_ptr<GeomAPI_Dir> GeomAPI_Pln::direction() const
 {
   const gp_Dir& aDir = impl<gp_Pln>().Axis().Direction();
-  return boost::shared_ptr<GeomAPI_Dir>(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z()));
+  return std::shared_ptr<GeomAPI_Dir>(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z()));
+}
+
+std::shared_ptr<GeomAPI_Dir> GeomAPI_Pln::xDirection() const
+{
+  const gp_Dir& aDir = impl<gp_Pln>().XAxis().Direction();
+  return std::shared_ptr<GeomAPI_Dir>(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z()));
+}
+
+void GeomAPI_Pln::coefficients(double& theA, double& theB, double& theC, double& theD)
+{
+  impl<gp_Pln>().Coefficients(theA, theB, theC, theD);
+}
+
+bool GeomAPI_Pln::isCoincident(const std::shared_ptr<GeomAPI_Pln> thePlane, const double theTolerance)
+{
+  if(!thePlane.get()) {
+    return false;
+  }
+
+  const gp_Pln& aMyPln = impl<gp_Pln>();
+  const gp_Pln& anOtherPln = thePlane->impl<gp_Pln>();
+  return (aMyPln.Contains(anOtherPln.Location(), theTolerance) && aMyPln.Axis().IsParallel(anOtherPln.Axis(), theTolerance));
+}
+
+std::shared_ptr<GeomAPI_Pnt> GeomAPI_Pln::intersect(const std::shared_ptr<GeomAPI_Lin>& theLine) const
+{
+  std::shared_ptr<GeomAPI_XYZ> aLineDir = theLine->direction()->xyz();
+  std::shared_ptr<GeomAPI_XYZ> aLineLoc = theLine->location()->xyz();
+
+  std::shared_ptr<GeomAPI_XYZ> aNormal = direction()->xyz();
+  std::shared_ptr<GeomAPI_XYZ> aLocation = location()->xyz();
+
+  double aDot = aNormal->dot(aLineDir);
+  if (Abs(aDot) < Precision::SquareConfusion())
+    return std::shared_ptr<GeomAPI_Pnt>();
+
+  double aParam = aNormal->dot(aLocation->decreased(aLineLoc)) / aDot;
+  return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aLineLoc->added(aLineDir->multiplied(aParam))));
+}
+
+std::shared_ptr<GeomAPI_Pnt> GeomAPI_Pln::project(const std::shared_ptr<GeomAPI_Pnt>& thePoint) const
+{
+  std::shared_ptr<GeomAPI_XYZ> aNormal = direction()->xyz();
+  std::shared_ptr<GeomAPI_XYZ> aLocation = location()->xyz();
+
+  std::shared_ptr<GeomAPI_XYZ> aVec = thePoint->xyz()->decreased(aLocation);
+  double aDot = aNormal->dot(aVec);
+  std::shared_ptr<GeomAPI_XYZ> aProjection = 
+      aLocation->added(aVec->decreased(aNormal->multiplied(aDot)));
+  return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aProjection));
 }