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

Draft: fix getcoords in gui_snapper.py (#9654)

Browse Source 
The function did not handle global and relative mode properly
This commit is contained in:
Roy-043
2023-05-26 19:45:31 +02:00
committed by GitHub
parent c38379963c
commit a779ba3514
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Draft/DraftGui.py
View File

@@ -1100,19 +1100,18 @@ class DraftToolBar:
print("debug: DraftGui.validatePoint: AttributeError")
else:
num_vec = FreeCAD.Vector(numx, numy, numz)
ref_vec = FreeCAD.Vector(0,0,0)
if self.pointcallback:
self.pointcallback(num_vec, self.relativeMode)
self.pointcallback(num_vec, self.globalMode, self.relativeMode)
else:
ref_vec = FreeCAD.Vector(0, 0, 0)
if FreeCAD.DraftWorkingPlane and not self.globalMode:
num_vec = FreeCAD.DraftWorkingPlane.getGlobalRot(num_vec)
ref_vec = FreeCAD.DraftWorkingPlane.getGlobalCoords(ref_vec)
if self.relativeMode:
if self.sourceCmd.node:
ref_vec = self.sourceCmd.node[-1]
if self.relativeMode and self.sourceCmd.node:
ref_vec = self.sourceCmd.node[-1]
numx, numy, numz = num_vec + ref_vec
self.sourceCmd.numericInput(numx,numy,numz)
self.sourceCmd.numericInput(numx, numy, numz)
elif self.textValue.isVisible():
return False

14
src/Mod/Draft/draftguitools/gui_snapper.py
View File

@@ -1414,12 +1414,16 @@ class Snapper:
if movecallback:
movecallback(self.pt, self.snapInfo)
def getcoords(point, relative=False):
def getcoords(point, global_mode=True, relative_mode=False):
"""Get the global coordinates from a point."""
self.pt = point
if relative and last and hasattr(App, "DraftWorkingPlane"):
v = App.DraftWorkingPlane.getGlobalCoords(point)
self.pt = last.add(v)
# Same algorithm as in validatePoint in DraftGui.py.
ref = App.Vector(0, 0, 0)
if global_mode is False and hasattr(App, "DraftWorkingPlane"):
point = App.DraftWorkingPlane.getGlobalRot(point)
ref = App.DraftWorkingPlane.getGlobalCoords(ref)
if relative_mode is True and last is not None:
ref = last
self.pt = point + ref
accept()
def click(event_cb):