Make SHAPER STUDY fields exported in SMESH into MED file

[modules/shaper.git] / src / GeomAPI / GeomAPI_Angle.cpp

diff --git a/src/GeomAPI/GeomAPI_Angle.cpp b/src/GeomAPI/GeomAPI_Angle.cpp
index 97d45ee3ec22f1fd73495f1e8335711432964c6b..02e16ef892f84ca629299ab46c8edf1945477d5f 100644 (file)
--- a/src/GeomAPI/GeomAPI_Angle.cpp
+++ b/src/GeomAPI/GeomAPI_Angle.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-20xx  CEA/DEN, EDF R&D
+// Copyright (C) 2018-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 <GeomAPI_Angle.h>
@@ -58,16 +57,36 @@ GeomAPI_Angle::GeomAPI_Angle(const std::shared_ptr<GeomAPI_Edge>& theEdge1,
   gp_Pnt aP;
 
   GeomAPI_ProjectPointOnCurve aProj1(aPoint, aCurve1);
-  if (aProj1.NbPoints() > 0)
-    aCurve1->D1(aProj1.Parameter(1), aP, anAngle->myDir1);
+  if (aProj1.NbPoints() > 0) {
+    aCurve1->D1(aProj1.LowerDistanceParameter(), aP, anAngle->myDir1);
+    if (aCurve1->Value(aF1).SquareDistance(aPoint) < aCurve1->Value(aL1).SquareDistance(aPoint))
+      anAngle->myDir1.Reverse();
+  }
 
   GeomAPI_ProjectPointOnCurve aProj2(aPoint, aCurve2);
-  if (aProj2.NbPoints() > 0)
-    aCurve2->D1(aProj2.Parameter(1), aP, anAngle->myDir2);
+  if (aProj2.NbPoints() > 0) {
+    aCurve2->D1(aProj2.LowerDistanceParameter(), aP, anAngle->myDir2);
+    if (aCurve2->Value(aF2).SquareDistance(aPoint) < aCurve2->Value(aL2).SquareDistance(aPoint))
+      anAngle->myDir2.Reverse();
+  }
 
   setImpl(anAngle);
 }
 
+GeomAPI_Angle::GeomAPI_Angle(const std::shared_ptr<GeomAPI_Pnt>& thePoint1,
+                             const std::shared_ptr<GeomAPI_Pnt>& thePoint2,
+                             const std::shared_ptr<GeomAPI_Pnt>& thePoint3)
+{
+  gp_Pnt aPoint1 = thePoint1->impl<gp_Pnt>();
+  gp_Pnt aPoint2 = thePoint2->impl<gp_Pnt>();
+  gp_Pnt aPoint3 = thePoint3->impl<gp_Pnt>();
+
+  AngleDirections* anAngle = new AngleDirections;
+  anAngle->myDir1.SetXYZ(aPoint1.XYZ() - aPoint2.XYZ());
+  anAngle->myDir2.SetXYZ(aPoint3.XYZ() - aPoint2.XYZ());
+  setImpl(anAngle);
+}
+
 double GeomAPI_Angle::angleDegree()
 {
   return angleRadian() * 180.0 / PI;