Skip to content

Accept the Metric command, same as inch #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept the Metric command, same as inch #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions gerbmerge/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
# feed/speed (for Protel)
xtdef2_pat = re.compile(r'^(T\d+)C([0-9.]+)(?:F\d+)?(?:S\d+)?$') # Tool+diameter definition with optional
# feed/speed at the end (for OrCAD)
xzsup_pat = re.compile(r'^INCH(,([LT])Z)?$') # Leading/trailing zeros INCLUDED
xzsup_pat = re.compile(r'^(?:INCH|METRIC)(,([LT])Z)?$') # Leading/trailing zeros INCLUDED

XIgnoreList = ( \
re.compile(r'^%$'),
Expand Down Expand Up @@ -672,9 +672,6 @@ def xln2tenthou2 (L, divisor=divisor, zeropadto=zeropadto):
if line[:6]=='METRIC':
if (config.Config['measurementunits'] == 'inch'):
raise RuntimeError, "File %s units do match config file" % fullname
else:
#print "ignoring METRIC directive: " + line
continue # ignore it so func doesn't choke on it

if line[:3] == 'T00': # a tidying up that we can ignore
continue
Expand Down