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

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-21 16:37:39 +02:00
commit 51dee95c8f
6 changed files with 310 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Menus/ProfileMenu.qml
View file

@ -38,11 +38,11 @@ Menu
id: customProfileInstantiator
model: UM.InstanceContainersModel
{
filter: menu.getFilter({
filter: ({
"type": "quality_changes",
"extruder": null,
"definition": Cura.MachineManager.filterQualityByMachine ? Cura.MachineManager.activeQualityDefinitionId : "fdmprinter"
});
})
onModelReset: customSeparator.visible = rowCount() > 0
}

23
resources/qml/Preferences/ProfilesPage.qml
View file

@ -17,22 +17,33 @@ UM.ManagementPage
model: UM.InstanceContainersModel
{
filter:
filterList:
{
var result = { "type": "quality*", "extruder": null };
var qualityFilter = { "type": "quality", "extruder": null };
if(Cura.MachineManager.filterQualityByMachine)
{
result.definition = Cura.MachineManager.activeQualityDefinitionId;
qualityFilter.definition = Cura.MachineManager.activeQualityDefinitionId;
if(Cura.MachineManager.hasMaterials)
{
result.material = Cura.MachineManager.allActiveMaterialIds[Cura.MachineManager.activeMachineId];
qualityFilter.material = Cura.MachineManager.allActiveMaterialIds[Cura.MachineManager.activeMachineId];
}
}
else
{
result.definition = "fdmprinter"
qualityFilter.definition = "fdmprinter";
}
return result
var qualityChangeFilter = { "type": "quality_changes", "extruder": null };
if(Cura.MachineManager.filterQualityByMachine)
{
qualityChangeFilter.definition = Cura.MachineManager.activeQualityDefinitionId;
}
else
{
qualityChangeFilter.definition = "fdmprinter";
}
return [qualityFilter, qualityChangeFilter];
}
}