GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 18:45:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

small code fixes

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-22 09:51:59 +02:00
parent 21ea99d9f2
commit ab8bcc4ae3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cura/Settings/ProfilesModel.py
View File

@ -110,12 +110,11 @@ class ProfilesModel(InstanceContainersModel):
# active machine and material, and later yield the right ones. # active machine and material, and later yield the right ones.
tmp_all_quality_items = OrderedDict() tmp_all_quality_items = OrderedDict()
for item in super()._recomputeItems(): for item in super()._recomputeItems():
profile = container_registry.findContainers(id = item["id"]) profile = container_registry.findContainers(id=item["id"])
quality_type = profile[0].getMetaDataEntry("quality_type") if profile else "" quality_type = profile[0].getMetaDataEntry("quality_type") if profile else ""
if quality_type not in tmp_all_quality_items: if quality_type not in tmp_all_quality_items:
tmp_all_quality_items[quality_type] = {"suitable_container": None, tmp_all_quality_items[quality_type] = {"suitable_container": None, "all_containers": []}
"all_containers": []}
tmp_all_quality_items[quality_type]["all_containers"].append(item) tmp_all_quality_items[quality_type]["all_containers"].append(item)
if tmp_all_quality_items[quality_type]["suitable_container"] is None and profile[0] in qualities: if tmp_all_quality_items[quality_type]["suitable_container"] is None and profile[0] in qualities:
@ -142,9 +141,9 @@ class ProfilesModel(InstanceContainersModel):
# Now all the containers are set # Now all the containers are set
for item in containers: for item in containers:
profile = container_registry.findContainers(id = item["id"]) 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
yield item yield item
continue continue
@ -152,13 +151,13 @@ class ProfilesModel(InstanceContainersModel):
profile = profile[0] profile = profile[0]
item["available"] = profile in qualities item["available"] = profile in qualities
#Easy case: This profile defines its own layer height. # Easy case: This profile defines its own layer height.
if profile.hasProperty("layer_height", "value"): if profile.hasProperty("layer_height", "value"):
self._setItemLayerHeight(item, profile.getProperty("layer_height", "value"), unit) self._setItemLayerHeight(item, profile.getProperty("layer_height", "value"), unit)
yield item yield item
continue continue
#Quality-changes profile that has no value for layer height. Get the corresponding quality profile and ask that profile. # Quality-changes profile that has no value for layer height. Get the corresponding quality profile and ask that profile.
quality_type = profile.getMetaDataEntry("quality_type", None) quality_type = profile.getMetaDataEntry("quality_type", None)
if quality_type: if quality_type:
quality_results = machine_manager.determineQualityAndQualityChangesForQualityType(quality_type) quality_results = machine_manager.determineQualityAndQualityChangesForQualityType(quality_type)