Merge branch 'CURA-6706_intents_on_quality_mgr_page' of github.com:Ultimaker/Cura into feature_intent

This commit is contained in:
Jaime van Kessel 2019-10-07 16:14:24 +02:00
commit cb526f0f31
No known key found for this signature in database
GPG key ID: 3710727397403C91
6 changed files with 123 additions and 39 deletions

View file

@ -637,6 +637,7 @@ class MachineManager(QObject):
category = extruder.intent.getMetaDataEntry("intent_category", "default")
if category != "default" and category != intent_category:
intent_category = category
return intent_category
# Provies a list of extruder positions that have a different intent from the active one.
@ -1626,6 +1627,7 @@ class MachineManager(QObject):
# Otherwise the intent profile will be left to the empty profile, which
# represents the "default" intent category.
# \param intent_category The intent category to change to.
@pyqtSlot(str)
def setIntentByCategory(self, intent_category: str) -> None:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if global_stack is None: