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

PathJobGui - use correct unit to show feedrates in the tool tab.

Browse Source
This commit is contained in:
Itai Nahshon
2017-09-09 23:10:02 +03:00
committed by wmayer
parent ce61fac68b
commit b9292683ae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Path/PathScripts/PathJobGui.py
View File

@@ -539,6 +539,8 @@ class TaskPanel:
select = None if index == -1 else self.form.activeToolController.itemData(index)
self.form.activeToolController.clear()
vUnit = FreeCAD.Units.Quantity(1, FreeCAD.Units.Velocity).getUserPreferred()[2]
for row,tc in enumerate(sorted(self.obj.ToolController, key=lambda tc: tc.Label)):
self.form.activeToolController.addItem(tc.Label, tc)
if tc == select:
@@ -557,13 +559,13 @@ class TaskPanel:
item.setData(self.DataProperty, 'Number')
self.form.toolControllerList.setItem(row, 1, item)
item = QtGui.QTableWidgetItem("%g" % tc.HorizFeed)
item = QtGui.QTableWidgetItem("%g" % tc.HorizFeed.getValueAs(vUnit))
item.setTextAlignment(QtCore.Qt.AlignRight)
item.setData(self.DataObject, tc)
item.setData(self.DataProperty, 'HorizFeed')
self.form.toolControllerList.setItem(row, 2, item)
item = QtGui.QTableWidgetItem("%g" % tc.VertFeed)
item = QtGui.QTableWidgetItem("%g" % tc.VertFeed.getValueAs(vUnit))
item.setTextAlignment(QtCore.Qt.AlignRight)
item.setData(self.DataObject, tc)
item.setData(self.DataProperty, 'VertFeed')