giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in evarsanyi/flatcam/fix_misc_tcl (pull request #246) 

Misc fixes to TCL glue
This commit is contained in:
Eric Varsanyi 2019-11-19 15:22:19 +00:00 committed by Marius Stanciu
parent 9a46f3045e b13d238070
commit 239c6fec5f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tclCommands/TclCommandCncjob.py
View File

@ -75,7 +75,7 @@ class TclCommandCncjob(TclCommandSignaled):
('pp', 'Name of the Geometry postprocessor. No quotes, case sensitive'), ('pp', 'Name of the Geometry postprocessor. No quotes, case sensitive'),
('muted', 'It will not put errors in the Shell.') ('muted', 'It will not put errors in the Shell.')
]), ]),
'examples': ['cncjob geo_name -tooldia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -ppname_g default'] 'examples': ['cncjob geo_name -dia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -pp default']
} }
def execute(self, args, unnamed_args): def execute(self, args, unnamed_args):

2
tclCommands/TclCommandCopperClear.py
View File

@ -249,7 +249,7 @@ class TclCommandCopperClear(TclCommand):
self.app.ncclear_tool.clear_copper(ncc_obj=obj, self.app.ncclear_tool.clear_copper(ncc_obj=obj,
sel_obj=box_obj, sel_obj=box_obj,
select_method='box', select_method='box',
tooldia=tooldia, ncctooldia=tooldia,
overlap=overlap, overlap=overlap,
order=order, order=order,
margin=margin, margin=margin,

2
tclCommands/TclCommandCutout.py
View File

@ -74,7 +74,7 @@ class TclCommandCutout(TclCommand):
if 'gaps' in args: if 'gaps' in args:
gaps_par = args['gaps'] gaps_par = args['gaps']
else: else:
gaps_par = 4 gaps_par = "4"
if 'gapsize' in args: if 'gapsize' in args:
gapsize_par = args['gapsize'] gapsize_par = args['gapsize']

1
tclCommands/TclCommandMillDrills.py
View File

@ -7,6 +7,7 @@
from ObjectCollection import * from ObjectCollection import *
from tclCommands.TclCommand import TclCommandSignaled from tclCommands.TclCommand import TclCommandSignaled
import math
class TclCommandMillDrills(TclCommandSignaled): class TclCommandMillDrills(TclCommandSignaled):

2
tclCommands/TclCommandOpenGerber.py
View File

@ -46,7 +46,7 @@ class TclCommandOpenGerber(TclCommandSignaled):
# How the object should be initialized # How the object should be initialized
def obj_init(gerber_obj, app_obj): def obj_init(gerber_obj, app_obj):
if not isinstance(gerber_obj, Geometry): if not isinstance(gerber_obj, FlatCAMGerber):
self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj))) self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj)))
# Opening the file happens here # Opening the file happens here