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

Changed tool parameters to use a QuantitySpinBox.

Browse Source
This commit is contained in:
Markus Lampert
2017-10-08 14:16:15 -07:00
parent f13ac4c17e
commit 9d98ac390e
3 changed files with 198 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
View File

@@ -16,7 +16,15 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolBox" name="toolBox">
<widget class="QWidget" name="toolBoxPage1" native="true">
<widget class="QWidget" name="toolBoxPage1">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>474</width>
<height>535</height>
</rect>
</property>
<attribute name="label">
<string>Controller</string>
</attribute>
@@ -79,10 +87,13 @@
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="horizFeed">
<property name="minimum" stdset="0">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
@@ -92,10 +103,13 @@
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="vertFeed">
<property name="minimum" stdset="0">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
@@ -105,10 +119,13 @@
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="horizRapid">
<property name="minimum" stdset="0">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
@@ -118,10 +135,13 @@
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="vertRapid">
<property name="minimum" stdset="0">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
@@ -183,7 +203,15 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="toolBoxPage2" native="true">
<widget class="QWidget" name="toolBoxPage2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>474</width>
<height>535</height>
</rect>
</property>
<attribute name="label">
<string>Tool</string>
</attribute>
@@ -377,18 +405,21 @@
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::InputField" name="toolDiameter">
<property name="text">
<string>0 mm</string>
<widget class="Gui::QuantitySpinBox" name="toolDiameter">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep" stdset="0">
<double>0.125000000000000</double>
<property name="text" stdset="0">
<string>0.00</string>
</property>
<property name="maximum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<double>0.000000000000000</double>
<property name="singleStep">
<double>0.125000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
@@ -396,71 +427,86 @@
</widget>
</item>
<item row="8" column="1">
<widget class="Gui::InputField" name="toolLengthOffset">
<property name="text">
<string>0 mm</string>
<widget class="Gui::QuantitySpinBox" name="toolLengthOffset">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum" stdset="0">
<double>100.000000000000000</double>
<property name="text" stdset="0">
<string>0.00</string>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="Gui::InputField" name="toolFlatRadius">
<property name="text">
<string>0 mm</string>
<widget class="Gui::QuantitySpinBox" name="toolFlatRadius">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum" stdset="0">
<double>100.000000000000000</double>
<property name="text" stdset="0">
<string>0.00</string>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="Gui::InputField" name="toolCornerRadius">
<property name="text">
<string>0 mm</string>
<widget class="Gui::QuantitySpinBox" name="toolCornerRadius">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum" stdset="0">
<double>100.000000000000000</double>
<property name="text" stdset="0">
<string>0.00</string>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="Gui::InputField" name="toolCuttingEdgeHeight">
<property name="text">
<string>0 mm</string>
<widget class="Gui::QuantitySpinBox" name="toolCuttingEdgeHeight">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum" stdset="0">
<double>100.000000000000000</double>
<property name="text" stdset="0">
<string>0.00</string>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="Gui::InputField" name="toolCuttingEdgeAngle">
<widget class="Gui::QuantitySpinBox" name="toolCuttingEdgeAngle">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="unit" stdset="0">
<string notr="true">°</string>
</property>
@@ -502,17 +548,32 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
</customwidget>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tcName</tabstop>
<tabstop>tcNumber</tabstop>
<tabstop>horizFeed</tabstop>
<tabstop>vertFeed</tabstop>
<tabstop>horizRapid</tabstop>
<tabstop>vertRapid</tabstop>
<tabstop>spindleSpeed</tabstop>
<tabstop>spindleDirection</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>toolName</tabstop>
<tabstop>toolType</tabstop>
<tabstop>toolMaterial</tabstop>
<tabstop>toolDiameter</tabstop>
<tabstop>toolLengthOffset</tabstop>
<tabstop>toolFlatRadius</tabstop>
<tabstop>toolCornerRadius</tabstop>
<tabstop>toolCuttingEdgeAngle</tabstop>
<tabstop>toolCuttingEdgeHeight</tabstop>
</tabstops>
<resources/>
<connections>
<connection>

84
src/Mod/Path/PathScripts/PathGui.py
View File

@@ -25,60 +25,114 @@
import FreeCAD
import FreeCADGui
import PathScripts.PathLog as PathLog
import importlib
import PySide
from PathScripts.PathGeom import PathGeom
from PySide import QtCore, QtGui
__title__ = "Path UI helper and utility functions"
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"
__doc__ = "A collection of helper and utility functions for the Path GUI."
def translate(context, text, disambig=None):
return PySide.QtCore.QCoreApplication.translate(context, text, disambig)
if False:
PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule())
PathLog.trackModule(PathLog.thisModule())
else:
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
def updateInputField(obj, prop, widget, onBeforeChange = None):
'''updateInputField(obj, prop, widget) ... helper function to update obj's property named prop with the value from widget, if it has changed.'''
def _getProperty(obj, prop):
o = obj
attr = obj
for name in prop.split('.'):
o = attr
if not hasattr(o, name):
break
attr = getattr(o, name)
if o == attr:
PathLog.warning(translate('PathGui', "%s has no property %s (%s))") % (obj.Label, prop))
return (None, None, None)
#PathLog.debug("found property %s of %s (%s: %s)" % (prop, obj.Label, name, attr))
return(o, attr, name)
def getProperty(obj, prop):
'''getProperty(obj, prop) ... answer obj's property defined by its canonical name.'''
o, attr, name = _getProperty(obj, prop)
return attr
def setProperty(obj, prop, value):
'''setProperty(obj, prop, value) ... set the property value of obj's property defined by its canonical name.'''
o, attr, name = _getProperty(obj, prop)
if o and name:
setattr(o, name, value)
def updateInputField(obj, prop, widget, onBeforeChange=None):
'''updateInputField(obj, prop, widget) ... update obj's property prop with the value of widget.
The property's value is only assigned if the new value differs from the current value.
This prevents onChanged notifications where the value didn't acutally change.
Gui::InputField and Gui::QuantitySpinBox widgets are supported - and the property can
be of type Quantity or Float.
If onBeforeChange is specified it is called before a new value is assigned to the property.
Returns True if a new value was assigned, False otherwise (new value is the same as the current).
'''
value = FreeCAD.Units.Quantity(widget.text()).Value
attr = getattr(obj, prop)
attr = getProperty(obj, prop)
attrValue = attr.Value if hasattr(attr, 'Value') else attr
if not PathGeom.isRoughly(attrValue, value):
PathLog.debug("updateInputField(%s, %s): %.2f -> %.2f" % (obj.Label, prop, getattr(obj, prop), value))
PathLog.debug("updateInputField(%s, %s): %.2f -> %.2f" % (obj.Label, prop, attr, value))
if onBeforeChange:
onBeforeChange(obj)
setattr(obj, prop, value)
setProperty(obj, prop, value)
return True
return False
class QuantitySpinBox:
def __init__(self, widget, obj, propName, onBeforeChange=None):
'''Controller class to interface a Gui::QuantitySpinBox.
The spin box gets bound to a given property and supports update in both directions.
QuatitySpinBox(widget, obj, prop, onBeforeChange=None)
widget ... expected to be reference to a Gui::QuantitySpinBox
obj ... document object
prop ... canonical name of the (sub-) property
onBeforeChange ... an optional callback being executed before the value of the property is changed
'''
def __init__(self, widget, obj, prop, onBeforeChange=None):
self.obj = obj
self.widget = widget
self.prop = propName
self.prop = prop
self.onBeforeChange = onBeforeChange
if hasattr(obj, propName):
widget.setProperty('unit', getattr(self.obj, self.prop).getUserPreferred()[2])
widget.setProperty('binding', "%s.%s" % (obj.Name, propName))
attr = getProperty(self.obj, self.prop)
if attr is not None:
if hasattr(attr, 'Value'):
widget.setProperty('unit', attr.getUserPreferred()[2])
widget.setProperty('binding', "%s.%s" % (obj.Name, prop))
self.valid = True
else:
PathLog.warning(translate('PathGui', "Cannot find property %s of %s") % (prop, obj.Label))
self.valid = False
def expression(self):
'''expression() ... returns the expression if one is bound to the property'''
if self.valid:
return self.widget.property('expression')
return False
return ''
def updateSpinBox(self, quantity=None):
'''updateSpinBox(quantity=None) ... update the display value of the spin box.
If no value is provided the value of the bound property is used.
quantity can be of type Quantity or Float.'''
if self.valid:
if quantity is None:
quantity = getattr(self.obj, self.prop)
self.widget.setProperty('rawValue', quantity.Value)
quantity = getProperty(self.obj, self.prop)
value = quantity.Value if hasattr(quantity, 'Value') else quantity
self.widget.setProperty('rawValue', value)
def updateProperty(self):
'''updateProperty() ... update the bound property with the value from the spin box'''
if self.valid:
return updateInputField(self.obj, self.prop, self.widget, self.onBeforeChange)
return None

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

@@ -269,11 +269,19 @@ class ToolControllerEditor:
if not asDialog:
self.form.buttonBox.hide()
self.obj = obj
self.vertFeed = PathGui.QuantitySpinBox(self.form.vertFeed, obj, 'VertFeed')
self.horizFeed = PathGui.QuantitySpinBox(self.form.horizFeed, obj, 'HorizFeed')
self.vertRapid = PathGui.QuantitySpinBox(self.form.vertRapid, obj, 'VertRapid')
self.horizRapid = PathGui.QuantitySpinBox(self.form.horizRapid, obj, 'HorizRapid')
self.toolDiameter = PathGui.QuantitySpinBox(self.form.toolDiameter, obj, 'Tool.Diameter')
self.toolLengthOffset = PathGui.QuantitySpinBox(self.form.toolLengthOffset, obj, 'Tool.LengthOffset')
self.toolFlatRadius = PathGui.QuantitySpinBox(self.form.toolFlatRadius, obj, 'Tool.FlatRadius')
self.toolCornerRadius = PathGui.QuantitySpinBox(self.form.toolCornerRadius, obj, 'Tool.CornerRadius')
self.toolCuttingEdgeAngle = PathGui.QuantitySpinBox(self.form.toolCuttingEdgeAngle, obj, 'Tool.CuttingEdgeAngle')
self.toolCuttingEdgeHeight = PathGui.QuantitySpinBox(self.form.toolCuttingEdgeHeight, obj, 'Tool.CuttingEdgeHeight')
def getType(self, tooltype):
"gets a combobox index number for a given type or viceversa"
toolslist = ["Drill", "CenterDrill", "CounterSink", "CounterBore",
@@ -315,12 +323,12 @@ class ToolControllerEditor:
self.form.toolName.setText(tc.Tool.Name)
self.form.toolType.setCurrentIndex(self.getType(tc.Tool.ToolType))
self.form.toolMaterial.setCurrentIndex(self.getMaterial(tc.Tool.Material))
self.form.toolDiameter.setText(FreeCAD.Units.Quantity(tc.Tool.Diameter, FreeCAD.Units.Length).UserString)
self.form.toolLengthOffset.setText(FreeCAD.Units.Quantity(tc.Tool.LengthOffset, FreeCAD.Units.Length).UserString)
self.form.toolFlatRadius.setText(FreeCAD.Units.Quantity(tc.Tool.FlatRadius, FreeCAD.Units.Length).UserString)
self.form.toolCornerRadius.setText(FreeCAD.Units.Quantity(tc.Tool.CornerRadius, FreeCAD.Units.Length).UserString)
self.form.toolCuttingEdgeAngle.setText(FreeCAD.Units.Quantity(tc.Tool.CuttingEdgeAngle, FreeCAD.Units.Angle).UserString)
self.form.toolCuttingEdgeHeight.setText(FreeCAD.Units.Quantity(tc.Tool.CuttingEdgeHeight, FreeCAD.Units.Length).UserString)
self.toolDiameter.updateSpinBox()
self.toolLengthOffset.updateSpinBox()
self.toolFlatRadius.updateSpinBox()
self.toolCornerRadius.updateSpinBox()
self.toolCuttingEdgeAngle.updateSpinBox()
self.toolCuttingEdgeHeight.updateSpinBox()
def updateToolController(self):
tc = self.obj
@@ -337,12 +345,12 @@ class ToolControllerEditor:
tc.Tool.Name = str(self.form.toolName.text())
tc.Tool.ToolType = self.getType(self.form.toolType.currentIndex())
tc.Tool.Material = self.getMaterial(self.form.toolMaterial.currentIndex())
tc.Tool.Diameter = FreeCAD.Units.parseQuantity(self.form.toolDiameter.text())
tc.Tool.LengthOffset = FreeCAD.Units.parseQuantity(self.form.toolLengthOffset.text())
tc.Tool.FlatRadius = FreeCAD.Units.parseQuantity(self.form.toolFlatRadius.text())
tc.Tool.CornerRadius = FreeCAD.Units.parseQuantity(self.form.toolCornerRadius.text())
tc.Tool.CuttingEdgeAngle = FreeCAD.Units.Quantity(self.form.toolCuttingEdgeAngle.text())
tc.Tool.CuttingEdgeHeight = FreeCAD.Units.parseQuantity(self.form.toolCuttingEdgeHeight.text())
self.toolDiameter.updateProperty()
self.toolLengthOffset.updateProperty()
self.toolFlatRadius.updateProperty()
self.toolCornerRadius.updateProperty()
self.toolCuttingEdgeAngle.updateProperty()
self.toolCuttingEdgeHeight.updateProperty()
except Exception as e:
PathLog.error(translate("PathToolController", "Error updating TC: %s") % e)