From 79e5cce6f1035205d0a3aceb5563447b2607b78e Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 30 Mar 2019 02:55:11 +0200 Subject: [PATCH] - added a fix in the Excellon parser by allowing a comma in the tool definitions between the diameter and the rest --- README.md | 1 + camlib.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b767423d..0006aac0 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing. - FlatCAM editors now are separated each in it's own file - fixed TextTool in Geometry Editor so it will open the notebook on activation and close it after finishing text adding - started to work on a Gerber Editor +- added a fix in the Excellon parser by allowing a comma in the tool definitions between the diameter and the rest 28.03.2019 diff --git a/camlib.py b/camlib.py index 77ae8f9a..1d0b59f7 100644 --- a/camlib.py +++ b/camlib.py @@ -3636,7 +3636,7 @@ class Excellon(Geometry): # r'(?=.*F(\d*\.?\d*))?(?=.*S(\d*\.?\d*))?' + # r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' + # r'(?=.*Z([-\+]?\d*\.?\d*))?[CFSBHT]') - self.toolset_re = re.compile(r'^T(\d+)(?=.*C(\d*\.?\d*))?' + + self.toolset_re = re.compile(r'^T(\d+)(?=.*C,?(\d*\.?\d*))?' + r'(?=.*F(\d*\.?\d*))?(?=.*S(\d*\.?\d*))?' + r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' + r'(?=.*Z([-\+]?\d*\.?\d*))?[CFSBHT]')