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

WIP update tool controller UI

Browse Source
This commit is contained in:
David Kaufman
2025-09-04 22:06:18 -04:00
parent d699d080e0
commit e464cdb73d
3 changed files with 124 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/Mod/CAM/Gui/Resources/panels/ToolControllerEdit.ui
View File

@@ -117,14 +117,14 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<widget class="QLabel" name="label_leadin_feed">
<property name="text">
<string>Horizontal rapid</string>
<string>Lead-in feed</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="horizRapid">
<widget class="Gui::QuantitySpinBox" name="leadinFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -146,13 +146,100 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_leadoutFeed">
<property name="text">
<string>Lead-out feed</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="leadoutFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_rampFeed">
<property name="text">
<string>Ramp feed</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="rampFeed">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Horizontal rapid</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Gui::QuantitySpinBox" name="horizRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Vertical rapid</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="6" column="1">
<widget class="Gui::QuantitySpinBox" name="vertRapid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">

16
src/Mod/CAM/Path/Tool/Controller.py
View File

@@ -49,7 +49,10 @@ class ToolControllerTemplate:
HorizFeed = "hfeed"
HorizRapid = "hrapid"
Label = "label"
LeadInFeed = "leadinfeed"
LeadOutFeed = "leadoutfeed"
Name = "name"
RampFeed = "rampfeed"
SpindleDir = "dir"
SpindleSpeed = "speed"
ToolNumber = "nr"
@@ -314,12 +317,22 @@ class ToolController:
if template.get(ToolControllerTemplate.Version):
version = int(template.get(ToolControllerTemplate.Version))
if version == 1 or version == 2:
# TODO figure out the meaning of this, and how to handle ramp/leadin/leadout feed rates
# or what else must be added to templates
if template.get(ToolControllerTemplate.Label):
obj.Label = template.get(ToolControllerTemplate.Label)
if template.get(ToolControllerTemplate.VertFeed):
obj.VertFeed = template.get(ToolControllerTemplate.VertFeed)
if template.get(ToolControllerTemplate.HorizFeed):
obj.HorizFeed = template.get(ToolControllerTemplate.HorizFeed)
if template.get(ToolControllerTemplate.LeadInFeed):
obj.LeadInFeed = template.get(ToolControllerTemplate.LeadInFeed, obj.LeadInFeed)
if template.get(ToolControllerTemplate.LeadOutFeed):
obj.LeadOutFeed = template.get(
ToolControllerTemplate.LeadOutFeed, obj.LeadOutFeed
)
if template.get(ToolControllerTemplate.RampFeed):
obj.RampFeed = template.get(ToolControllerTemplate.RampFeed, obj.RampFeed)
if template.get(ToolControllerTemplate.VertRapid):
obj.VertRapid = template.get(ToolControllerTemplate.VertRapid)
if template.get(ToolControllerTemplate.HorizRapid):
@@ -374,6 +387,9 @@ class ToolController:
attrs[ToolControllerTemplate.ToolNumber] = obj.ToolNumber
attrs[ToolControllerTemplate.VertFeed] = "%s" % (obj.VertFeed)
attrs[ToolControllerTemplate.HorizFeed] = "%s" % (obj.HorizFeed)
attrs[ToolControllerTemplate.LeadInFeed] = "%s" % (obj.LeadInFeed)
attrs[ToolControllerTemplate.LeadOutFeed] = "%s" % (obj.LeadOutFeed)
attrs[ToolControllerTemplate.RampFeed] = "%s" % (obj.RampFeed)
attrs[ToolControllerTemplate.VertRapid] = "%s" % (obj.VertRapid)
attrs[ToolControllerTemplate.HorizRapid] = "%s" % (obj.HorizRapid)
attrs[ToolControllerTemplate.SpindleSpeed] = obj.SpindleSpeed

17
src/Mod/CAM/Path/Tool/Gui/Controller.py
View File

@@ -218,6 +218,11 @@ class ToolControllerEditor(object):
PathGuiUtil.populateCombobox(self.controller, enumTups, comboToPropertyMap)
self.vertFeed = PathGuiUtil.QuantitySpinBox(self.controller.vertFeed, obj, "VertFeed")
self.horizFeed = PathGuiUtil.QuantitySpinBox(self.controller.horizFeed, obj, "HorizFeed")
self.leadInFeed = PathGuiUtil.QuantitySpinBox(self.controller.horizFeed, obj, "LeadInFeed")
self.leadOutFeed = PathGuiUtil.QuantitySpinBox(
self.controller.horizFeed, obj, "LeadOutFeed"
)
self.rampFeed = PathGuiUtil.QuantitySpinBox(self.controller.horizFeed, obj, "RampFeed")
self.vertRapid = PathGuiUtil.QuantitySpinBox(self.controller.vertRapid, obj, "VertRapid")
self.horizRapid = PathGuiUtil.QuantitySpinBox(self.controller.horizRapid, obj, "HorizRapid")
@@ -260,6 +265,9 @@ class ToolControllerEditor(object):
self.controller.tcNumber,
self.horizFeed.widget,
self.horizRapid.widget,
self.leadInFeed.widget,
self.leadOutFeed.widget,
self.rampFeed.widget,
self.vertFeed.widget,
self.vertRapid.widget,
self.controller.spindleSpeed,
@@ -273,6 +281,9 @@ class ToolControllerEditor(object):
self.controller.tcNumber.setValue(tc.ToolNumber)
self.horizFeed.updateWidget()
self.horizRapid.updateWidget()
self.leadInFeed.updateWidget()
self.leadOutFeed.updateWidget()
self.rampFeed.updateWidget()
self.vertFeed.updateWidget()
self.vertRapid.updateWidget()
self.controller.spindleSpeed.setValue(tc.SpindleSpeed)
@@ -292,6 +303,9 @@ class ToolControllerEditor(object):
tc.ToolNumber = self.controller.tcNumber.value()
self.horizFeed.updateProperty()
self.vertFeed.updateProperty()
self.leadInFeed.updateProperty()
self.leadOutFeed.updateProperty()
self.rampFeed.updateProperty()
self.horizRapid.updateProperty()
self.vertRapid.updateProperty()
tc.SpindleSpeed = self.controller.spindleSpeed.value()
@@ -323,6 +337,9 @@ class ToolControllerEditor(object):
self.controller.tcNumber.editingFinished.connect(self.changed)
self.vertFeed.widget.textChanged.connect(self.changed)
self.horizFeed.widget.textChanged.connect(self.changed)
self.leadInFeed.widget.textChanged.connect(self.changed)
self.leadOutFeed.widget.textChanged.connect(self.changed)
self.rampFeed.widget.textChanged.connect(self.changed)
self.vertRapid.widget.textChanged.connect(self.changed)
self.horizRapid.widget.textChanged.connect(self.changed)
self.controller.spindleSpeed.editingFinished.connect(self.changed)