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

Merge branch '2.3'

Browse source 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
This commit is contained in:
Arjen Hiemstra 2016-10-24 17:10:41 +02:00
commit aed23ca17e
8 changed files with 131 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/qml/Settings/SettingItem.qml
View file

@ -194,10 +194,27 @@ Item {
// Inherit button needs to be visible if;
// - User made changes that override any loaded settings
// - This setting item uses inherit button at all
// - The revert button is not visible.
// - The type of the value of any deeper container is an "object" (eg; is a function)
visible:
{
return showInheritButton && Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
if(!base.showInheritButton)
{
return false;
}
if(revertButton.visible)
{
// The revert button already indicates there is a custom value for this setting, making this button superfluous.
return false;
}
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
}
return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, globalPropertyProvider.properties.limit_to_extruder).indexOf(definition.key) >= 0;
}
height: parent.height;

13
resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg Normal file
View file

@ -0,0 +1,13 @@
[general]
version = 2
name = Draft Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
global_quality = True
weight = -2
[values]
layer_height = 0.2

13
resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg Normal file
View file

@ -0,0 +1,13 @@
[general]
version = 2
name = Fast Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = fast
global_quality = True
weight = -1
[values]
layer_height = 0.15

13
resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg Normal file
View file

@ -0,0 +1,13 @@
[general]
version = 2
name = High Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = high
global_quality = True
weight = 0
[values]
layer_height = 0.06

13
resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg Normal file
View file

@ -0,0 +1,13 @@
[general]
version = 2
name = Normal Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = normal
global_quality = True
weight = 0
[values]
layer_height = 0.1