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

Merge branch 'CURA-6604_fix_load_gcode' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-09-02 09:48:43 +02:00
commit a2e2c541e5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/GCodeReader/FlavorParser.py
View File

@ -3,7 +3,7 @@
import math import math
import re import re
from typing import Dict, List, NamedTuple, Optional, Union from typing import Dict, List, NamedTuple, Optional, Union, Set
import numpy import numpy
@ -38,6 +38,8 @@ class FlavorParser:
self._message = None # type: Optional[Message] self._message = None # type: Optional[Message]
self._layer_number = 0 self._layer_number = 0
self._extruder_number = 0 self._extruder_number = 0
# All extruder numbers that have been seen
self._extruders_seen = {0} # type: Set[int]
self._clearValues() self._clearValues()
self._scene_node = None self._scene_node = None
# X, Y, Z position, F feedrate and E extruder values are stored # X, Y, Z position, F feedrate and E extruder values are stored
@ -418,6 +420,7 @@ class FlavorParser:
if line.startswith("T"): if line.startswith("T"):
T = self._getInt(line, "T") T = self._getInt(line, "T")
if T is not None: if T is not None:
self._extruders_seen.add(T)
self._createPolygon(self._current_layer_thickness, current_path, self._extruder_offsets.get(self._extruder_number, [0, 0])) self._createPolygon(self._current_layer_thickness, current_path, self._extruder_offsets.get(self._extruder_number, [0, 0]))
current_path.clear() current_path.clear()
@ -468,12 +471,16 @@ class FlavorParser:
if self._layer_number == 0: if self._layer_number == 0:
Logger.log("w", "File doesn't contain any valid layers") Logger.log("w", "File doesn't contain any valid layers")
settings = CuraApplication.getInstance().getGlobalContainerStack() if not global_stack.getProperty("machine_center_is_zero", "value"):
if settings is not None and not settings.getProperty("machine_center_is_zero", "value"): machine_width = global_stack.getProperty("machine_width", "value")
machine_width = settings.getProperty("machine_width", "value") machine_depth = global_stack.getProperty("machine_depth", "value")
machine_depth = settings.getProperty("machine_depth", "value")
scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2)) scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2))
# Make sure that all seen extruders (if exist in the currently active machine) are enabled.
for extruder_nr in self._extruders_seen:
if str(extruder_nr) in global_stack.extruders:
CuraApplication.getInstance().getMachineManager().setExtruderEnabled(extruder_nr, True)
Logger.log("d", "GCode loading finished") Logger.log("d", "GCode loading finished")
if CuraApplication.getInstance().getPreferences().getValue("gcodereader/show_caution"): if CuraApplication.getInstance().getPreferences().getValue("gcodereader/show_caution"):