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

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

Browse source
This commit is contained in:
fieldOfView 2016-08-29 16:35:32 +02:00
commit 00250acb10
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/Settings/QualitySettingsModel.py
View file

@ -106,7 +106,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
quality_type = quality_container.getMetaDataEntry("quality_type") quality_type = quality_container.getMetaDataEntry("quality_type")
definition_id = quality_container.getDefinition().getId() definition_id = quality_container.getDefinition().getId()
criteria = { "type": "quality", "quality_type": quality_type, "definition": definition_id } criteria = {"type": "quality", "quality_type": quality_type, "definition": definition_id}
if self._material: if self._material:
criteria["material"] = self._material criteria["material"] = self._material
@ -135,8 +135,14 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
return return
if quality_changes_container: if quality_changes_container:
criteria = {"type": "quality_changes", "quality": quality_type, "extruder": self._extruder_id, "definition": definition_id } criteria = {"type": "quality_changes", "quality": quality_type, "definition": definition_id, "name": quality_changes_container.getName()}
if self._extruder_id != "":
criteria["extruder"] = self._extruder_id
else:
criteria["extruder"] = None
changes = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria) changes = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)
if changes: if changes:
containers.extend(changes) containers.extend(changes)

3
resources/qml/Preferences/ProfileTab.qml
View file

@ -35,7 +35,8 @@ Tab
TableViewColumn TableViewColumn
{ {
role: "user_value" role: "user_value"
title: catalog.i18nc("@title:column", "Current"); visible: quality == Cura.MachineManager.activeQualityId title: catalog.i18nc("@title:column", "Current");
visible: quality == Cura.MachineManager.activeQualityId
width: parent.width * 0.18 width: parent.width * 0.18
} }
TableViewColumn TableViewColumn