kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fixes #0004293: Vertical dimensions can't be created in XZ and YZ working plane

Browse Source
This commit is contained in:
marioalexis
2020-11-10 13:32:29 -03:00
committed by Yorik van Havre
parent 83f6c27be7
commit dcfba722f4
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Mod/Draft/draftguitools/gui_dimensions.py
View File

@@ -129,7 +129,10 @@ class Dimension(gui_base_original.Creator):
self.indices = []
self.center = None
self.arcmode = False
self.point1 = None
self.point2 = None
self.proj_point1 = None
self.proj_point2 = None
self.force = None
self.info = None
self.selectmode = False
@@ -296,10 +299,13 @@ class Dimension(gui_base_original.Creator):
_cmd += ')'
_cmd_list = ['_dim_ = ' + _cmd]
plane = App.DraftWorkingPlane
dir_u = DraftVecUtils.toString(plane.u)
dir_v = DraftVecUtils.toString(plane.v)
if direction == "X":
_cmd_list += ['_dim_.Direction = FreeCAD.Vector(1, 0, 0)']
_cmd_list += ['_dim_.Direction = ' + dir_u]
elif direction == "Y":
_cmd_list += ['_dim_.Direction = FreeCAD.Vector(0, 1, 0)']
_cmd_list += ['_dim_.Direction = ' + dir_v]
_cmd_list += ['Draft.autogroup(_dim_)',
'FreeCAD.ActiveDocument.recompute()']
@@ -444,30 +450,22 @@ class Dimension(gui_base_original.Creator):
# Draw constraint tracker line.
if shift and (not self.arcmode):
if len(self.node) == 2:
if not self.point1:
self.point1 = self.node[0]
if not self.point2:
self.point2 = self.node[1]
else:
self.node[1] = self.point2
if not self.force:
_p = self.point.sub(self.node[0])
a = abs(_p.getAngle(App.DraftWorkingPlane.u))
if (a > math.pi/4) and (a <= 0.75*math.pi):
self.force = 1
else:
self.force = 2
if self.force == 1:
self.node[1] = App.Vector(self.node[0].x,
self.node[1].y,
self.node[0].z)
elif self.force == 2:
self.node[1] = App.Vector(self.node[1].x,
self.node[0].y,
self.node[0].z)
# else:
# self.node[1] = self.point2
self.set_constraint_node()
else:
self.force = None
self.proj_point1 = None
self.proj_point2 = None
if self.point1:
self.node[0] = self.point1
if self.point2 and (len(self.node) > 1):
self.node[1] = self.point2
self.point2 = None
# self.point2 = None
# update the dimline
if self.node and not self.arcmode:
self.dimtrack.update(self.node
@@ -579,6 +577,34 @@ class Dimension(gui_base_original.Creator):
if not self.cont:
self.finish()
def set_constraint_node(self):
"""Set constrained nodes for vertical or horizontal dimension
by projecting on the working plane.
"""
if not self.proj_point1 or not self.proj_point2:
plane = App.DraftWorkingPlane
self.proj_point1 = plane.projectPoint(self.node[0])
self.proj_point2 = plane.projectPoint(self.node[1])
proj_u= plane.u.dot(self.proj_point2 - self.proj_point1)
proj_v= plane.v.dot(self.proj_point2 - self.proj_point1)
active_view = Gui.ActiveDocument.ActiveView
cursor = active_view.getCursorPos()
cursor_point = active_view.getPoint(cursor)
self.point = plane.projectPoint(cursor_point)
if not self.force:
ref_point = self.point - (self.proj_point2 + self.proj_point1)*1/2
ref_angle = abs(ref_point.getAngle(plane.u))
if (ref_angle > math.pi/4) and (ref_angle <= 0.75*math.pi):
self.force = 2
else:
self.force = 1
if self.force == 1:
self.node[0] = self.proj_point1
self.node[1] = self.proj_point1 + plane.v*proj_v
elif self.force == 2:
self.node[0] = self.proj_point1
self.node[1] = self.proj_point1 + plane.u*proj_u
Gui.addCommand('Draft_Dimension', Dimension())

2
src/Mod/Draft/draftviewproviders/view_dimension.py
View File

@@ -597,7 +597,7 @@ class ViewProviderLinearDimension(ViewProviderDimensionBase):
rott = rot1
if hasattr(vobj, "FlipText") and vobj.FlipText:
_rott = App.Rotation(rott[0], rott[1], rott[2], rott[3])
rott = _rott.multiply(App.Rotation(norm, 180)).Q
rott = _rott.multiply(App.Rotation(App.Vector(0, 0, 1), 180)).Q
offset = offset.negative()
# On first run the `DisplayMode` enumeration is not set, so we trap