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

- Milling Tool - changing parameters for the Geo Tool table now updates correctly the storage and are used in the CNCJob object that is created

Browse Source 
- Milling Tool - after creating and CNCJob object, it is now auto-selected and the Property tab is automatically switched to
This commit is contained in:
Marius Stanciu
2020-12-02 01:16:56 +02:00
committed by Marius
parent 9b87403499
commit d58c56ba7d
2 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -13,9 +13,11 @@ CHANGELOG for FlatCAM beta
- in Isolation Tool added possibility to have tools with the same diameter; remade the sorting of the tools storage - in Isolation Tool added possibility to have tools with the same diameter; remade the sorting of the tools storage
- some work in Milling Tool - some work in Milling Tool
- Milling Tool - working in tool data structures - Milling Tool - working in tool data structures
- Milling Tool - more or less made the CNCJob generation for multigeo Geometries to work; still the parameters may not be used - Milling Tool - more or less made the CNCJob generation for multi-geo Geometries to work; still the parameters may not be used
- removed the Generate CNCJob context menu action in the Project Menu as this will not work anymore - removed the Generate CNCJob context menu action in the Project Menu as this will not work anymore
- Milling Tool - selecting an object on canvas will update the selection of the object combobox, if the selected object type is the same sa the one selected in the Target radio - Milling Tool - selecting an object on canvas will update the selection of the object combobox, if the selected object type is the same sa the one selected in the Target radio
- Milling Tool - changing parameters for the Geo Tool table now updates correctly the storage and are used in the CNCJob object that is created
- Milling Tool - after creating and CNCJob object, it is now auto-selected and the Property tab is automatically switched to
29.11.2020 29.11.2020

57
appTools/ToolMilling.py
View File

@@ -1275,7 +1275,7 @@ class ToolMilling(AppTool, Excellon):
# sel_model.select(index, mode) # sel_model.select(index, mode)
def update_ui(self): def update_ui(self):
self.blockSignals(True) self.ui_disconnect()
sel_rows = set() sel_rows = set()
if self.ui.target_radio.get_value() == 'exc': if self.ui.target_radio.get_value() == 'exc':
@@ -1295,7 +1295,7 @@ class ToolMilling(AppTool, Excellon):
self.ui.tool_data_label.setText( self.ui.tool_data_label.setText(
"<b>%s: <font color='#0000FF'>%s</font></b>" % (_('Parameters for'), _("No Tool Selected")) "<b>%s: <font color='#0000FF'>%s</font></b>" % (_('Parameters for'), _("No Tool Selected"))
) )
self.blockSignals(False) self.ui_connect()
return return
else: else:
self.ui.generate_cnc_button.setDisabled(False) self.ui.generate_cnc_button.setDisabled(False)
@@ -1334,11 +1334,11 @@ class ToolMilling(AppTool, Excellon):
tool_type_txt = item.currentText() tool_type_txt = item.currentText()
self.ui_update_v_shape(tool_type_txt=tool_type_txt) self.ui_update_v_shape(tool_type_txt=tool_type_txt)
else: else:
self.blockSignals(False) self.ui_connect()
return return
except Exception as e: except Exception as e:
log.debug("Tool missing in ui_update_v_shape(). Add a tool in Geo Tool Table. %s" % str(e)) log.debug("Tool missing in ui_update_v_shape(). Add a tool in Geo Tool Table. %s" % str(e))
self.blockSignals(False) self.ui_connect()
return return
for c_row in sel_rows: for c_row in sel_rows:
@@ -1351,13 +1351,13 @@ class ToolMilling(AppTool, Excellon):
tooluid = int(tooluid) tooluid = int(tooluid)
self.storage_to_form(self.obj_tools[tooluid]['data']) self.storage_to_form(self.obj_tools[tooluid]['data'])
else: else:
self.blockSignals(False) self.ui_connect()
return return
except Exception as e: except Exception as e:
log.debug("Tool missing. Add a tool in the Tool Table. %s" % str(e)) log.debug("Tool missing. Add a tool in the Tool Table. %s" % str(e))
self.blockSignals(False) self.ui_connect()
return return
self.blockSignals(False) self.ui_connect()
def storage_to_form(self, dict_storage): def storage_to_form(self, dict_storage):
""" """
@@ -1385,15 +1385,26 @@ class ToolMilling(AppTool, Excellon):
:return: None :return: None
:rtype: :rtype:
""" """
if self.ui.tools_table.rowCount() == 2:
widget_changed = self.sender()
wdg_objname = widget_changed.objectName()
# the Target Object is Excellon
if self.ui.target_radio.get_value() == 'exc':
used_tools_table = self.ui.tools_table
if used_tools_table.rowCount() == 2:
# there is no tool in tool table so we can't save the GUI elements values to storage # there is no tool in tool table so we can't save the GUI elements values to storage
# Excellon Tool Table has 2 rows by default # Excellon Tool Table has 2 rows by default
return return
self.blockSignals(True) # the Target Object is Geometry
else:
used_tools_table = self.ui.geo_tools_table
if used_tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the GUI elements values to storage
return
widget_changed = self.sender() self.ui_disconnect()
wdg_objname = widget_changed.objectName()
try: try:
option_changed = self.name2option[wdg_objname] option_changed = self.name2option[wdg_objname]
@@ -1402,21 +1413,21 @@ class ToolMilling(AppTool, Excellon):
return return
# row = self.ui.tools_table.currentRow() # row = self.ui.tools_table.currentRow()
rows = sorted(set(index.row() for index in self.ui.tools_table.selectedIndexes())) rows = sorted(set(index.row() for index in used_tools_table.selectedIndexes()))
for row in rows: for row in rows:
if row < 0: if row < 0:
row = 0 row = 0
tooluid_item = int(self.ui.tools_table.item(row, 3).text()) tooluid_item = int(used_tools_table.item(row, 3).text())
for tooluid_key, tooluid_val in self.obj_tools.items(): for tooluid_key, tooluid_val in self.target_obj.tools.items():
if int(tooluid_key) == tooluid_item: if int(tooluid_key) == tooluid_item:
new_option_value = self.form_fields[option_changed].get_value() new_option_value = self.form_fields[option_changed].get_value()
if option_changed in tooluid_val: if option_changed in tooluid_val:
tooluid_val[option_changed] = new_option_value self.target_obj.tools[tooluid_key][option_changed] = new_option_value
if option_changed in tooluid_val['data']: if option_changed in tooluid_val['data']:
tooluid_val['data'][option_changed] = new_option_value self.target_obj.tools[tooluid_key]['data'][option_changed] = new_option_value
self.blockSignals(False) self.ui_connect()
def on_tooltable_cellwidget_change(self): def on_tooltable_cellwidget_change(self):
cw = self.sender() cw = self.sender()
@@ -1534,7 +1545,7 @@ class ToolMilling(AppTool, Excellon):
log.debug("ToolDrilling.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.") log.debug("ToolDrilling.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.")
return return
self.blockSignals(True) self.ui_disconnect()
row = self.ui.tools_table.currentRow() row = self.ui.tools_table.currentRow()
if row < 0: if row < 0:
@@ -1554,7 +1565,7 @@ class ToolMilling(AppTool, Excellon):
tooluid_val['data'] = deepcopy(temp_tool_data) tooluid_val['data'] = deepcopy(temp_tool_data)
self.app.inform.emit('[success] %s' % _("Current Tool parameters were applied to all tools.")) self.app.inform.emit('[success] %s' % _("Current Tool parameters were applied to all tools."))
self.blockSignals(False) self.ui_connect()
def on_order_changed(self, order): def on_order_changed(self, order):
if order != 'no': if order != 'no':
@@ -2777,14 +2788,15 @@ class ToolMilling(AppTool, Excellon):
def job_thread(a_obj): def job_thread(a_obj):
if self.target_obj.multigeo is False: if self.target_obj.multigeo is False:
with self.app.proc_container.new('%s...' % _("Generating")): with self.app.proc_container.new('%s...' % _("Generating")):
ret_val = a_obj.app_obj.new_object("cncjob", outname, job_init_single_geometry, plot=plot, ret_value = a_obj.app_obj.new_object("cncjob", outname, job_init_single_geometry, plot=plot,
autoselected=True) autoselected=True)
else: else:
with self.app.proc_container.new('%s...' % _("Generating")): with self.app.proc_container.new('%s...' % _("Generating")):
ret_val = a_obj.app_obj.new_object("cncjob", outname, job_init_multi_geometry, plot=plot, ret_value = a_obj.app_obj.new_object("cncjob", outname, job_init_multi_geometry, plot=plot,
autoselected=True) autoselected=True)
if ret_val != 'fail': if ret_value != 'fail':
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
a_obj.inform.emit('[success] %s: %s' % (_("CNCjob created"), outname)) a_obj.inform.emit('[success] %s: %s' % (_("CNCjob created"), outname))
# Create a promise with the name # Create a promise with the name
@@ -2799,6 +2811,7 @@ class ToolMilling(AppTool, Excellon):
ret_val = self.app.app_obj.new_object("cncjob", outname, job_init_multi_geometry, plot=plot, ret_val = self.app.app_obj.new_object("cncjob", outname, job_init_multi_geometry, plot=plot,
autoselected=True) autoselected=True)
if ret_val != 'fail': if ret_val != 'fail':
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
self.app.inform.emit('[success] %s: %s' % (_("CNCjob created"), outname)) self.app.inform.emit('[success] %s: %s' % (_("CNCjob created"), outname))
def on_pp_changed(self): def on_pp_changed(self):