3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CURA-4577 Take into account relative movements in GCodes

Browse source
This commit is contained in:
Diego Prado Gesto 2017-11-17 15:05:08 +01:00
parent b868f913c4
commit a0304255d1
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/GCodeReader/GCodeReader.py
View file

@ -136,16 +136,22 @@ class GCodeReader(MeshReader):
def _gCode0(self, position, params, path): def _gCode0(self, position, params, path):
x, y, z, e = position x, y, z, e = position
x = params.x if params.x is not None else x if self._is_absolute_positioning:
y = params.y if params.y is not None else y x = params.x if params.x is not None else x
z = params.z if params.z is not None else position.z y = params.y if params.y is not None else y
z = params.z if params.z is not None else position.z
else:
x = x + params.x if params.x is not None else x
y = y + params.y if params.y is not None else y
z = z + params.z if params.z is not None else position.z
if params.e is not None: if params.e is not None:
if params.e > e[self._extruder_number]: new_extrusion_value = params.e if self._is_absolute_positioning else e[self._extruder_number] + params.e
if new_extrusion_value > 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_number] = params.e e[self._extruder_number] = new_extrusion_value
# Only when extruding we can determine the latest known "layer height" which is the difference in height between extrusions # Only when extruding we can determine the latest known "layer height" which is the difference in height between extrusions
# Also, 1.5 is a heuristic for any priming or whatsoever, we skip those. # Also, 1.5 is a heuristic for any priming or whatsoever, we skip those.