From 7a710279ad64c4a29d5bad2c915738f727bfa85c Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 13 Jan 2015 19:07:05 -0200 Subject: [PATCH] Draft: Fixed continued dimension - fixes #1891 --- src/Mod/Draft/DraftGui.py | 1 - src/Mod/Draft/DraftTools.py | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index e71be7d5c..412c6f974 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -1701,7 +1701,6 @@ class DraftToolBar: self.zValue.setText(displayExternal(v.z,self.DECIMALS,'Length')) def changeAngleValue(self,d): - print d v = FreeCAD.Vector(self.x,self.y,self.z) a = DraftVecUtils.angle(v,FreeCAD.DraftWorkingPlane.u,FreeCAD.DraftWorkingPlane.axis) a = math.radians(d)+a diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 243e9b8b8..9640fcf7d 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -1829,7 +1829,7 @@ class Dimension(Creator): self.node[1] = Vector(self.node[1].x,self.node[0].y,self.node[0].z) else: self.force = None - if self.point2: + if self.point2 and (len(self.node) > 1): self.node[1] = self.point2 self.point2 = None # update the dimline @@ -1905,7 +1905,8 @@ class Dimension(Creator): elif (len(self.node) == 2) and self.cont: self.node.append(self.cont) self.createObject() - if not self.cont: self.finish() + if not self.cont: + self.finish() elif (len(self.node) == 3): # for unlinked arc mode: # if self.arcmode: @@ -1914,7 +1915,8 @@ class Dimension(Creator): # cen = self.node[0].add(v) # self.node = [self.node[0],self.node[1],cen] self.createObject() - if not self.cont: self.finish() + if not self.cont: + self.finish() elif self.angledata: self.node.append(self.point) self.createObject() @@ -1929,7 +1931,8 @@ class Dimension(Creator): self.dimtrack.on() elif (len(self.node) == 3): self.createObject() - if not self.cont: self.finish() + if not self.cont: + self.finish() class ShapeString(Creator): "This class creates a shapestring feature."