GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-07 23:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2017-03-13 17:24:17 +01:00
commit 7a30b29458
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
plugins/GCodeReader/GCodeReader.py
View File

@ -32,14 +32,18 @@ class GCodeReader(MeshReader):
Application.getInstance().hideMessageSignal.connect(self._onHideMessage) Application.getInstance().hideMessageSignal.connect(self._onHideMessage)
self._cancelled = False self._cancelled = False
self._message = None self._message = None
self._layer_number = 0
self._extruder_number = 0
self._layer_type = LayerPolygon.Inset0Type
self._clearValues() self._clearValues()
self._scene_node = None self._scene_node = None
self._position = namedtuple('Position', ['x', 'y', 'z', 'e']) self._position = namedtuple('Position', ['x', 'y', 'z', 'e'])
self._is_layers_in_file = False
def _clearValues(self): def _clearValues(self):
self._extruder = 0 self._extruder_number = 0
self._layer_type = LayerPolygon.Inset0Type self._layer_type = LayerPolygon.Inset0Type
self._layer = 0 self._layer_number = 0
self._previous_z = 0 self._previous_z = 0
self._layer_data_builder = LayerDataBuilder.LayerDataBuilder() self._layer_data_builder = LayerDataBuilder.LayerDataBuilder()
self._center_is_zero = False self._center_is_zero = False
@ -90,10 +94,10 @@ class GCodeReader(MeshReader):
if countvalid < 2: if countvalid < 2:
return False return False
try: try:
self._layer_data_builder.addLayer(self._layer) self._layer_data_builder.addLayer(self._layer_number)
self._layer_data_builder.setLayerHeight(self._layer, path[0][2]) self._layer_data_builder.setLayerHeight(self._layer_number, path[0][2])
self._layer_data_builder.setLayerThickness(self._layer, math.fabs(current_z - self._previous_z)) self._layer_data_builder.setLayerThickness(self._layer_number, math.fabs(current_z - self._previous_z))
this_layer = self._layer_data_builder.getLayer(self._layer) this_layer = self._layer_data_builder.getLayer(self._layer_number)
except ValueError: except ValueError:
return False return False
count = len(path) count = len(path)
@ -116,7 +120,7 @@ class GCodeReader(MeshReader):
line_widths[i - 1] = 0.2 line_widths[i - 1] = 0.2
i += 1 i += 1
this_poly = LayerPolygon(self._extruder, line_types, points, line_widths, line_thicknesses) this_poly = LayerPolygon(self._extruder_number, line_types, points, line_widths, line_thicknesses)
this_poly.buildCache() this_poly.buildCache()
this_layer.polygons.append(this_poly) this_layer.polygons.append(this_poly)
@ -127,29 +131,37 @@ class GCodeReader(MeshReader):
x = params.x if params.x is not None else x x = params.x if params.x is not None else x
y = params.y if params.y is not None else y y = params.y if params.y is not None else y
z_changed = False z_changed = False
if params.z is not None: if params.z is not None:
if z != params.z: if z != params.z:
z_changed = True z_changed = True
self._previous_z = z self._previous_z = z
z = params.z z = params.z
if params.e is not None: if params.e is not None:
if params.e > e[self._extruder]: if params.e > e[self._extruder_number]:
path.append([x, y, z, self._layer_type]) # extrusion path.append([x, y, z, self._layer_type]) # extrusion
else: else:
path.append([x, y, z, LayerPolygon.MoveRetractionType]) # retraction path.append([x, y, z, LayerPolygon.MoveRetractionType]) # retraction
e[self._extruder] = params.e e[self._extruder_number] = params.e
else: else:
path.append([x, y, z, LayerPolygon.MoveCombingType]) path.append([x, y, z, LayerPolygon.MoveCombingType])
if z_changed: if z_changed:
if not self._is_layers_in_file: if not self._is_layers_in_file:
if len(path) > 1 and z > 0: if len(path) > 1 and z > 0:
if self._createPolygon(z, path): if self._createPolygon(z, path):
self._layer += 1 self._layer_number += 1
path.clear() path.clear()
else: else:
path.clear() path.clear()
return self._position(x, y, z, e) return self._position(x, y, z, e)
# G0 and G1 should be handled exactly the same.
_gCode1 = _gCode0
## Home the head.
def _gCode28(self, position, params, path): def _gCode28(self, position, params, path):
return self._position( return self._position(
params.x if params.x is not None else position.x, params.x if params.x is not None else position.x,
@ -157,24 +169,25 @@ class GCodeReader(MeshReader):
0, 0,
position.e) position.e)
## Reset the current position to the values specified.
# For example: G92 X10 will set the X to 10 without any physical motion.
def _gCode92(self, position, params, path): def _gCode92(self, position, params, path):
if params.e is not None: if params.e is not None:
position.e[self._extruder] = params.e position.e[self._extruder_number] = params.e
return self._position( return self._position(
params.x if params.x is not None else position.x, params.x if params.x is not None else position.x,
params.y if params.y is not None else position.y, params.y if params.y is not None else position.y,
params.z if params.z is not None else position.z, params.z if params.z is not None else position.z,
position.e) position.e)
_gCode1 = _gCode0
def _processGCode(self, G, line, position, path): def _processGCode(self, G, line, position, path):
func = getattr(self, "_gCode%s" % G, None) func = getattr(self, "_gCode%s" % G, None)
if func is not None:
x = self._getFloat(line, "X") x = self._getFloat(line, "X")
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")
if func is not None:
if (x is not None and x < 0) or (y is not None and y < 0): if (x is not None and x < 0) or (y is not None and y < 0):
self._center_is_zero = True self._center_is_zero = True
params = self._position(x, y, z, e) params = self._position(x, y, z, e)
@ -182,13 +195,13 @@ class GCodeReader(MeshReader):
return position return position
def _processTCode(self, T, line, position, path): def _processTCode(self, T, line, position, path):
self._extruder = T self._extruder_number = T
if self._extruder + 1 > len(position.e): if self._extruder_number + 1 > len(position.e):
position.e.extend([0] * (self._extruder - len(position.e) + 1)) position.e.extend([0] * (self._extruder_number - len(position.e) + 1))
if not self._is_layers_in_file: if not self._is_layers_in_file:
if len(path) > 1 and position[2] > 0: if len(path) > 1 and position[2] > 0:
if self._createPolygon(position[2], path): if self._createPolygon(position[2], path):
self._layer += 1 self._layer_number += 1
path.clear() path.clear()
else: else:
path.clear() path.clear()
@ -202,12 +215,13 @@ class GCodeReader(MeshReader):
self._cancelled = False self._cancelled = False
scene_node = SceneNode() scene_node = SceneNode()
scene_node.getBoundingBox = self._getNullBoundingBox # Manually set bounding box, because mesh doesn't have mesh data # Override getBoundingBox function of the sceneNode, as this node should return a bounding box, but there is no
# real data to calculate it from.
scene_node.getBoundingBox = self._getNullBoundingBox
glist = [] gcode_list = []
self._is_layers_in_file = False self._is_layers_in_file = False
Logger.log("d", "Opening file %s" % file_name) Logger.log("d", "Opening file %s" % file_name)
with open(file_name, "r") as file: with open(file_name, "r") as file:
@ -215,7 +229,7 @@ class GCodeReader(MeshReader):
current_line = 0 current_line = 0
for line in file: for line in file:
file_lines += 1 file_lines += 1
glist.append(line) gcode_list.append(line)
if not self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword: if not self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword:
self._is_layers_in_file = True self._is_layers_in_file = True
file.seek(0) file.seek(0)
@ -242,6 +256,7 @@ class GCodeReader(MeshReader):
self._message.setProgress(math.floor(current_line / file_lines * 100)) self._message.setProgress(math.floor(current_line / file_lines * 100))
if len(line) == 0: if len(line) == 0:
continue continue
if line.find(self._type_keyword) == 0: if line.find(self._type_keyword) == 0:
type = line[len(self._type_keyword):].strip() type = line[len(self._type_keyword):].strip()
if type == "WALL-INNER": if type == "WALL-INNER":
@ -256,27 +271,33 @@ class GCodeReader(MeshReader):
self._layer_type = LayerPolygon.SupportType self._layer_type = LayerPolygon.SupportType
elif type == "FILL": elif type == "FILL":
self._layer_type = LayerPolygon.InfillType self._layer_type = LayerPolygon.InfillType
else:
Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)
if self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword: if self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword:
try: try:
layer_number = int(line[len(self._layer_keyword):]) layer_number = int(line[len(self._layer_keyword):])
self._createPolygon(current_position[2], current_path) self._createPolygon(current_position[2], current_path)
current_path.clear() current_path.clear()
self._layer = layer_number self._layer_number = layer_number
except: except:
pass pass
if line[0] == ";":
# This line is a comment. Ignore it.
if line.startswith(";"):
continue continue
G = self._getInt(line, "G") G = self._getInt(line, "G")
if G is not None: if G is not None:
current_position = self._processGCode(G, line, current_position, current_path) current_position = self._processGCode(G, line, current_position, current_path)
T = self._getInt(line, "T") T = self._getInt(line, "T")
if T is not None: if T is not None:
current_position = self._processTCode(T, line, current_position, current_path) current_position = self._processTCode(T, line, current_position, current_path)
if not self._is_layers_in_file and len(current_path) > 1 and current_position[2] > 0: if not self._is_layers_in_file and len(current_path) > 1 and current_position[2] > 0:
if self._createPolygon(current_position[2], current_path): if self._createPolygon(current_position[2], current_path):
self._layer += 1 self._layer_number += 1
current_path.clear() current_path.clear()
material_color_map = numpy.zeros((10, 4), dtype = numpy.float32) material_color_map = numpy.zeros((10, 4), dtype = numpy.float32)
@ -288,13 +309,13 @@ class GCodeReader(MeshReader):
scene_node.addDecorator(decorator) scene_node.addDecorator(decorator)
gcode_list_decorator = GCodeListDecorator() gcode_list_decorator = GCodeListDecorator()
gcode_list_decorator.setGCodeList(glist) gcode_list_decorator.setGCodeList(gcode_list)
scene_node.addDecorator(gcode_list_decorator) scene_node.addDecorator(gcode_list_decorator)
Logger.log("d", "Finished parsing %s" % file_name) Logger.log("d", "Finished parsing %s" % file_name)
self._message.hide() self._message.hide()
if self._layer == 0: if self._layer_number == 0:
Logger.log("w", "File %s doesn't contain any valid layers" % file_name) Logger.log("w", "File %s doesn't contain any valid layers" % file_name)
settings = Application.getInstance().getGlobalContainerStack() settings = Application.getInstance().getGlobalContainerStack()