bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Milling Plugin - added in the UI the toolchange X,Y parameter and made it to work as expected

Browse Source
This commit is contained in:
Marius Stanciu
2021-03-14 15:00:41 +02:00
committed by Marius
parent c9d9e367bf
commit 8e02ff4bf2
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -12,7 +12,8 @@ CHANGELOG for FlatCAM beta
- Geometry Editor can now modify the edited tool diameter
- upgraded the Drilling Plugin and all the related parts in the CNCJob Object and in all preprocessors. Now, the parent 'tools' attribute is inherited and also the GCode is stored here
- small fix in the Toolchange_Manual preprocessor
- Drilling Plugin - added in the UI the toolchange X,Y parameter and make it to work as expected
- Drilling Plugin - added in the UI the toolchange X,Y parameter and made it to work as expected
- Milling Plugin - added in the UI the toolchange X,Y parameter and made it to work as expected
13.03.2021

26
appPlugins/ToolMilling.py
View File

@@ -462,6 +462,7 @@ class ToolMilling(AppTool, Excellon):
"tools_mill_toolchange": self.ui.toolchange_cb,
"tools_mill_toolchangez": self.ui.toolchangez_entry,
"tools_mill_toolchangexy": self.ui.toolchangexy_entry,
"tools_mill_endz": self.ui.endz_entry,
"tools_mill_endxy": self.ui.endxy_entry,
@@ -712,7 +713,6 @@ class ToolMilling(AppTool, Excellon):
tool_data['tools_mill_multidepth'] = False
tool_data['tools_mill_extracut'] = False
tool_data['tools_mill_dwell'] = False
tool_data['tools_mill_toolchangexy'] = ''
tool_data['tools_mill_area_exclusion'] = False
self.ui.offset_type_lbl.hide()
@@ -778,7 +778,6 @@ class ToolMilling(AppTool, Excellon):
tool_data['tools_mill_multidepth'] = app_defaults['tools_mill_multidepth']
tool_data['tools_mill_extracut'] = app_defaults['tools_mill_extracut']
tool_data['tools_mill_dwell'] = app_defaults['tools_mill_dwell']
tool_data['tools_mill_toolchangexy'] = app_defaults['tools_mill_toolchangexy']
tool_data['tools_mill_area_exclusion'] = app_defaults['tools_mill_area_exclusion']
self.ui.offset_type_lbl.show()
@@ -4299,10 +4298,27 @@ class MillingUI:
self.toolchangez_entry.set_range(-10000.0000, 10000.0000)
self.toolchangez_entry.setSingleStep(0.1)
self.ois_tcz_e = OptionalInputSection(self.toolchange_cb, [self.toolchangez_entry])
self.grid3.addWidget(self.toolchange_cb, 8, 0)
self.grid3.addWidget(self.toolchangez_entry, 8, 1)
self.grid3.addWidget(self.toolchange_cb, 5, 0)
self.grid3.addWidget(self.toolchangez_entry, 5, 1)
# Tool change X-Y
self.toolchange_xy_label = FCLabel('%s:' % _('Toolchange X-Y'))
self.toolchange_xy_label.setToolTip(
_("Toolchange X,Y position.")
)
self.toolchangexy_entry = NumericalEvalTupleEntry(border_color='#0069A9')
self.toolchangexy_entry.setObjectName("e_toolchangexy")
self.grid3.addWidget(self.toolchange_xy_label, 8, 0)
self.grid3.addWidget(self.toolchangexy_entry, 8, 1)
self.ois_tcz_e = OptionalInputSection(self.toolchange_cb,
[
self.toolchangez_entry,
self.toolchange_xy_label,
self.toolchangexy_entry
])
# End move Z:
self.endz_label = FCLabel('%s:' % _("End move Z"))