X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Pln.cpp;h=c52dda9d659e869e48c55bc1c6e19a1aeebe1977;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=b562a0c41a181b6525ef28ba5583f31c966d9396;hpb=549088655a361679c68e5571d4e72d7661df5b3c;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Pln.cpp b/src/GeomAPI/GeomAPI_Pln.cpp
index b562a0c41..c52dda9d6 100644
--- a/src/GeomAPI/GeomAPI_Pln.cpp
+++ b/src/GeomAPI/GeomAPI_Pln.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAPI_Pln.cpp
-// Created:     23 Apr 2014
-// Author:      Mikhail PONIKAROV
+// 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GeomAPI_Pln.h>
 #include <GeomAPI_Ax3.h>
@@ -15,8 +28,6 @@
 
 #include <IntAna_QuadQuadGeo.hxx>
 
-using namespace std;
-
 GeomAPI_Pln::GeomAPI_Pln(const std::shared_ptr<GeomAPI_Ax3>& theAxis)
 : GeomAPI_Interface(new gp_Ax3(theAxis->impl<gp_Ax3>()))
 {
@@ -56,7 +67,8 @@ void GeomAPI_Pln::coefficients(double& theA, double& theB, double& theC, double&
   impl<gp_Pln>().Coefficients(theA, theB, theC, theD);
 }
 
-bool GeomAPI_Pln::isCoincident(const std::shared_ptr<GeomAPI_Pln> thePlane, const double theTolerance)
+bool GeomAPI_Pln::isCoincident(const std::shared_ptr<GeomAPI_Pln> thePlane,
+                               const double theTolerance)
 {
   if(!thePlane.get()) {
     return false;
@@ -64,22 +76,12 @@ bool GeomAPI_Pln::isCoincident(const std::shared_ptr<GeomAPI_Pln> thePlane, cons
 
   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));
-}
-
-bool GeomAPI_Pln::isParallel(const std::shared_ptr<GeomAPI_Lin> theLine)
-{
-  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);
-  return Abs(aDot) < Precision::SquareConfusion();
+  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_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();
@@ -92,17 +94,19 @@ std::shared_ptr<GeomAPI_Pnt> GeomAPI_Pln::intersect(const std::shared_ptr<GeomAP
     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))));
+  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_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 = 
+  std::shared_ptr<GeomAPI_XYZ> aProjection =
       aLocation->added(aVec->decreased(aNormal->multiplied(aDot)));
   return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aProjection));
 }
@@ -115,6 +119,13 @@ double GeomAPI_Pln::distance(const std::shared_ptr<GeomAPI_Pln> thePlane) const
   return aMyPln.Distance(anOtherPln);
 }
 
+double GeomAPI_Pln::distance(const std::shared_ptr<GeomAPI_Pnt> thePoint) const
+{
+  const gp_Pln& aMyPln = impl<gp_Pln>();
+  const gp_Pnt& aPnt = thePoint->impl<gp_Pnt>();
+  return aMyPln.Distance(aPnt);
+}
+
 void GeomAPI_Pln::translate(const std::shared_ptr<GeomAPI_Dir> theDir, double theDist)
 {
   gp_Vec aVec(theDir->impl<gp_Dir>());
@@ -123,7 +134,8 @@ void GeomAPI_Pln::translate(const std::shared_ptr<GeomAPI_Dir> theDir, double th
   implPtr<gp_Pln>()->Translate(aVec);
 }
 
-std::shared_ptr<GeomAPI_Lin> GeomAPI_Pln::intersect(const std::shared_ptr<GeomAPI_Pln> thePlane) const
+std::shared_ptr<GeomAPI_Lin>
+  GeomAPI_Pln::intersect(const std::shared_ptr<GeomAPI_Pln> thePlane) const
 {
   std::shared_ptr<GeomAPI_Lin> aRes;