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

Path:wip on tl edit dialog and units

Browse Source
This commit is contained in:
Dan Falck
2016-12-19 07:40:25 -08:00
parent df8783833d
commit c84e7662b7
2 changed files with 101 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Mod/Path/PathScripts/PathToolLibraryManager.py
View File

@@ -201,7 +201,7 @@ class ToolLibraryManager():
itemName = QtGui.QStandardItem(t.Name)
itemToolType = QtGui.QStandardItem(t.ToolType)
itemMaterial = QtGui.QStandardItem(t.Material)
itemDiameter = QtGui.QStandardItem(str(t.Diameter))
itemDiameter = QtGui.QStandardItem(str(t.Diameter))
itemLengthOffset = QtGui.QStandardItem(str(t.LengthOffset))
itemFlatRadius = QtGui.QStandardItem(str(t.FlatRadius))
itmCornerRadius = QtGui.QStandardItem(str(t.CornerRadius))
@@ -397,12 +397,12 @@ class EditorPanel():
t.Name = str(editform.NameField.text())
t.ToolType = self.getType(editform.TypeField.currentIndex())
t.Material = self.getMaterial(editform.MaterialField.currentIndex())
t.Diameter = editform.DiameterField.value()
t.LengthOffset = editform.LengthOffsetField.value()
t.FlatRadius = editform.FlatRadiusField.value()
t.CornerRadius = editform.CornerRadiusField.value()
t.Diameter = FreeCAD.Units.parseQuantity(editform.DiameterField.text())
t.LengthOffset = FreeCAD.Units.parseQuantity(editform.LengthOffsetField.text())
t.FlatRadius = FreeCAD.Units.parseQuantity(editform.FlatRadiusField.text())
t.CornerRadius = FreeCAD.Units.parseQuantity(editform.CornerRadiusField.text())
t.CuttingEdgeAngle = editform.CuttingEdgeAngleField.value()
t.CuttingEdgeHeight = editform.CuttingEdgeHeightField.value()
t.CuttingEdgeHeight = FreeCAD.Units.parseQuantity(editform.CuttingEdgeHeightField.text())
listname = self.form.listView.selectedIndexes()[0].data()
if self.TLM.addnew(listname, t) is True:
@@ -463,12 +463,12 @@ class EditorPanel():
editform.NameField.setText(tool.Name)
editform.TypeField.setCurrentIndex(self.getType(tool.ToolType))
editform.MaterialField.setCurrentIndex(self.getMaterial(tool.Material))
editform.DiameterField.setValue(tool.Diameter)
editform.LengthOffsetField.setValue(tool.LengthOffset)
editform.FlatRadiusField.setValue(tool.FlatRadius)
editform.CornerRadiusField.setValue(tool.CornerRadius)
editform.DiameterField.setText(str(tool.Diameter))
editform.LengthOffsetField.setText(str(tool.LengthOffset))
editform.FlatRadiusField.setText(str(tool.FlatRadius))
editform.CornerRadiusField.setText(str(tool.CornerRadius))
editform.CuttingEdgeAngleField.setValue(tool.CuttingEdgeAngle)
editform.CuttingEdgeHeightField.setValue(tool.CuttingEdgeHeight)
editform.CuttingEdgeHeightField.setText(str(tool.CuttingEdgeHeight))
r = editform.exec_()
if r:
@@ -476,12 +476,12 @@ class EditorPanel():
tool.Name = str(editform.NameField.text())
tool.ToolType = self.getType(editform.TypeField.currentIndex())
tool.Material = self.getMaterial(editform.MaterialField.currentIndex())
tool.Diameter = editform.DiameterField.value()
tool.LengthOffset = editform.LengthOffsetField.value()
tool.FlatRadius = editform.FlatRadiusField.value()
tool.CornerRadius = editform.CornerRadiusField.value()
tool.Diameter = FreeCAD.Units.parseQuantity(editform.DiameterField.text())
tool.LengthOffset = FreeCAD.Units.parseQuantity(editform.LengthOffsetField.text())
tool.FlatRadius = FreeCAD.Units.parseQuantity(editform.FlatRadiusField.text())
tool.CornerRadius = FreeCAD.Units.parseQuantity(editform.CornerRadiusField.text())
tool.CuttingEdgeAngle = editform.CuttingEdgeAngleField.value()
tool.CuttingEdgeHeight = editform.CuttingEdgeHeightField.value()
tool.CuttingEdgeHeight = FreeCAD.Units.parseQuantity(editform.CuttingEdgeHeightField.text())
if self.TLM.updateTool(listname, toolnum, tool) is True:
self.loadTable(self.form.listView.selectedIndexes()[0])