- added a fix in the Excellon parser by allowing a comma in the tool definitions between the diameter and the rest
This commit is contained in:
parent
3b0496ddb9
commit
79e5cce6f1
@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
- FlatCAM editors now are separated each in it's own file
|
- 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
|
- 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
|
- 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
|
28.03.2019
|
||||||
|
|
||||||
|
@ -3636,7 +3636,7 @@ class Excellon(Geometry):
|
|||||||
# r'(?=.*F(\d*\.?\d*))?(?=.*S(\d*\.?\d*))?' +
|
# r'(?=.*F(\d*\.?\d*))?(?=.*S(\d*\.?\d*))?' +
|
||||||
# r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' +
|
# r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' +
|
||||||
# r'(?=.*Z([-\+]?\d*\.?\d*))?[CFSBHT]')
|
# 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'(?=.*F(\d*\.?\d*))?(?=.*S(\d*\.?\d*))?' +
|
||||||
r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' +
|
r'(?=.*B(\d*\.?\d*))?(?=.*H(\d*\.?\d*))?' +
|
||||||
r'(?=.*Z([-\+]?\d*\.?\d*))?[CFSBHT]')
|
r'(?=.*Z([-\+]?\d*\.?\d*))?[CFSBHT]')
|
||||||
|
Loading…
Reference in New Issue
Block a user