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

Filter material/quality by machine only when we should filter

Browse source 
Contributes to CURA-1612
This commit is contained in:
Arjen Hiemstra 2016-06-02 08:07:51 +02:00
parent 123af4e3e4
commit ceb21ce89b
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/ProfileSetup.qml
View file

@ -59,7 +59,23 @@ Item{
id: profileSelectionInstantiator
model: UM.InstanceContainersModel
{
filter: {"type": "quality"}
filter:
{
var result = { "type": "quality" };
if(Cura.MachineManager.filterQualityByMachine)
{
result.definition = Cura.MachineManager.activeDefinitionId;
if(Cura.MachineManager.hasMaterials)
{
result.material = Cura.MachineManager.activeMaterialId;
}
}
else
{
result.definition = "fdmprinter"
}
return result
}
}
property int separatorIndex: -1

18
resources/qml/SidebarHeader.qml
View file

@ -266,7 +266,23 @@ Item
id: materialSelectionInstantiator
model: UM.InstanceContainersModel
{
filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId }
filter:
{
var result = { "type": "material" }
if(Cura.MachineManager.filterMaterialsByMachine)
{
// result.definition = Cura.MachineManager.activeDefinitionId
if(Cura.MachineManager.hasVariants)
{
result.variant = Cura.MachineManager.activeVariantId
}
}
else
{
result.definition = "fdmprinter"
}
return result
}
}
MenuItem
{