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

Turn GlobalStack's extruders property into a dict

Browse source 
We do not load the extruders in a fixed order, thus we cannot assume
that addExtruder is called in the right order. This means that index 0
of the extruders is not necessarily the extruder with position 0. So
instead, use the extruder position as a dict key.

Contributes to CURA-3738
This commit is contained in:
Arjen Hiemstra 2017-05-17 10:58:28 +02:00
parent 9686df285d
commit a7bf205dbc
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/ExtruderStack.py
View file

@ -64,7 +64,7 @@ class ExtruderStack(CuraContainerStack):
limit_to_extruder = super().getProperty(key, "limit_to_extruder") limit_to_extruder = super().getProperty(key, "limit_to_extruder")
if (limit_to_extruder is not None and limit_to_extruder != "-1") and self.getMetaDataEntry("position") != str(limit_to_extruder): if (limit_to_extruder is not None and limit_to_extruder != "-1") and self.getMetaDataEntry("position") != str(limit_to_extruder):
result = self.getNextStack().extruders[int(limit_to_extruder)].getProperty(key, property_name) result = self.getNextStack().extruders[str(limit_to_extruder)].getProperty(key, property_name)
if result is not None: if result is not None:
return result return result

12
cura/Settings/GlobalStack.py
View file

@ -1,7 +1,7 @@
# Copyright (c) 2017 Ultimaker B.V. # Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher. # Cura is released under the terms of the AGPLv3 or higher.
from typing import Any from typing import Any, Dict
from PyQt5.QtCore import pyqtProperty from PyQt5.QtCore import pyqtProperty
@ -24,7 +24,7 @@ class GlobalStack(CuraContainerStack):
self.addMetaDataEntry("type", "machine") # For backward compatibility self.addMetaDataEntry("type", "machine") # For backward compatibility
self._extruders = [] self._extruders = {}
# This property is used to track which settings we are calculating the "resolve" for # This property is used to track which settings we are calculating the "resolve" for
# and if so, to bypass the resolve to prevent an infinite recursion that would occur # and if so, to bypass the resolve to prevent an infinite recursion that would occur
@ -34,8 +34,8 @@ class GlobalStack(CuraContainerStack):
## Get the list of extruders of this stack. ## Get the list of extruders of this stack.
# #
# \return The extruders registered with this stack. # \return The extruders registered with this stack.
@pyqtProperty("QVariantList") @pyqtProperty("QVariantMap")
def extruders(self) -> list: def extruders(self) -> Dict[str, "ExtruderStack"]:
return self._extruders return self._extruders
@classmethod @classmethod
@ -53,7 +53,7 @@ class GlobalStack(CuraContainerStack):
if extruder_count and len(self._extruders) + 1 > extruder_count: if extruder_count and len(self._extruders) + 1 > extruder_count:
Logger.log("w", "Adding extruder {meta} to {id} but its extruder count is {count}".format(id = self.id, count = extruder_count, meta = str(extruder.getMetaData()))) Logger.log("w", "Adding extruder {meta} to {id} but its extruder count is {count}".format(id = self.id, count = extruder_count, meta = str(extruder.getMetaData())))
self._extruders.append(extruder) self._extruders[extruder.getMetaDataEntry("position", "0")] = extruder
## Overridden from ContainerStack ## Overridden from ContainerStack
# #
@ -83,7 +83,7 @@ class GlobalStack(CuraContainerStack):
limit_to_extruder = super().getProperty(key, "limit_to_extruder") limit_to_extruder = super().getProperty(key, "limit_to_extruder")
if limit_to_extruder is not None and limit_to_extruder != "-1": if limit_to_extruder is not None and limit_to_extruder != "-1":
if super().getProperty(key, "settable_per_extruder"): if super().getProperty(key, "settable_per_extruder"):
result = self._extruders[int(limit_to_extruder)].getProperty(key, property_name) result = self._extruders[str(limit_to_extruder)].getProperty(key, property_name)
if result is not None: if result is not None:
return result return result
else: else: