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

Switched PageHeight to use QuantitySpinBox.

Browse Source
This commit is contained in:
Markus Lampert
2017-10-06 20:01:01 -07:00
parent 87cf84151e
commit 0e8d1903cc
2 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui
View File

@@ -14,20 +14,6 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="Gui::InputField" name="clearanceHeight">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The height where lateral movement of the toolbit is not obstructed by any fixtures or the part / stock material itself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::InputField" name="safeHeight">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The height above which it is safe to move the tool bit with rapid movements. Below this height all lateral and downward movements are performed with feed rate speeds.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
@@ -55,13 +41,33 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="safeHeight">
<property name="minimum">
<double>-999999999.000000000000000</double>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="clearanceHeight">
<property name="minimum">
<double>-999999999.000000000000000</double>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
<class>Gui::QuantitySpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<resources>

13
src/Mod/Path/PathScripts/PathOpGui.py
View File

@@ -533,14 +533,23 @@ class TaskPanelHeightsPage(TaskPanelPage):
'''Page controller for heights.'''
def getForm(self):
return FreeCADGui.PySideUic.loadUi(":/panels/PageHeightsEdit.ui")
def initPage(self, obj):
self.form.safeHeight.setProperty('binding', "%s.SafeHeight" % obj.Name)
self.form.clearanceHeight.setProperty('binding', "%s.ClearanceHeight" % obj.Name)
self.form.safeHeight.setProperty('unit', obj.SafeHeight.getUserPreferred()[2])
self.form.clearanceHeight.setProperty('unit', obj.ClearanceHeight.getUserPreferred()[2])
def getTitle(self, obj):
return translate("Path", "Heights")
def getFields(self, obj):
PathGui.updateInputField(obj, 'SafeHeight', self.form.safeHeight)
PathGui.updateInputField(obj, 'ClearanceHeight', self.form.clearanceHeight)
def setFields(self, obj):
self.form.safeHeight.setText(FreeCAD.Units.Quantity(obj.SafeHeight.Value, FreeCAD.Units.Length).UserString)
self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString)
self.form.safeHeight.setProperty('rawValue', obj.SafeHeight.Value)
self.form.safeHeight.setProperty('rawValue', obj.ClearanceHeight.Value)
def getSignalsForUpdate(self, obj):
signals = []
signals.append(self.form.safeHeight.editingFinished)