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

* Make sure that quality changes are machine dependent but material independent.

Browse source 
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
This commit is contained in:
Simon Edwards 2016-09-20 16:06:26 +02:00 • committed by U-ULTIMAKER\s.edwards
parent 45b753082f
commit 90dedc354c
5 changed files with 297 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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];
}
}