From 95ce59c0bf33e233524dcbd14d1b3e32dbe97184 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 23 Sep 2019 04:19:15 +0300 Subject: [PATCH] - added the new keywords to the default keywords list --- FlatCAMApp.py | 6 +++--- README.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 8d50fb69..3aaa3c5c 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1198,8 +1198,8 @@ class App(QtCore.QObject): # Keyword list "util_autocomplete_keywords": 'Desktop, Documents, FlatConfig, FlatPrj, Marius, My Documents, Paste_1, ' 'Repetier, Roland_MDX_20, Toolchange_Custom, Toolchange_Probe_MACH3, ' - 'Toolchange_manual, Users, all, angle_x, angle_y, axis, axisoffset, box, ' - 'center_x, center_y, columns, combine, connect, contour, default, ' + 'Toolchange_manual, Users, all, angle_x, angle_y, axis, auto, axisoffset, ' + 'box, center_x, center_y, columns, combine, connect, contour, default, ' 'depthperpass, dia, diatol, dist, drilled_dias, drillz, dwell, dwelltime, ' 'feedrate_z, grbl_11, grbl_laser, gridoffsety, gridx, gridy, has_offset, ' 'holes, hpgl, iso_type, line_xyz, margin, marlin, method, milled_dias, ' @@ -2117,7 +2117,7 @@ class App(QtCore.QObject): self.default_keywords = ['Desktop', 'Documents', 'FlatConfig', 'FlatPrj', 'Marius', 'My Documents', 'Paste_1', 'Repetier', 'Roland_MDX_20', 'Toolchange_Custom', 'Toolchange_Probe_MACH3', - 'Toolchange_manual', 'Users', 'all', 'angle_x', 'angle_y', 'axis', 'axisoffset', + 'Toolchange_manual', 'Users', 'all', 'angle_x', 'angle_y', 'auto', 'axis', 'axisoffset', 'box', 'center_x', 'center_y', 'columns', 'combine', 'connect', 'contour', 'default', 'depthperpass', 'dia', 'diatol', 'dist', 'drilled_dias', 'drillz', 'dwell', 'dwelltime', 'feedrate_z', 'grbl_11', 'grbl_laser', 'gridoffsety', 'gridx', 'gridy', diff --git a/README.md b/README.md index 7d2eba46..325a733c 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing. - added a new TclCommand named "set_origin" which will set the origin for all loaded objects to zero if the -auto True argument is used and to a certain x,y location if the format is: set_origin 5,7 - added a new TclCommand named "bounds" which will return a list of bounds values from a supplied list of objects names. For use in Tcl Scripts - updated strings in the translations and the .POT file +- added the new keywords to the default keywords list 22.09.2019