From 9a19e1277711c3d7d14190da32c87842c4aedd5f Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Thu, 16 May 2013 17:39:45 +0200 Subject: [PATCH] Fix gviz.add_parsed_gcode for relative gcodes --- printrun/gviz.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/printrun/gviz.py b/printrun/gviz.py index 19abb41..1dd22d3 100755 --- a/printrun/gviz.py +++ b/printrun/gviz.py @@ -318,10 +318,19 @@ class gviz(wx.Panel): target = self.lastpos[:] target[5] = 0.0 target[6] = 0.0 - if gline.x != None: target[0] = gline.x - if gline.y != None: target[1] = gline.y - if gline.z != None: target[2] = gline.z - if gline.e != None: target[3] = gline.e + if gline.relative: + if gline.x != None: target[0] += gline.x + if gline.y != None: target[1] += gline.y + if gline.z != None: target[2] += gline.z + else: + if gline.x != None: target[0] = gline.x + if gline.y != None: target[1] = gline.y + if gline.z != None: target[2] = gline.z + if gline.e != None: + if gline.relative_e: + target[3] += gline.e + else: + target[3] = gline.e if gline.f != None: target[4] = gline.f if gline.i != None: target[5] = gline.i if gline.j != None: target[6] = gline.j