q3k
/
Printrun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store all layers, including ones with no movement 

This is a first step towards using gcoder.GCode as a storage for print-time
gcode. Now all we need is a "gcode line id => (layer id, in-layer line id)"
mapping to be able to do the indirection.
master
Guillaume Seguin 2013-05-18 22:23:28 +02:00
parent b781566132
commit f1fc71ba05
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
printrun/gcoder.py
View File

@ -129,11 +129,12 @@ class GCode(object):
lines = None
layers = None
all_layers = None
def __init__(self,data):
self.lines = [Line(l2) for l2 in
(l.strip() for l in data)
if l2 and not l2.startswith(";")]
if l2 and not l2[0] == ";"]
self._preprocess()
self._create_layers()
@ -166,6 +167,7 @@ class GCode(object):
# FIXME : looks like this needs to be tested with list Z on move
def _create_layers(self):
layers = {}
all_layers = []
prev_z = None
cur_z = 0
@ -181,6 +183,7 @@ class GCode(object):
cur_z = line.z
if cur_z != prev_z:
all_layers.append(Layer(cur_lines))
old_lines = layers.get(prev_z, [])
old_lines += cur_lines
layers[prev_z] = old_lines
@ -189,9 +192,11 @@ class GCode(object):
cur_lines.append(line)
prev_z = cur_z
old_lines = layers.pop(prev_z, [])
old_lines += cur_lines
layers[prev_z] = old_lines
if cur_lines:
all_layers.append(Layer(cur_lines))
old_lines = layers.pop(prev_z, [])
old_lines += cur_lines
layers[prev_z] = old_lines
for idx in layers.keys():
cur_lines = layers[idx]
@ -201,10 +206,11 @@ class GCode(object):
has_movement = True
break
if has_movement:
layers[idx] = Layer(layers[idx])
layers[idx] = Layer(cur_lines)
else:
del layers[idx]
self.all_layers = all_layers
self.layers = layers
def num_layers(self):