Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent

This commit is contained in:
Jaime van Kessel 2019-10-04 09:39:47 +02:00
commit 4793c77380
No known key found for this signature in database
GPG key ID: 3710727397403C91
5 changed files with 49 additions and 10 deletions

View file

@ -88,14 +88,18 @@ Item
function generateActiveQualityText()
{
var result = Cura.MachineManager.activeQualityOrQualityChangesName
var result = ""
if(Cura.MachineManager.activeIntentCategory != "default")
// If this is a custom quality, add intent (if present) and quality it is based on
if (Cura.MachineManager.isActiveQualityCustom)
{
result += Cura.MachineManager.activeIntentCategory + " - "
if (Cura.MachineManager.activeIntentName != "")
{
result += " - " + Cura.MachineManager.activeIntentName
}
result += " - " + Cura.MachineManager.activeQualityName
}
result += Cura.MachineManager.activeQualityOrQualityChangesName
if (Cura.MachineManager.isActiveQualityExperimental)
{
result += " (Experimental)"

View file

@ -20,13 +20,18 @@ RowLayout
{
if (Cura.MachineManager.activeStack)
{
var text = ""
if(Cura.MachineManager.activeIntentCategory != "default")
var text = Cura.MachineManager.activeQualityOrQualityChangesName
// If this is a custom quality, add intent (if present) and quality it is based on
if (Cura.MachineManager.isActiveQualityCustom)
{
text += Cura.MachineManager.activeIntentCategory + " - "
if (Cura.MachineManager.activeIntentName != "")
{
text += " - " + Cura.MachineManager.activeIntentName
}
text += " - " + Cura.MachineManager.activeQualityName
}
text += Cura.MachineManager.activeQualityOrQualityChangesName
if (!Cura.MachineManager.hasNotSupportedQuality)
{
text += " - " + layerHeight.properties.value + "mm"