3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into feature_enable_disable_extruder

Browse source
This commit is contained in:
Jack Ha 2018-03-12 09:06:24 +01:00
commit d70cc072e9
478 changed files with 1278 additions and 1379 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/Machines/Models/BrandMaterialsModel.py
View file

@ -122,17 +122,17 @@ class BrandMaterialsModel(ListModel):
material_type_item["colors"].clear()
# Sort materials by name
material_list = sorted(material_list, key = lambda x: x["name"])
material_list = sorted(material_list, key = lambda x: x["name"].upper())
material_type_item["colors"].setItems(material_list)
material_type_item_list.append(material_type_item)
# Sort material type by name
material_type_item_list = sorted(material_type_item_list, key = lambda x: x["name"])
material_type_item_list = sorted(material_type_item_list, key = lambda x: x["name"].upper())
brand_item["materials"].setItems(material_type_item_list)
brand_item_list.append(brand_item)
# Sort brand by name
brand_item_list = sorted(brand_item_list, key = lambda x: x["name"])
brand_item_list = sorted(brand_item_list, key = lambda x: x["name"].upper())
self.setItems(brand_item_list)

2
cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py
View file

@ -23,7 +23,7 @@ class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel):
quality_changes_group_dict = self._quality_manager.getQualityChangesGroups(active_global_stack)
item_list = []
for key in sorted(quality_changes_group_dict):
for key in sorted(quality_changes_group_dict, key = lambda name: name.upper()):
quality_changes_group = quality_changes_group_dict[key]
item = {"name": quality_changes_group.name,

2
cura/Machines/Models/GenericMaterialsModel.py
View file

@ -55,6 +55,6 @@ class GenericMaterialsModel(BaseMaterialsModel):
item_list.append(item)
# Sort the item list by material name alphabetically
item_list = sorted(item_list, key = lambda d: d["name"])
item_list = sorted(item_list, key = lambda d: d["name"].upper())
self.setItems(item_list)

2
cura/Machines/Models/MaterialManagementModel.py
View file

@ -97,5 +97,5 @@ class MaterialManagementModel(ListModel):
material_list.append(item)
material_list = sorted(material_list, key = lambda k: (k["brand"].lower(), k["name"]))
material_list = sorted(material_list, key = lambda k: (k["brand"].upper(), k["name"].upper()))
self.setItems(material_list)

2
cura/Machines/Models/NozzleModel.py
View file

@ -45,7 +45,7 @@ class NozzleModel(ListModel):
return
item_list = []
for hotend_name, container_node in sorted(variant_node_dict.items(), key = lambda i: i[0]):
for hotend_name, container_node in sorted(variant_node_dict.items(), key = lambda i: i[0].upper()):
item = {"id": hotend_name,
"hotend_name": hotend_name,
"container_node": container_node

4
cura/Machines/Models/QualityManagementModel.py
View file

@ -59,7 +59,7 @@ class QualityManagementModel(ListModel):
"quality_changes_group": None}
item_list.append(item)
# Sort by quality names
item_list = sorted(item_list, key = lambda x: x["name"])
item_list = sorted(item_list, key = lambda x: x["name"].upper())
# Create quality_changes group items
quality_changes_item_list = []
@ -74,7 +74,7 @@ class QualityManagementModel(ListModel):
quality_changes_item_list.append(item)
# Sort quality_changes items by names and append to the item list
quality_changes_item_list = sorted(quality_changes_item_list, key = lambda x: x["name"])
quality_changes_item_list = sorted(quality_changes_item_list, key = lambda x: x["name"].upper())
item_list += quality_changes_item_list
self.setItems(item_list)

2
cura/Machines/Models/QualitySettingsModel.py
View file

@ -69,7 +69,7 @@ class QualitySettingsModel(ListModel):
return self._selected_quality_item
def _update(self):
if self._selected_quality_item is None:
if not self._selected_quality_item:
self.setItems([])
return