updated copyright message

[modules/shaper.git] / src / PythonAPI / model / sketcher / tools.py

diff --git a/src/PythonAPI/model/sketcher/tools.py b/src/PythonAPI/model/sketcher/tools.py
index 49a73bfbdeaac0b8183824abac7f1590db18aed7..dd5e51e15f76bc085ce5dea6074eae4f85d34cc8 100644 (file)
--- a/src/PythonAPI/model/sketcher/tools.py
+++ b/src/PythonAPI/model/sketcher/tools.py
@@ -1,7 +1,24 @@
-# Author: Sergey Pokhodenko
-# Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+# Copyright (C) 2014-2023  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
+#
 
 import ModelHighAPI
+from GeomAPI import *
 from GeomDataAPI import *
 from ModelAPI import *
 import math
@@ -51,14 +68,14 @@ def dof(sketch):
     aSketch = sketch
     if issubclass(type(aSketch), ModelHighAPI.ModelHighAPI_Interface):
         aSketch = sketch.feature()
-    return int(filter(str.isdigit, aSketch.string("SolverDOF").value()))
+    return int(''.join(filter(str.isdigit, aSketch.string("SolverDOF").value())))
 
 def distancePointPoint(thePoint1, thePoint2):
     aPnt1 = toList(thePoint1)
     aPnt2 = toList(thePoint2)
     return math.hypot(aPnt1[0] - aPnt2[0], aPnt1[1] - aPnt2[1])
 
-def distancePointLine(thePoint, theLine):
+def signedDistancePointLine(thePoint, theLine):
     aPoint = toList(thePoint)
     aLine = toSketchFeature(theLine)
 
@@ -67,7 +84,10 @@ def distancePointLine(thePoint, theLine):
     aLineDir = aLineEnd.decreased(aLineStart)
     aLineLen = aLineEnd.distance(aLineStart)
     aCross = (aPoint[0] - aLineStart.x()) * aLineDir.y() - (aPoint[1] - aLineStart.y()) * aLineDir.x()
-    return math.fabs(aCross / aLineLen)
+    return aCross / aLineLen
+
+def distancePointLine(thePoint, theLine):
+    return math.fabs(signedDistancePointLine(thePoint, theLine))
 
 def lastSubFeature(theSketch, theKind):
     """
@@ -92,6 +112,8 @@ def toList(thePoint):
         return thePoint
     elif issubclass(type(thePoint), GeomDataAPI_Point2D):
         return [thePoint.x(), thePoint.y()]
+    elif issubclass(type(thePoint), GeomAPI_Pnt2d):
+        return [thePoint.x(), thePoint.y()]
     else:
         aFeature = toSketchFeature(thePoint)
         aPoint = geomDataAPI_Point2D(aFeature.attribute("PointCoordinates"))