rusefi
/
gerbmerge
mirror of https://github.com/rusefi/gerbmerge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad merge from upstream

This commit is contained in:
Eyal Soha 2017-05-15 21:13:37 +03:00 committed by Andrei
parent 8dd292fa5b
commit c896556260
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gerbmerge/jobs.py
View File

@ -776,15 +776,15 @@ class Job:
if match:
x, y = xln2tenthou2(match.groups())
else:
match = xdraw_pat.match(line)
if match:
x = xln2tenthou(match.groups())[0]
y = last_y
else:
match = ydraw_pat.match(line)
match = xdraw_pat.match(line)
if match:
y = xln2tenthou(match.groups())[0]
x = last_x
x = xln2tenthou(match.groups())[0]
y = last_y
else:
match = ydraw_pat.match(line)
if match:
y = xln2tenthou(match.groups())[0]
x = last_x
if match:
if currtool is None: