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

- fixed mouse bytes generation if Cutout Plugin to add an extra drill hole at the end

Browse Source 
- fixed an issue in Film Plugin made by copy/paste done recently to make sure that objects selected in Project Menu are populated in the Plugin UI on Film Plugin launch
- removed a parameter in the serialized parameters for CNCJob object (no longer used)
This commit is contained in:
Marius Stanciu
2021-03-19 14:07:36 +02:00
committed by Marius
parent 0177a64fe4
commit 3011f159bc
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -7,6 +7,12 @@ CHANGELOG for FlatCAM beta
================================================= =================================================
19.03.2021
- fixed mouse bytes generation if Cutout Plugin to add an extra drill hole at the end
- fixed an issue in Film Plugin made by copy/paste done recently to make sure that objects selected in Project Menu are populated in the Plugin UI on Film Plugin launch
- removed a parameter in the serialized parameters for CNCJob object (no longer used)
18.03.2021 18.03.2021
- changed some strings; updated the translation strings with the new strings (they need to be translated) - changed some strings; updated the translation strings with the new strings (they need to be translated)

2
appObjects/FlatCAMCNCJob.py
View File

@@ -175,7 +175,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# Always append to it because it carries contents # Always append to it because it carries contents
# from predecessors. # from predecessors.
self.ser_attrs += [ self.ser_attrs += [
'options', 'kind', 'origin_kind', 'cnc_tools', 'exc_cnc_tools', 'multitool', 'append_snippet', 'options', 'kind', 'cnc_tools', 'exc_cnc_tools', 'multitool', 'append_snippet',
'prepend_snippet', 'gc_header' 'prepend_snippet', 'gc_header'
] ]

6
appPlugins/ToolCutOut.py
View File

@@ -1038,7 +1038,7 @@ class CutOut(AppTool):
holes = [] holes = []
for line in mouse_bites_geo: for line in mouse_bites_geo:
calc_len = 0 calc_len = 0
while calc_len < line.length: while calc_len <= line.length:
holes.append(line.interpolate(calc_len)) holes.append(line.interpolate(calc_len))
calc_len += mb_dia + mb_spacing calc_len += mb_dia + mb_spacing
@@ -1419,7 +1419,7 @@ class CutOut(AppTool):
holes = [] holes = []
for line in mouse_bites_geo: for line in mouse_bites_geo:
calc_len = 0 calc_len = 0
while calc_len < line.length: while calc_len <= line.length:
holes.append(line.interpolate(calc_len)) holes.append(line.interpolate(calc_len))
calc_len += mb_dia + mb_spacing calc_len += mb_dia + mb_spacing
@@ -1915,7 +1915,7 @@ class CutOut(AppTool):
mb_spacing = self.ui.mb_spacing_entry.get_value() mb_spacing = self.ui.mb_spacing_entry.get_value()
for line in self.mb_manual_cuts: for line in self.mb_manual_cuts:
calc_len = 0 calc_len = 0
while calc_len < line.length: while calc_len <= line.length:
holes.append(line.interpolate(calc_len)) holes.append(line.interpolate(calc_len))
calc_len += mb_dia + mb_spacing calc_len += mb_dia + mb_spacing
self.mb_manual_cuts[:] = [] self.mb_manual_cuts[:] = []

17
appPlugins/ToolFilm.py
View File

@@ -193,27 +193,24 @@ class Film(AppTool):
self.ui.png_dpi_spinner.set_value(self.app.defaults["tools_film_png_dpi"]) self.ui.png_dpi_spinner.set_value(self.app.defaults["tools_film_png_dpi"])
self.ui.tf_type_obj_combo.set_value('grb')
self.ui.tf_type_box_combo.set_value('grb')
# run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
self.on_type_obj_index_changed(val='grb')
self.on_type_box_index_changed(val='grb')
obj = self.app.collection.get_active() obj = self.app.collection.get_active()
if obj: if obj:
obj_name = obj.options['name'] obj_name = obj.options['name']
if obj.kind == 'gerber': if obj.kind == 'gerber':
# run once to make sure that the obj_type attribute is updated in the FCComboBox # run once to make sure that the obj_type attribute is updated in the FCComboBox
self.ui.tf_type_obj_combo.set_value('grb') self.ui.tf_type_obj_combo.set_value('grb')
self.on_object_type('grb')
self.ui.tf_type_box_combo.set_value('grb') self.ui.tf_type_box_combo.set_value('grb')
self.on_combo_box_type('grb') # run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
self.on_type_obj_index_changed(val='grb')
self.on_type_box_index_changed(val='grb')
elif obj.kind == 'geometry': elif obj.kind == 'geometry':
# run once to make sure that the obj_type attribute is updated in the FCComboBox # run once to make sure that the obj_type attribute is updated in the FCComboBox
self.ui.tf_type_obj_combo.set_value('geo') self.ui.tf_type_obj_combo.set_value('geo')
self.on_object_type('geo')
self.ui.tf_type_box_combo.set_value('geo') self.ui.tf_type_box_combo.set_value('geo')
self.on_combo_box_type('geo') # run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
self.on_type_obj_index_changed(val='geo')
self.on_type_box_index_changed(val='geo')
self.ui.tf_type_obj_combo.set_value(obj_name) self.ui.tf_type_obj_combo.set_value(obj_name)
self.ui.tf_type_box_combo.set_value(obj_name) self.ui.tf_type_box_combo.set_value(obj_name)