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

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

Browse Source
This commit is contained in:
Aleksei S 2017-11-17 15:24:18 +01:00
commit 01437b2db1
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/GCodeReader/GCodeReader.py
View File

@ -54,6 +54,7 @@ class GCodeReader(MeshReader):
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
self._is_absolute_positioning = True # It can be absolute (G90) or relative (G91)
@staticmethod @staticmethod
def _getValue(line, code): def _getValue(line, code):
@ -135,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.
@ -166,6 +173,16 @@ class GCodeReader(MeshReader):
0, 0,
position.e) position.e)
## Set the absolute positioning
def _gCode90(self, position, params, path):
self._is_absolute_positioning = True
return position
## Set the relative positioning
def _gCode91(self, position, params, path):
self._is_absolute_positioning = False
return position
## Reset the current position to the values specified. ## Reset the current position to the values specified.
# For example: G92 X10 will set the X to 10 without any physical motion. # 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):
@ -196,7 +213,7 @@ class GCodeReader(MeshReader):
z = float(item[1:]) z = float(item[1:])
if item[0] == "E": if item[0] == "E":
e = float(item[1:]) e = float(item[1:])
if (x is not None and x < 0) or (y is not None and y < 0): if self._is_absolute_positioning and ((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)
return func(position, params, path) return func(position, params, path)