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

Merge remote-tracking branch 'origin/Beta_8.995' into Beta_8.995

Browse Source
This commit is contained in:
Marius Stanciu
2022-05-03 15:04:42 +03:00
parent 7406c444ed 34d65a2077
commit df2727b911
70 changed files with 87437 additions and 76509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camlib.py
View File

@@ -6264,7 +6264,7 @@ class CNCjob(Geometry):
return self.gcode, start_gcode
def generate_gcode_from_solderpaste_geo(self, **kwargs):
def generate_gcode_from_solderpaste_geo(self, is_first=False, **kwargs):
"""
Algorithm to generate from multitool Geometry.
@@ -6291,6 +6291,7 @@ class CNCjob(Geometry):
# this is the tool diameter, it is used as such to accommodate the preprocessor who need the tool diameter
# given under the name 'toolC'
self.postdata['toolC'] = kwargs['tooldia']
self.postdata['z_start'] = kwargs['data']['tools_solderpaste_z_start']
self.postdata['z_dispense'] = kwargs['data']['tools_solderpaste_z_dispense']
@@ -6299,6 +6300,7 @@ class CNCjob(Geometry):
self.postdata['z_toolchange'] = kwargs['data']['tools_solderpaste_z_toolchange']
self.postdata['xy_toolchange'] = kwargs['data']['tools_solderpaste_xy_toolchange']
self.postdata['frxy'] = kwargs['data']['tools_solderpaste_frxy']
self.postdata['fr_rapids'] = kwargs['data']['tools_solderpaste_fr_rapids']
self.postdata['frz'] = kwargs['data']['tools_solderpaste_frz']
self.postdata['frz_dispense'] = kwargs['data']['tools_solderpaste_frz_dispense']
self.postdata['speedfwd'] = kwargs['data']['tools_solderpaste_speedfwd']
@@ -6307,8 +6309,6 @@ class CNCjob(Geometry):
self.postdata['dwellrev'] = kwargs['data']['tools_solderpaste_dwellrev']
self.postdata['pp_solderpaste_name'] = kwargs['data']['tools_solderpaste_pp']
self.postdata['toolC'] = kwargs['tooldia']
self.pp_solderpaste_name = kwargs['data']['tools_solderpaste_pp'] if kwargs['data']['tools_solderpaste_pp'] \
else self.app.options['tools_solderpaste_pp']
p = self.app.preprocessors[self.pp_solderpaste_name]
@@ -6332,7 +6332,9 @@ class CNCjob(Geometry):
storage.insert(geo_shape)
# Initial G-Code
self.gcode = self.doformat(p.start_code)
self.gcode = ''
if is_first:
self.gcode += self.doformat(p.start_code)
self.gcode += self.doformat(p.spindle_off_code)
self.gcode += self.doformat(p.toolchange_code)
@@ -7193,7 +7195,7 @@ class CNCjob(Geometry):
return
try:
if self.app.options['global_theme'] == 'light':
if self.app.options['global_theme'] in ['default', 'light']:
obj.annotation.set(text=text, pos=pos, visible=obj.obj_options['plot'],
font_size=self.app.options["cncjob_annotation_fontsize"],
color=self.app.options["cncjob_annotation_fontcolor"])