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

Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

Browse Source 
# Conflicts:
#	tclCommands/TclCommandMillDrills.py
This commit is contained in:
Marius Stanciu
2019-11-19 23:20:09 +02:00
committed by Marius
parent a4f5ed0b74 239c6fec5f
commit f707a9f06f
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tclCommands/TclCommandCncjob.py
View File

@@ -78,7 +78,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

@@ -253,7 +253,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

@@ -79,7 +79,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']

5
tclCommands/TclCommandMillDrills.py
View File

@@ -5,11 +5,10 @@
# MIT Licence # # MIT Licence #
# ########################################################## # ##########################################################
from ObjectCollection import *
from tclCommands.TclCommand import TclCommandSignaled from tclCommands.TclCommand import TclCommandSignaled
from FlatCAMObj import FlatCAMExcellon
import math import math
import collections
class TclCommandMillDrills(TclCommandSignaled): class TclCommandMillDrills(TclCommandSignaled):
""" """

2
tclCommands/TclCommandOpenGerber.py
View File

@@ -48,7 +48,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