X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPythonAPI%2Fmodel%2Fsketcher%2Ftools.py;h=dd5e51e15f76bc085ce5dea6074eae4f85d34cc8;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=f3dcdb37a819049f03f325aa1c3e9e48d3783369;hpb=08f1aef6629e6a63cc4671d271ded4de6e826948;p=modules%2Fshaper.git

diff --git a/src/PythonAPI/model/sketcher/tools.py b/src/PythonAPI/model/sketcher/tools.py
index f3dcdb37a..dd5e51e15 100644
--- a/src/PythonAPI/model/sketcher/tools.py
+++ b/src/PythonAPI/model/sketcher/tools.py
@@ -1,24 +1,24 @@
-## Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
-##
+# 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
@@ -68,7 +68,7 @@ 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)
@@ -112,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"))