Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0

This commit is contained in:
ChrisTerBeke 2017-09-22 11:31:56 +02:00
commit a7f28e688e

View file

@ -125,23 +125,12 @@ class ProfilesModel(InstanceContainersModel):
for key in reversed(tmp_all_quality_items.keys()): for key in reversed(tmp_all_quality_items.keys()):
all_quality_items[key] = tmp_all_quality_items[key] all_quality_items[key] = tmp_all_quality_items[key]
# First the suitable containers are set in the model
containers = []
for data_item in all_quality_items.values(): for data_item in all_quality_items.values():
suitable_item = data_item["suitable_container"] item = data_item["suitable_container"]
if suitable_item is None: if item is None:
suitable_item = data_item["all_containers"][0] item = data_item["all_containers"][0]
containers.append(suitable_item)
# Once the suitable containers are collected, the rest of the containers are appended profile = container_registry.findContainers(id = item["id"])
for data_item in all_quality_items.values():
for item in data_item["all_containers"]:
if item not in containers:
containers.append(item)
# Now all the containers are set
for item in containers:
profile = container_registry.findContainers(id=item["id"])
if not profile: if not profile:
item["layer_height"] = "" # Can't update a profile that is unknown. item["layer_height"] = "" # Can't update a profile that is unknown.
item["available"] = False item["available"] = False