diff --git a/plugins/GCodeReader/GCodeReader.py b/plugins/GCodeReader/GCodeReader.py index 54af0d5dae..cf7d16c5a4 100644 --- a/plugins/GCodeReader/GCodeReader.py +++ b/plugins/GCodeReader/GCodeReader.py @@ -80,7 +80,7 @@ class GCodeReader(MeshReader): return AxisAlignedBox(minimum=Vector(0, 0, 0), maximum=Vector(10, 10, 10)) @staticmethod - def createPolygon(layer_data, path, layer_id, extruder, extruder_offsets): + def createPolygon(layer_data, path, layer_id, extruder): countvalid = 0 for point in path: if point[3] > 0: @@ -104,8 +104,8 @@ class GCodeReader(MeshReader): points = numpy.empty((count, 3), numpy.float32) i = 0 for point in path: - points[i, 0] = point[0] + extruder_offsets[extruder]['x'] - points[i, 1] = point[1] + extruder_offsets[extruder]['y'] + points[i, 0] = point[0] + points[i, 1] = point[1] points[i, 2] = point[2] if i > 0: if point[3] == 1: @@ -156,7 +156,6 @@ class GCodeReader(MeshReader): layer_data = LayerDataBuilder.LayerDataBuilder() current_extruder = 0 - extruder_offsets = {0: {'x': 0, 'y': 0}} current_path = [] current_x = 0 current_y = 0 @@ -207,7 +206,7 @@ class GCodeReader(MeshReader): current_path.append([current_x, current_z, -current_y, 0]) if z_changed: if len(current_path) > 1 and current_z > 0: - if self.createPolygon(layer_data, current_path, current_layer, current_extruder, extruder_offsets): + if self.createPolygon(layer_data, current_path, current_layer, current_extruder): current_layer += 1 else: current_path.clear() @@ -230,30 +229,18 @@ class GCodeReader(MeshReader): current_y += y if z is not None: current_z += z - elif G == 10: - x = self.getFloat(line, "X") - y = self.getFloat(line, "Y") - p = self.getInt(line, "P") - if p is not None: - if extruder_offsets.get(p, None) is None: - extruder_offsets[p] = {'x': 0, 'y': 0} - print(p, type(p)) - if x is not None: - extruder_offsets[p]['x'] = x - if y is not None: - extruder_offsets[p]['y'] = y T = self.getInt(line, "T") if T is not None: current_extruder = T if len(current_path) > 1 and current_z > 0: - if self.createPolygon(layer_data, current_path, current_layer, current_extruder, extruder_offsets): + if self.createPolygon(layer_data, current_path, current_layer, current_extruder): current_layer += 1 else: current_path.clear() if len(current_path) > 1: - if self.createPolygon(layer_data, current_path, current_layer, current_extruder, extruder_offsets): + if self.createPolygon(layer_data, current_path, current_layer, current_extruder): current_layer += 1 layer_mesh = layer_data.build()