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

T466: Added multilayer parsing for speed issues

Browse Source
This commit is contained in:
Victor Larchenko 2016-10-16 13:30:16 +06:00 committed by Youness Alaoui
parent aa81cc090b
commit 38d42a7885
1 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/GCODEReader/GCODEReader.py
View File

@ -123,13 +123,6 @@ class GCODEReader(MeshReader):
layer_data = LayerDataBuilder.LayerDataBuilder() layer_data = LayerDataBuilder.LayerDataBuilder()
layer_id = 0
layer_data.addLayer(layer_id)
this_layer = layer_data.getLayer(layer_id)
layer_data.setLayerHeight(layer_id, 0)
layer_data.setLayerThickness(layer_id, 0.1)
current_extruder = 1 current_extruder = 1
current_path = [] current_path = []
current_x = 0 current_x = 0
@ -137,18 +130,47 @@ class GCODEReader(MeshReader):
current_z = 0 current_z = 0
current_e = 0 current_e = 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():
try:
this_layer = layer_data.getLayer(layers.index(current_path[0][1]))
except ValueError:
current_path.clear()
return
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
line_widths = numpy.empty((count-1, 1), numpy.int32) line_widths = numpy.empty((count-1, 1), numpy.int32)
line_widths[:, 0] = 1 line_widths[:, 0] = 0.5
points = numpy.empty((count, 3), numpy.float32) points = numpy.empty((count, 3), numpy.float32)
i = 0 i = 0
for point in current_path: for point in current_path:
points[i, 0] = point[0] points[i, 0] = point[0]
points[i, 1] = point[1] points[i, 1] = point[1]
points[i, 2] = point[2] points[i, 2] = point[2]
if i > 0:
line_types[i-1] = point[3]
i += 1 i += 1
this_poly = LayerPolygon.LayerPolygon(layer_data, current_extruder, line_types, points, line_widths) this_poly = LayerPolygon.LayerPolygon(layer_data, current_extruder, line_types, points, line_widths)
@ -158,11 +180,7 @@ class GCODEReader(MeshReader):
current_path.clear() current_path.clear()
# current_path.append([0, 0, 0])
# current_path.append([10, 10, 10])
# while file.readable():
for line in file: for line in file:
glist.append(line)
if len(line) == 0: if len(line) == 0:
continue continue
if line[0] == ";": if line[0] == ";":
@ -174,26 +192,32 @@ class GCODEReader(MeshReader):
y = self.getFloat(line, "Y") y = self.getFloat(line, "Y")
z = self.getFloat(line, "Z") z = self.getFloat(line, "Z")
e = self.getFloat(line, "E") e = self.getFloat(line, "E")
z_changed = False
if x is not None: if x is not None:
current_x = x current_x = x
if y is not None: if y is not None:
current_y = y current_y = y
if z is not None: if z is not None:
if not current_z == z:
z_changed = True
current_z = z current_z = z
if e is not None: if e is not None:
if e > current_e: if e > current_e:
current_path.append([current_x, current_z, -current_y]) current_path.append([current_x, current_z, -current_y, 1])
else: else:
if len(current_path) > 1: current_path.append([current_x, current_z, -current_y, 0])
CreatePolygon()
else:
current_path.clear()
current_e = e current_e = e
else: else:
# if G == 0:
# current_path.append([current_x, current_z, -current_y, 6])
# else:
current_path.append([current_x, current_z, -current_y, 0])
if z_changed:
if len(current_path) > 1: if len(current_path) > 1:
CreatePolygon() CreatePolygon()
elif G == 1: else:
current_path.clear() current_path.clear()
elif G == 28: elif G == 28:
x = self.getFloat(line, "X") x = self.getFloat(line, "X")
y = self.getFloat(line, "Y") y = self.getFloat(line, "Y")