GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 09:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

T466: Fixed one at a time printing

Browse Source
This commit is contained in:
Victor Larchenko 2016-11-03 16:39:20 +06:00 committed by Youness Alaoui
parent d7120e24d0
commit ba9d7fa1e2
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/GCODEReader/GCODEReader.py
View File

@ -100,35 +100,24 @@ class GCODEReader(MeshReader):
current_y = 0 current_y = 0
current_z = 0 current_z = 0
current_e = 0 current_e = 0
current_layer = 0
layers = []
for line in file:
glist.append(line)
if len(line) == 0:
continue
if line[0] == ";":
continue
G = self.getInt(line, "G")
if G is not None:
if G == 0 or G == 1:
z = self.getFloat(line, "Z")
if z is not None and z not in layers and z >= 0:
layers.append(z)
layers.sort()
file.seek(0)
for layer in layers:
layer_id = layers.index(layer)
layer_data.addLayer(layer_id)
layer_data.setLayerHeight(layer_id, layer)
layer_data.setLayerThickness(layer_id, 0.25)
def CreatePolygon(): def CreatePolygon():
countvalid = False
for point in current_path:
if point[3] > 0:
countvalid += 1
if countvalid < 2:
current_path.clear()
return False
try: try:
this_layer = layer_data.getLayer(layers.index(current_path[0][1])) layer_data.addLayer(current_layer)
layer_data.setLayerHeight(current_layer, current_path[0][1])
layer_data.setLayerThickness(current_layer, 0.25)
this_layer = layer_data.getLayer(current_layer)
except ValueError: except ValueError:
current_path.clear() current_path.clear()
return return False
count = len(current_path) count = len(current_path)
line_types = numpy.empty((count-1, 1), numpy.int32) line_types = numpy.empty((count-1, 1), numpy.int32)
line_types[:, 0] = 1 line_types[:, 0] = 1
@ -150,6 +139,7 @@ class GCODEReader(MeshReader):
this_layer.polygons.append(this_poly) this_layer.polygons.append(this_poly)
current_path.clear() current_path.clear()
return True
for line in file: for line in file:
if len(line) == 0: if len(line) == 0:
@ -181,8 +171,9 @@ class GCODEReader(MeshReader):
else: else:
current_path.append([current_x, current_z, -current_y, 0]) current_path.append([current_x, current_z, -current_y, 0])
if z_changed: if z_changed:
if len(current_path) > 1: if len(current_path) > 1 and current_z > 0:
CreatePolygon() if CreatePolygon():
current_layer += 1
else: else:
current_path.clear() current_path.clear()