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

- fixed a minor UI glitch in the CNCJob UI

Browse Source 
- made sure that the `drillcncjob` and `cncjob` Tcl commands will use the `-las_power` parameter to set the laser power when using a preprocessor with `laser` in its name
This commit is contained in:
Marius Stanciu
2022-01-31 00:29:59 +02:00
committed by Marius
parent 7420ac9fd5
commit 33897e8e83
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app_Main.py
View File

@@ -651,7 +651,7 @@ class App(QtCore.QObject):
# those need to be duplicated in self.defaults["util_autocomplete_keywords"] but within a string
self.default_keywords = ['Berta_CNC', 'Default_no_M6', 'Desktop', 'Documents', 'FlatConfig', 'FlatPrj',
'False', 'GRBL_11', 'GRL_11_no_M6', 'GRBL_laser', 'grbl_laser_eleks_drd',
'GRBL_laser_Z', 'ISEL_CNC', 'ISEL_ICP_CNC',
'GRBL_laser_z', 'ISEL_CNC', 'ISEL_ICP_CNC',
'Line_xyz', 'Marlin',
'Marlin_laser_FAN_pin', 'Marlin_laser_Spindle_pin', 'NCCAD9', 'Marius', 'My Documents',
'Paste_1', 'Repetier', 'Roland_MDX_20', 'Roland_MDX_540',
@@ -664,7 +664,7 @@ class App(QtCore.QObject):
'dwelltime', 'extracut_length', 'endxy', 'endz', 'f', 'factor', 'feedrate',
'feedrate_z', 'gridoffsety', 'gridx', 'gridy',
'has_offset', 'holes', 'hpgl', 'iso_type', 'join', 'keep_scripts',
'margin', 'marlin', 'method',
'las_min_pwr', 'las_power', 'margin', 'marlin', 'method',
'milled_dias', 'minoffset', 'name', 'offset', 'opt_type', 'order',
'outname', 'overlap', 'obj_name', 'passes', 'postamble', 'pp', 'ppname_e', 'ppname_g',
'preamble', 'radius', 'ref', 'rest', 'rows', 'shellvar_', 'scale_factor',