3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Let intent selection use the quality_definition instead of direct def

Browse source 
The issue was that sometimes intents are also shared.

CURA-10788
This commit is contained in:
Jaime van Kessel 2023-07-21 10:57:39 +02:00
parent 68cb603b91
commit 1e240e3229
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cura/Machines/Models/IntentSelectionModel.py
View file

@ -71,15 +71,15 @@ class IntentSelectionModel(ListModel):
def _update(self) -> None: def _update(self) -> None:
Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))
cura_application = cura.CuraApplication.CuraApplication.getInstance()
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() global_stack = cura_application.getGlobalContainerStack()
if global_stack is None: if global_stack is None:
self.setItems([]) self.setItems([])
Logger.log("d", "No active GlobalStack, set quality profile model as empty.") Logger.log("d", "No active GlobalStack, set quality profile model as empty.")
return return
# Check for material compatibility # Check for material compatibility
if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): if not cura_application.getMachineManager().activeMaterialsCompatible():
Logger.log("d", "No active material compatibility, set quality profile model as empty.") Logger.log("d", "No active material compatibility, set quality profile model as empty.")
self.setItems([]) self.setItems([])
return return
@ -101,17 +101,18 @@ class IntentSelectionModel(ListModel):
else: else:
# There can be multiple intents with the same category, use one of these # There can be multiple intents with the same category, use one of these
# intent-metadata's for the icon/description defintions for the intent # intent-metadata's for the icon/description defintions for the intent
intent_metadata = cura.CuraApplication.CuraApplication \
.getInstance() \
.getContainerRegistry() \
.findContainersMetadata(type="intent", definition=global_stack.definition.getId(), intent_metadata = cura_application.getContainerRegistry().findContainersMetadata(type="intent",
definition=global_stack.findInstanceContainerDefinitionId(global_stack.definition),
intent_category=category)[0] intent_category=category)[0]
intent_name = intent_metadata.get("name", category.title()) intent_name = intent_metadata.get("name", category.title())
icon = intent_metadata.get("icon", None) icon = intent_metadata.get("icon", None)
description = intent_metadata.get("description", None) description = intent_metadata.get("description", None)
if icon is not None: if icon is not None and icon != '':
try: try:
icon = QUrl.fromLocalFile( icon = QUrl.fromLocalFile(
Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon)) Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon))

4
cura/Settings/CuraContainerStack.py
View file

@ -359,7 +359,7 @@ class CuraContainerStack(ContainerStack):
return self.definition return self.definition
@classmethod @classmethod
def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str: def findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str:
"""Find the ID that should be used when searching for instance containers for a specified definition. """Find the ID that should be used when searching for instance containers for a specified definition.
This handles the situation where the definition specifies we should use a different definition when This handles the situation where the definition specifies we should use a different definition when
@ -379,7 +379,7 @@ class CuraContainerStack(ContainerStack):
Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore
return machine_definition.id #type: ignore return machine_definition.id #type: ignore
return cls._findInstanceContainerDefinitionId(definitions[0]) return cls.findInstanceContainerDefinitionId(definitions[0])
def getExtruderPositionValueWithDefault(self, key): def getExtruderPositionValueWithDefault(self, key):
"""getProperty for extruder positions, with translation from -1 to default extruder number""" """getProperty for extruder positions, with translation from -1 to default extruder number"""