GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-22 04:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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 id: profileSelectionInstantiator
model: UM.InstanceContainersModel 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 property int separatorIndex: -1

18
resources/qml/SidebarHeader.qml
View File

@ -266,7 +266,23 @@ Item
id: materialSelectionInstantiator id: materialSelectionInstantiator
model: UM.InstanceContainersModel 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 MenuItem
{ {