3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix links to ContainerRegistry

Browse source 
ContainerRegistry is no longer exposed in UM.Settings.__init__, so we must dig the class up from inside the module.

Contributes to issue CURA-2917.
This commit is contained in:
Ghostkeeper 2017-02-14 16:57:21 +01:00
parent 4928c91942
commit 5055c534c5
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -8,7 +8,7 @@ from UM.Signal import signalemitter
from UM.Message import Message from UM.Message import Message
import UM.Settings import UM.Settings.ContainerRegistry
import UM.Version #To compare firmware version numbers. import UM.Version #To compare firmware version numbers.
from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState
@ -633,7 +633,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
remote_material_guid, remote_material_guid,
material.getMetaDataEntry("GUID")) material.getMetaDataEntry("GUID"))
remote_materials = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", GUID = remote_material_guid, read_only = True) remote_materials = UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().findInstanceContainers(type = "material", GUID = remote_material_guid, read_only = True)
remote_material_name = "Unknown" remote_material_name = "Unknown"
if remote_materials: if remote_materials:
remote_material_name = remote_materials[0].getName() remote_material_name = remote_materials[0].getName()
@ -824,7 +824,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
## Send all material profiles to the printer. ## Send all material profiles to the printer.
def sendMaterialProfiles(self): def sendMaterialProfiles(self):
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material"): for container in UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().findInstanceContainers(type = "material"):
try: try:
xml_data = container.serialize() xml_data = container.serialize()
if xml_data == "" or xml_data is None: if xml_data == "" or xml_data is None:

5
plugins/UltimakerMachineActions/UMOUpgradeSelection.py
View file

@ -1,3 +1,6 @@
# Copyright (c) 2017 Ultimaker B.V.
# Uranium is released under the terms of the AGPLv3 or higher.
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from cura.MachineAction import MachineAction from cura.MachineAction import MachineAction
@ -47,7 +50,7 @@ class UMOUpgradeSelection(MachineAction):
definition_changes_container.setDefinition(definition) definition_changes_container.setDefinition(definition)
definition_changes_container.addMetaDataEntry("type", "definition_changes") definition_changes_container.addMetaDataEntry("type", "definition_changes")
UM.Settings.ContainerRegistry.getInstance().addContainer(definition_changes_container) UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container)
# Insert definition_changes between the definition and the variant # Insert definition_changes between the definition and the variant
global_container_stack.insertContainer(-1, definition_changes_container) global_container_stack.insertContainer(-1, definition_changes_container)