suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FreeCAD/FreeCAD

Browse Source
This commit is contained in:
wmayer 2015-09-08 19:17:58 +02:00
commit 3c10cd1af2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Draft/DraftGeomUtils.py
View File

@ -664,9 +664,9 @@ def isLine(bsp):
def sortEdges(edges): def sortEdges(edges):
"Deprecated. Use Part__sortEdges__ instead" "Deprecated. Use Part.__sortEdges__ instead"
raise DeprecationWarning("Deprecated. Use Part__sortEdges__ instead") raise DeprecationWarning("Deprecated. Use Part.__sortEdges__ instead")
# Build a dictionary of edges according to their end points. # Build a dictionary of edges according to their end points.
# Each entry is a set of edges that starts, or ends, at the # Each entry is a set of edges that starts, or ends, at the
@ -742,9 +742,9 @@ def sortEdges(edges):
def sortEdgesOld(lEdges, aVertex=None): def sortEdgesOld(lEdges, aVertex=None):
"Deprecated. Use Part__sortEdges__ instead" "Deprecated. Use Part.__sortEdges__ instead"
raise DeprecationWarning("Deprecated. Use Part__sortEdges__ instead") raise DeprecationWarning("Deprecated. Use Part.__sortEdges__ instead")
#There is no reason to limit this to lines only because every non-closed edge always #There is no reason to limit this to lines only because every non-closed edge always
#has exactly two vertices (wmayer) #has exactly two vertices (wmayer)
@ -1601,7 +1601,7 @@ def getCubicDimensions(shape):
def removeInterVertices(wire): def removeInterVertices(wire):
'''removeInterVertices(wire) - remove unneeded vertices (those that '''removeInterVertices(wire) - remove unneeded vertices (those that
are in the middle of a straight line) from a wire, returns a new wire.''' are in the middle of a straight line) from a wire, returns a new wire.'''
edges = Part__sortEdges__(wire.Edges) edges = Part.__sortEdges__(wire.Edges)
nverts = [] nverts = []
def getvec(v1,v2): def getvec(v1,v2):
if not abs(round(v1.getAngle(v2),precision()) in [0,round(math.pi,precision())]): if not abs(round(v1.getAngle(v2),precision()) in [0,round(math.pi,precision())]):
@ -1673,7 +1673,7 @@ def fillet(lEdges,r,chamfer=False):
return existingCurveType return existingCurveType
rndEdges = lEdges[0:2] rndEdges = lEdges[0:2]
rndEdges = Part__sortEdges__(rndEdges) rndEdges = Part.__sortEdges__(rndEdges)
if len(rndEdges) < 2 : if len(rndEdges) < 2 :
return rndEdges return rndEdges