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

- small changes in the TclCommands: MillDrills, MillSlots, DrillCNCJob: the new parameter for tolerance is now named: tooldia

Browse Source 
- cleaned up the 'About FlatCAM' window, started to give credits for the translation team
This commit is contained in:
Marius Stanciu
2019-09-12 17:28:56 +03:00
parent 8e2cca827a
commit d22592e64c
6 changed files with 160 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tclCommands/TclCommandDrillcncjob.py
View File

@@ -30,7 +30,7 @@ class TclCommandDrillcncjob(TclCommandSignaled):
('ppname_e', str),
('outname', str),
('opt_type', str),
('tol', float)
('diatol', float)
])
# array of mandatory options for current Tcl command: required = {'name','outname'}
@@ -57,10 +57,11 @@ class TclCommandDrillcncjob(TclCommandSignaled):
('opt_type', 'Name of move optimization type. B by default for Basic OR-Tools, M for Metaheuristic OR-Tools'
'T from Travelling Salesman Algorithm. B and M works only for 64bit version of FlatCAM and '
'T works only for 32bit version of FlatCAM'),
('tol', 'Tolerance. Percentange (0.0 ... 100.0) within which dias in drilled_dias will be judged to be the'
'same as the ones in the tools from the Excellon object. E.g: if in drill_dias we have a diameter'
'with value 1.0, in the Excellon we have a tool with dia = 1.05 and we set a tolerance tol = 5.0'
'then the drills with the dia 1.05 in Excellon will be processed. Float number.')
('diatol', 'Tolerance. Percentange (0.0 ... 100.0) within which dias in drilled_dias will be judged to be '
'the same as the ones in the tools from the Excellon object. E.g: if in drill_dias we have a '
'diameter with value 1.0, in the Excellon we have a tool with dia = 1.05 and we set a tolerance '
'diatol = 5.0 then the drills with the dia = (0.95 ... 1.05) '
'in Excellon will be processed. Float number.')
]),
'examples': ['drillcncjob test.TXT -drillz -1.5 -travelz 14 -feedrate 222 -feedrate_rapid 456 -spindlespeed 777'
' -toolchange True -toolchangez 33 -endz 22 -ppname_e default\n'
@@ -111,8 +112,8 @@ class TclCommandDrillcncjob(TclCommandSignaled):
req_dia_form = float('%.2f' % float(req_dia)) if units == 'MM' else \
float('%.4f' % float(req_dia))
if 'tol' in args:
tolerance = args['tol'] / 100
if 'diatol' in args:
tolerance = args['diatol'] / 100
tolerance = 0.0 if tolerance < 0.0 else tolerance
tolerance = 1.0 if tolerance > 1.0 else tolerance
@@ -134,6 +135,7 @@ class TclCommandDrillcncjob(TclCommandSignaled):
# no longer needed
del args['drilled_dias']
del args['diatol']
# Split and put back. We are passing the whole dictionary later.
# args['milled_dias'] = [x.strip() for x in args['tools'].split(",")]