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

- modified the Geometry UI tools table. Replaced the comboboxes with labels.

Browse Source 
- Fixed the SolderPaste Plugin regarding the special designation 'SP' job type and 'DN' tool shape
- some fixes in the GCode Editor regarding the new changes in the data structure
This commit is contained in:
Marius Stanciu
2021-07-18 12:01:41 +03:00
committed by Marius
parent a36be12960
commit 9c139d3ea2
8 changed files with 110 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appPlugins/ToolMilling.py
View File

@@ -591,7 +591,7 @@ class ToolMilling(AppTool, Excellon):
# "tools_mill_milling_type": "drills",
# "tools_mill_milling_dia": 0.04,
#
# "tools_mill_job_type": 0, # 'Rough'
# "tools_mill_job_type": 0, # 'Roughing'
# "tools_mill_polish_margin": 0.0,
# "tools_mill_polish_overlap": 10,
# "tools_mill_polish_method": _("Standard"),
@@ -747,7 +747,7 @@ class ToolMilling(AppTool, Excellon):
tool_data['tools_mill_offset_type'] = 'Path'
tool_data['tools_mill_offset_value'] = 0.0
tool_data['tools_mill_job_type'] = 'Rough'
tool_data['tools_mill_job_type'] = 0 #_('Roughing')
tool_data['tools_mill_multidepth'] = False
tool_data['tools_mill_extracut'] = False

17
appPlugins/ToolSolderPaste.py
View File

@@ -182,6 +182,10 @@ class SolderPaste(AppTool):
"tools_solderpaste_pp": self.ui.pp_combo
})
self.set_form_from_defaults()
for option in self.app.options:
if option.find('tools_') == 0:
self.options[option] = deepcopy(self.app.options[option] )
self.read_form_to_options()
self.clear_context_menu()
@@ -228,7 +232,7 @@ class SolderPaste(AppTool):
obj = self.app.collection.get_active()
if obj and obj.kind == 'gerber':
obj_name = obj.options['name']
self.ui.geo_obj_combo.set_value(obj_name)
self.ui.obj_combo.set_value(obj_name)
def build_ui(self):
"""
@@ -531,7 +535,8 @@ class SolderPaste(AppTool):
if tool_v == 'tooldia':
tool_dias.append(float('%.*f' % (self.decimals, v[tool_v])))
if float('%.*f' % (self.decimals, tool_dia)) in tool_dias:
# if float('%.*f' % (self.decimals, tool_dia)) in tool_dias:
if self.app.dec_format(tool_dia, self.decimals) in tool_dias:
if muted is None:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. Tool already in Tool Table."))
self.ui.tools_table.itemChanged.connect(self.on_tool_edit)
@@ -790,10 +795,12 @@ class SolderPaste(AppTool):
geo_obj.tools[tooluid]['tooldia'] = tool
geo_obj.tools[tooluid]['data'] = deepcopy(self.tooltable_tools[tooluid]['data'])
geo_obj.tools[tooluid]['solid_geometry'] = []
geo_obj.tools[tooluid]['data']['tools_mill_offset_type']= 'Path'
geo_obj.tools[tooluid]['data']['tools_mill_offset_value'] = 0.0
geo_obj.tools[tooluid]['type'] = 'SolderPaste'
geo_obj.tools[tooluid]['data']['tools_mill_shape'] = 'DN'
geo_obj.tools[tooluid]['data']['tools_mill_offset_type']= 0 # 'Path'
geo_obj.tools[tooluid]['data']['tools_mill_offset_value'] = 0.0
geo_obj.tools[tooluid]['data']['tools_mill_job_type'] = 'SP' #'
geo_obj.tools[tooluid]['data']['tools_mill_shape'] = 'DN' # 'DN'
# self.flat_geometry is a list of LinearRings produced by flatten() from the exteriors of the Polygons
# We get possible issues if we try to directly use the Polygons, due of possible the interiors,