From 365ebf9a81d1b39252de844ce1b74c2d307c758e Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 3 Dec 2016 13:00:56 -0200 Subject: [PATCH] Draft: Applied Werners patch --- src/Mod/Draft/Draft.py | 2 +- src/Mod/Draft/DraftGeomUtils.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index d6a46e0fa..f22252bf7 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3166,7 +3166,7 @@ def upgrade(objects,delete=False,force=None): else: # turn to Draft line e = objects[0].Shape.Edges[0] - if isinstance(e.Curve,Part.LineSegment): + if isinstance(e.Curve,(Part.LineSegment,Part.Line)): result = turnToLine(objects[0]) if result: msg(translate("draft", "Found 1 linear object: converting to line\n")) diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py index a45576264..1312a6b73 100755 --- a/src/Mod/Draft/DraftGeomUtils.py +++ b/src/Mod/Draft/DraftGeomUtils.py @@ -105,7 +105,7 @@ def isPtOnEdge(pt,edge) : def hasCurves(shape): "hasCurve(shape): checks if the given shape has curves" for e in shape.Edges: - if not isinstance(e.Curve,Part.LineSegment): + if not isinstance(e.Curve,(Part.LineSegment,Part.Line)): return True return False @@ -159,9 +159,9 @@ def getQuad(face): def areColinear(e1,e2): """areColinear(e1,e2): returns True if both edges are colinear""" - if not isinstance(e1.Curve,Part.LineSegment): + if not isinstance(e1.Curve,(Part.LineSegment,Part.Line)): return False - if not isinstance(e2.Curve,Part.LineSegment): + if not isinstance(e2.Curve,(Part.LineSegment,Part.Line)): return False v1 = vec(e1) v2 = vec(e2) @@ -188,7 +188,7 @@ def hasOnlyWires(shape): def geomType(edge): "returns the type of geom this edge is based on" try: - if (isinstance(edge.Curve,Part.LineSegment) or isinstance(edge.Curve,Part.Line)): + if isinstance(edge.Curve,(Part.LineSegment,Part.Line)): return "Line" elif isinstance(edge.Curve,Part.Circle): return "Circle"