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

Merge pull request #4710 from marioalexis84/draft-draftgui

Browse Source 
Draft: Sync input fields in task panel
This commit is contained in:
Yorik van Havre
2021-04-20 11:50:22 +02:00
committed by GitHub
parent f78960179e 2f81ca40be
commit 07c914a8bb
2 changed files with 133 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,11 +273,13 @@ class DraftToolBar:
self.fillmode = Draft.getParam("fillmode",False)
self.mask = None
self.alock = False
self.angle = None
self.avalue = None
self.x = 0
self.y = 0
self.z = 0
self.lvalue = 0
self.pvalue = 90
self.avalue = 0
self.angle = None
self.radius = 0
self.offset = 0
self.uiloader = FreeCADGui.UiLoader()
@@ -835,11 +837,7 @@ class DraftToolBar:
def taskUi(self,title="Draft",extra=None,icon="Draft_Draft"):
# reset InputField values
self.x = 0
self.y = 0
self.z = 0
self.radius = 0
self.offset = 0
self.reset_ui_values()
if self.taskmode:
self.isTaskOn = True
todo.delay(FreeCADGui.Control.closeDialog,None)
@@ -1578,7 +1576,6 @@ class DraftToolBar:
def wipeLine(self):
"""wipes existing segments of a line"""
FreeCAD.Console.PrintMessage("el de wipe\n")
self.sourceCmd.wipe()
def orientWP(self):
@@ -1792,16 +1789,18 @@ class DraftToolBar:
# set length and angle
if last and dp and plane:
self.lengthValue.setText(displayExternal(dp.Length,None,'Length'))
a = math.degrees(-DraftVecUtils.angle(dp,plane.u,plane.axis))
if not self.angleLock.isChecked():
self.angleValue.setText(displayExternal(a,None,'Angle'))
length, theta, phi = DraftVecUtils.get_spherical_coords(*dp)
theta = math.degrees(theta)
phi = math.degrees(phi)
self.lengthValue.setText(displayExternal(length,None,'Length'))
#if not self.angleLock.isChecked():
self.angleValue.setText(displayExternal(phi,None,'Angle'))
if not mask:
# automask, a is rounded to identify one of the below cases
a = round(a, Draft.getParam("precision"))
if a in [0,180,-180]:
# automask, phi is rounded to identify one of the below cases
phi = round(phi, Draft.getParam("precision"))
if phi in [0,180,-180]:
mask = "x"
elif a in [90,270,-90,-270]:
elif phi in [90,270,-90,-270]:
mask = "y"
# set masks
@@ -2109,12 +2108,21 @@ class DraftToolBar:
def changeXValue(self,d):
self.x = d
if not self.xValue.hasFocus():
return None
self.update_spherical_coords()
def changeYValue(self,d):
self.y = d
if not self.yValue.hasFocus():
return None
self.update_spherical_coords()
def changeZValue(self,d):
self.z = d
if not self.zValue.hasFocus():
return None
self.update_spherical_coords()
def changeRadiusValue(self,d):
self.radius = d
@@ -2127,29 +2135,15 @@ class DraftToolBar:
def changeLengthValue(self,d):
self.lvalue = d
v = FreeCAD.Vector(self.x,self.y,self.z)
if not v.Length:
if self.angle:
v = FreeCAD.Vector(self.angle)
else:
v = FreeCAD.Vector(FreeCAD.DraftWorkingPlane.u)
if self.avalue:
v = DraftVecUtils.rotate(v,math.radians(d),FreeCAD.DraftWorkingPlane.axis)
v = DraftVecUtils.scaleTo(v,d)
self.xValue.setText(displayExternal(v.x,None,'Length'))
self.yValue.setText(displayExternal(v.y,None,'Length'))
self.zValue.setText(displayExternal(v.z,None,'Length'))
if not self.lengthValue.hasFocus():
return None
self.update_cartesian_coords()
def changeAngleValue(self,d):
self.avalue = 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
v = DraftVecUtils.rotate(v,a,FreeCAD.DraftWorkingPlane.axis)
self.angle = v
self.xValue.setText(displayExternal(v.x,None,'Length'))
self.yValue.setText(displayExternal(v.y,None,'Length'))
self.zValue.setText(displayExternal(v.z,None,'Length'))
if not self.angleValue.hasFocus():
return None
self.update_cartesian_coords()
if self.angleLock.isChecked():
FreeCADGui.Snapper.setAngle(self.angle)
@@ -2161,6 +2155,25 @@ class DraftToolBar:
FreeCADGui.Snapper.setAngle()
self.angle = None
def update_spherical_coords(self):
length, theta, phi = DraftVecUtils.get_spherical_coords(
self.x,self.y,self.z)
self.lvalue = length
self.pvalue = math.degrees(theta)
self.avalue = math.degrees(phi)
self.angle = FreeCAD.Vector(DraftVecUtils.get_cartesian_coords(
1, theta, phi))
self.lengthValue.setText(displayExternal(self.lvalue,None,'Length'))
self.angleValue.setText(displayExternal(self.avalue,None,'Angle'))
def update_cartesian_coords(self):
self.x, self.y, self.z = DraftVecUtils.get_cartesian_coords(
self.lvalue,math.radians(self.pvalue),math.radians(self.avalue))
self.angle = FreeCAD.Vector(DraftVecUtils.get_cartesian_coords(
1, math.radians(self.pvalue), math.radians(self.avalue)))
self.xValue.setText(displayExternal(self.x,None,'Length'))
self.yValue.setText(displayExternal(self.y,None,'Length'))
self.zValue.setText(displayExternal(self.z,None,'Length'))
#---------------------------------------------------------------------------
# TaskView operations
@@ -2236,6 +2249,18 @@ class DraftToolBar:
self.draftWidget.setVisible(False)
self.draftWidget.toggleViewAction().setVisible(False)
def reset_ui_values(self):
"""Method to reset task panel values"""
self.x = 0
self.y = 0
self.z = 0
self.lvalue = 0
self.pvalue = 90
self.avalue = 0
self.angle = None
self.radius = 0
self.offset = 0
class FacebinderTaskPanel:
'''A TaskPanel for the facebinder'''

72
src/Mod/Draft/DraftVecUtils.py
View File

@@ -829,4 +829,76 @@ def removeDoubles(vlist):
nlist.append(vlist[-1])
return nlist
def get_spherical_coords(x, y, z):
"""Get the Spherical coordinates of the vector represented
by Cartesian coordinates (x, y, z).
Parameters
----------
vector : Base::Vector3
The input vector.
Returns
-------
tuple of float
Tuple (radius, theta, phi) with the Spherical coordinates.
Radius is the radial coordinate, theta the polar angle and
phi the azimuthal angle in radians.
Notes
-----
The vector (0, 0, 0) has undefined values for theta and phi, while
points on the z axis has undefined value for phi. The following
conventions are used (useful in DraftToolBar methods):
(0, 0, 0) -> (0, pi/2, 0)
(0, 0, z) -> (radius, theta, 0)
"""
v = Vector(x,y,z)
x_axis = Vector(1,0,0)
z_axis = Vector(0,0,1)
y_axis = Vector(0,1,0)
rad = v.Length
if not bool(round(rad, precision())):
return (0, math.pi/2, 0)
theta = v.getAngle(z_axis)
v.projectToPlane(Vector(0,0,0), z_axis)
phi = v.getAngle(x_axis)
if math.isnan(phi):
return (rad, theta, 0)
# projected vector is on 3rd or 4th quadrant
if v.dot(Vector(y_axis)) < 0:
phi = -1*phi
return (rad, theta, phi)
def get_cartesian_coords(radius, theta, phi):
"""Get the three-dimensional Cartesian coordinates of the vector
represented by Spherical coordinates (radius, theta, phi).
Parameters
----------
radius : float, int
Radial coordinate of the vector.
theta : float, int
Polar coordinate of the vector in radians.
phi : float, int
Azimuthal coordinate of the vector in radians.
Returns
-------
tuple of float :
Tuple (x, y, z) with the Cartesian coordinates.
"""
x = radius*math.sin(theta)*math.cos(phi)
y = radius*math.sin(theta)*math.sin(phi)
z = radius*math.cos(theta)
return (x, y, z)
## @}