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

Revert "Fixes for StartSliceJob"

Browse source 
This reverts commit 9ec5770a1c.
This commit is contained in:
Ian Paschal 2018-07-06 10:54:24 +02:00
parent 75d5828f5f
commit 2c291e02be
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -5,7 +5,7 @@ import numpy
from string import Formatter from string import Formatter
from enum import IntEnum from enum import IntEnum
import time import time
from typing import Any, cast, Dict, List, Optional, Set from typing import Any, Dict, List, Optional, Set
import re import re
import Arcus #For typing. import Arcus #For typing.
@ -114,7 +114,7 @@ class StartSliceJob(Job):
self.setResult(StartJobResult.Error) self.setResult(StartJobResult.Error)
return return
stack = cast(ContainerStack, CuraApplication.getInstance().getGlobalContainerStack()) stack = CuraApplication.getInstance().getGlobalContainerStack()
if not stack: if not stack:
self.setResult(StartJobResult.Error) self.setResult(StartJobResult.Error)
return return
@ -216,11 +216,12 @@ class StartSliceJob(Job):
if temp_list: if temp_list:
object_groups.append(temp_list) object_groups.append(temp_list)
extruders_enabled = {position: stack.isEnabled for position, extruder in stack.extruders.items()} extruders_enabled = {position: stack.isEnabled for position, stack in CuraApplication.getInstance().getGlobalContainerStack().extruders.items()}
filtered_object_groups = [] filtered_object_groups = []
has_model_with_disabled_extruders = False has_model_with_disabled_extruders = False
associated_disabled_extruders = set() associated_disabled_extruders = set()
for group in object_groups: for group in object_groups:
stack = CuraApplication.getInstance().getGlobalContainerStack()
skip_group = False skip_group = False
for node in group: for node in group:
extruder_position = node.callDecoration("getActiveExtruderPosition") extruder_position = node.callDecoration("getActiveExtruderPosition")
@ -324,11 +325,11 @@ class StartSliceJob(Job):
# \param default_extruder_nr Stack nr to use when no stack nr is specified, defaults to the global stack # \param default_extruder_nr Stack nr to use when no stack nr is specified, defaults to the global stack
def _expandGcodeTokens(self, value: str, default_extruder_nr: int = -1) -> str: def _expandGcodeTokens(self, value: str, default_extruder_nr: int = -1) -> str:
if not self._all_extruders_settings: if not self._all_extruders_settings:
global_stack = cast(ContainerStack, CuraApplication.getInstance().getGlobalContainerStack()) global_stack = CuraApplication.getInstance().getGlobalContainerStack()
# NB: keys must be strings for the string formatter # NB: keys must be strings for the string formatter
self._all_extruders_settings = { self._all_extruders_settings = {
"-1": self._buildReplacementTokens(cast(ContainerStack, global_stack)) "-1": self._buildReplacementTokens(global_stack)
} }
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()): for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):