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

Merge branch 'feature_intent' into feature_intent_container_tree

Browse source 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
This commit is contained in:
Ghostkeeper 2019-08-13 14:59:05 +02:00
commit 6a8e1557c3
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1383 changed files with 33204 additions and 35215 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Machines/VariantManager.py
View file

@ -93,7 +93,14 @@ class VariantManager:
if variant_definition not in self._machine_to_buildplate_dict_map:
self._machine_to_buildplate_dict_map[variant_definition] = OrderedDict()
variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0]
try:
variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0]
except IndexError as e:
# It still needs to break, but we want to know what variant ID made it break.
msg = "Unable to find build plate variant with the id [%s]" % variant_metadata["id"]
Logger.logException("e", msg)
raise IndexError(msg)
buildplate_type = variant_container.getProperty("machine_buildplate_type", "value")
if buildplate_type not in self._machine_to_buildplate_dict_map[variant_definition]:
self._machine_to_variant_dict_map[variant_definition][buildplate_type] = dict()