3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Apply suggestions from code review

Browse source 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
This commit is contained in:
Casper Lamboo 2022-08-22 14:48:04 +02:00 • committed by GitHub
parent 12f3581337
commit 35502e45fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -484,7 +484,7 @@ class CuraApplication(QtApplication):
("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"),
("setting_visibility", SettingVisibilityPresetsModel.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.SettingVisibilityPreset, "application/x-uranium-preferences"), ("setting_visibility", SettingVisibilityPresetsModel.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.SettingVisibilityPreset, "application/x-uranium-preferences"),
("machine", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"), ("machine", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"),
("abstract_machine", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"), ("abstract_machine", 1): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"),
("extruder", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer") ("extruder", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer")
} }
) )

6
cura/Settings/AbstractMachine.py
View file

@ -24,11 +24,11 @@ class AbstractMachine(GlobalStack):
## private: ## private:
abstract_machine_mime = MimeType( _abstract_machine_mime = MimeType(
name = "application/x-cura-abstract-machine", name = "application/x-cura-abstract-machine",
comment = "Cura Abstract Machine", comment = "Cura Abstract Machine",
suffixes = ["global.cfg"] suffixes = ["global.cfg"]
) )
MimeTypeDatabase.addMimeType(abstract_machine_mime) MimeTypeDatabase.addMimeType(_abstract_machine_mime)
ContainerRegistry.addContainerTypeByName(AbstractMachine, "abstract_machine", abstract_machine_mime.name) ContainerRegistry.addContainerTypeByName(AbstractMachine, "abstract_machine", _abstract_machine_mime.name)

2
cura/Settings/CuraContainerRegistry.py
View file

@ -108,7 +108,7 @@ class CuraContainerRegistry(ContainerRegistry):
:param container_type: :type{string} Type of the container (machine, quality, ...) :param container_type: :type{string} Type of the container (machine, quality, ...)
:param container_name: :type{string} Name to check :param container_name: :type{string} Name to check
""" """
container_class = ContainerStack if container_type in "machine" else InstanceContainer container_class = ContainerStack if "machine" in container_type else InstanceContainer
return self.findContainersMetadata(container_type = container_class, id = container_name, type = container_type, ignore_case = True) or \ return self.findContainersMetadata(container_type = container_class, id = container_name, type = container_type, ignore_case = True) or \
self.findContainersMetadata(container_type = container_class, name = container_name, type = container_type) self.findContainersMetadata(container_type = container_class, name = container_name, type = container_type)

2
cura/Settings/CuraStackBuilder.py
View file

@ -290,7 +290,7 @@ class CuraStackBuilder:
case []: case []:
# It should not be possible for the definition to be missing since an abstract machine will only # It should not be possible for the definition to be missing since an abstract machine will only
# be created as a result of a machine with definition_id being created. # be created as a result of a machine with definition_id being created.
Logger.error("w", "Definition {definition} was not found!", definition=definition_id) Logger.error(f"Definition {definition_id} was not found!")
return None return None
case [machine_definition, *_definitions]: case [machine_definition, *_definitions]:
machine_node = container_tree.machines[machine_definition.getId()] machine_node = container_tree.machines[machine_definition.getId()]