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

Final implementation of intentMetadatas and intentCategories

Browse Source 
Instead of pseudocode.

Contributes to issue CURA-6091.
This commit is contained in:
Ghostkeeper 2019-06-20 14:02:34 +02:00
parent 64e3a99ad3
commit c83b9d158b
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cura/Settings/IntentManager.py
View File

@ -2,7 +2,7 @@
#Cura is released under the terms of the LGPLv3 or higher. #Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSignal from PyQt5.QtCore import pyqtProperty, pyqtSignal
from typing import List, Tuple, TYPE_CHECKING from typing import Any, Dict, List, Tuple, TYPE_CHECKING
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.Machines.QualityManager import QualityManager from cura.Machines.QualityManager import QualityManager
from cura.Settings.MachineManager import MachineManager from cura.Settings.MachineManager import MachineManager
@ -24,6 +24,7 @@ class IntentManager:
self.configurationChanged.connect(self.selectDefaultIntent) self.configurationChanged.connect(self.selectDefaultIntent)
pass pass
## This class is a singleton.
@classmethod @classmethod
def getInstance(cls): def getInstance(cls):
if not cls.__instance: if not cls.__instance:
@ -32,15 +33,22 @@ class IntentManager:
configurationChanged = pyqtSignal configurationChanged = pyqtSignal
def intentMetadatas(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: ## Gets the metadata dictionaries of all intent profiles for a given
#Return list of available intent profiles for any configuration. # configuration.
#Use ContainerRegistry.findContainersMetadata for this. #
return [] # \param definition_id: ID of the printer.
# \return A list of metadata dictionaries matching the search criteria, or
# an empty list if nothing was found.
def intentMetadatas(self, definition_id: str, nozzle_name: str, material_id: str) -> List[Dict[str, Any]]:
registry = ContainerRegistry.getInstance()
return registry.findContainersMetadata(definition = definition_id, variant = nozzle_name, material_id = material_id)
##
def intentCategories(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]: def intentCategories(self, definition_id: str, nozzle_id: str, material_id: str) -> List[str]:
categories = set() categories = set()
for intent in self.intentMetadatas(definition_id, nozzle_id, material_id): for intent in self.intentMetadatas(definition_id, nozzle_id, material_id):
categories.add(intent["intent_category"]) categories.add(intent["intent_category"])
categories.add("default") #The "empty" intent is not an actual profile specific to the configuration but we do want it to appear in the categories list.
return list(categories) return list(categories)
## List of intents to be displayed in the interface. ## List of intents to be displayed in the interface.
@ -50,7 +58,6 @@ class IntentManager:
# #
# \return A list of tuples of intent_category and quality_type. The actual # \return A list of tuples of intent_category and quality_type. The actual
# instance may vary per extruder. # instance may vary per extruder.
@pyqtProperty("QVariantList", notify = configurationChanged)
def currentAvailableIntents(self) -> List[Tuple[str, str]]: def currentAvailableIntents(self) -> List[Tuple[str, str]]:
final_intent_ids = {metadata["id"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} #All intents that match the global stack. final_intent_ids = {metadata["id"] for metadata in ContainerRegistry.getInstance().findContainersMetadata(type = "intent", definition = current_definition_id)} #All intents that match the global stack.
for extruder in all_extruders: for extruder in all_extruders:

4
resources/intent/strong.inst.cfg
View File

@ -6,6 +6,10 @@ definition = fdmprinter
[metadata] [metadata]
setting_version = 7 setting_version = 7
type = intent type = intent
intent_category = engineering
quality_type = draft
material = generic_abs
variant = AA 0.4
[values] [values]