Merge pull request #11426 from Roy-043/Draft-minor-updates-related-to-precision-pref

Draft: minor updates related to precision pref

src/Mod/Draft/DraftGui.py

@@ -1345,7 +1345,7 @@ class DraftToolBar:
             self.angleValue.setText(displayExternal(phi,None,'Angle'))
             if not mask:
                 # automask, phi is rounded to identify one of the below cases
-                phi = round(phi, Draft.getParam("precision"))
+                phi = round(phi, Draft.precision())
                 if phi in [0,180,-180]:
                     mask = "x"
                 elif phi in [90,270,-90,-270]:

src/Mod/Draft/draftgeoutils/faces.py

@@ -30,7 +30,6 @@ import lazy_loader.lazy_loader as lz
 
 import DraftVecUtils
 from FreeCAD import Base
-from draftgeoutils.general import precision
 from draftgeoutils.geometry import are_coplanar
 
 # Delay import of module until first use because it is heavy

src/Mod/Draft/importDXF.py

@@ -203,11 +203,6 @@ def getDXFlibs():
             FCC.PrintWarning("DXF libraries not available. Aborting.\n")
 
 
-def prec():
-    """Return the current Draft precision level."""
-    return Draft.getParam("precision", 6)
-
-
 def deformat(text):
     """Remove weird formats in texts and wipes UTF characters.
 
@@ -712,14 +707,15 @@ def vec(pt):
     -----
     Use local variables, not global variables.
     """
+    pre = Draft.precision()
     if isinstance(pt, (int, float)):
-        v = round(pt, prec())
+        v = round(pt, pre)
         if resolvedScale != 1:
             v = v * resolvedScale
     else:
-        v = Vector(round(pt[0], prec()),
-                   round(pt[1], prec()),
-                   round(pt[2], prec()))
+        v = Vector(round(pt[0], pre),
+                   round(pt[1], pre),
+                   round(pt[2], pre))
         if resolvedScale != 1:
             v.multiply(resolvedScale)
     return v
@@ -994,10 +990,11 @@ def drawArc(arc, forceShape=False):
     -----
     Use local variables, not global variables.
     """
+    pre = Draft.precision()
     pl = placementFromDXFOCS(arc)
     rad = vec(arc.radius)
-    firstangle = round(arc.start_angle%360, prec())
-    lastangle = round(arc.end_angle%360, prec())
+    firstangle = round(arc.start_angle%360, pre)
+    lastangle = round(arc.end_angle%360, pre)
     try:
         if (dxfCreateDraft or dxfCreateSketch) and (not forceShape):
             return Draft.make_circle(rad, pl, face=False,
@@ -1094,9 +1091,10 @@ def drawEllipse(ellipse, forceShape=False):
     Use local variables, not global variables.
     """
     try:
+        pre = Draft.precision()
         c = vec(ellipse.loc)
-        start = round(ellipse.start_angle, prec())
-        end = round(ellipse.end_angle, prec())
+        start = round(ellipse.start_angle, pre)
+        end = round(ellipse.end_angle, pre)
         majv = vec(ellipse.major)
         majr = majv.Length
         minr = majr*ellipse.ratio
@@ -1108,7 +1106,7 @@ def drawEllipse(ellipse, forceShape=False):
         pl = FreeCAD.Placement(m)
         pl.move(c)
         if (dxfCreateDraft or dxfCreateSketch) and (not forceShape):
-            if (start != 0.0) or ((end != 0.0) or (end != round(math.pi/2, prec()))):
+            if (start != 0.0) or ((end != 0.0) or (end != round(math.pi/2, pre))):
                 shape = el.toShape(start, end)
                 shape.Placement = pl
                 return shape