suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: fixed non-focused taskview fields

Browse Source
This commit is contained in:
Yorik van Havre 2015-12-25 20:05:55 -02:00
parent d8088c5db0
commit 93ccc88f74
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1337,7 +1337,8 @@ class DraftToolBar:
def undoSegment(self):
"undo last line segment"
self.sourceCmd.undolast()
if hasattr(self.sourceCmd,"undolast"):
self.sourceCmd.undolast()
def checkSpecialChars(self,txt):
'''
@ -1345,7 +1346,7 @@ class DraftToolBar:
treated as shortcuts
'''
spec = False
if txt.endswith(" ") or txt.endswith("r"):
if txt.endswith("r"):
self.isRelative.setChecked(not self.isRelative.isChecked())
self.relativeMode = self.isRelative.isChecked()
spec = True
@ -1391,7 +1392,7 @@ class DraftToolBar:
self.constrain("angle")
self.displayPoint()
spec = True
elif txt.endswith("c"):
elif txt.endswith("o"):
if self.closeButton.isVisible():
self.closeLine()
elif self.isCopy.isVisible():
@ -1403,6 +1404,8 @@ class DraftToolBar:
for i in [self.xValue,self.yValue,self.zValue]:
if (i.property("text") == txt):
i.setProperty("text",txt[:-1])
i.setFocus()
i.selectAll()
def storeCurrentText(self,qstr):
self.currEditText = self.textValue.text()
@ -1478,7 +1481,13 @@ class DraftToolBar:
else:
if dp:
self.zValue.setText(displayExternal(dp.z,self.DECIMALS,'Length'))
# set length and angle
if last and dp and plane:
self.lengthValue.setText(displayExternal(dp.Length,self.DECIMALS,'Length'))
a = math.degrees(-DraftVecUtils.angle(dp,plane.u,plane.axis))
self.angleValue.setText(displayExternal(a,self.DECIMALS,'Angle'))
# set masks
if (mask == "x") or (self.mask == "x"):
self.xValue.setEnabled(True)
@ -1505,12 +1514,6 @@ class DraftToolBar:
self.xValue.setFocus()
self.xValue.selectAll()
# set length and angle
if last and dp and plane:
self.lengthValue.setText(displayExternal(dp.Length,self.DECIMALS,'Length'))
a = math.degrees(-DraftVecUtils.angle(dp,plane.u,plane.axis))
self.angleValue.setText(displayExternal(a,self.DECIMALS,'Angle'))
def getDefaultColor(self,type,rgb=False):
"gets color from the preferences or toolbar"