Fixed "prnt" function to properly limit to 4 decimal places

Greatly simplify rebaseWire
FreeCAD · Feb 21, 2016 · 3775956 · 3775956
1 parent a3209e1
commit 3775956
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py
@@ -2075,20 +2075,8 @@ def rebaseWire(wire,vidx):
     if vidx > len(wire.Vertexes):
         #print("Vertex index above maximum\n")
         return wire
-    basepoint = wire.Vertexes[vidx-1].Point
-    #wire = Part.__sortEdges__(wire)
-    edges = []
-    start = False
-    for i in range(len(wire.Edges)):
-        if wire.Edges[i].Vertexes[0].Point == basepoint:
-            start = True
-            edges.append(wire.Edges[i])
-        elif start:
-            edges.append(wire.Edges[i])
-    if len(edges) < len(wire.Edges):
-        f = len(wire.Edges) - len(edges)
-        edges.extend(wire.Edges[0:f])
-    return Part.Wire(edges)
+    #This can be done in one step
+    return Part.Wire(wire.Edges[vidx-1:] + wire.Edges[:vidx-1])
 
 
 # circle functions *********************************************************

diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py
@@ -179,7 +179,7 @@ def execute(self,obj):
 #            print "finishDepth" + str(obj.FinishDepth)
 #            print "offsets:", len(offsets)
 
-            def prnt(vlu): return str(round(vlu, 4))
+            def prnt(vlu): return str("%.4f" % round(vlu, 4))
 
             for vpos in frange(obj.StartDepth, obj.FinalDepth, obj.StepDown, obj.FinishDepth):
 #                print "vpos: " + str(vpos)