Merge branch 'master' into CURA-6435_new_style_add_machine

This commit is contained in:
Lipu Fei 2019-04-18 06:33:11 +00:00
commit e3c1505612
2 changed files with 4 additions and 4 deletions

View File

@ -38,5 +38,5 @@ class UFPReader(MeshReader):
# Open the GCodeReader to parse the data
gcode_reader = PluginRegistry.getInstance().getPluginObject("GCodeReader") # type: ignore
gcode_reader.preReadFromStream(gcode_stream)
return gcode_reader.readFromStream(gcode_stream)
gcode_reader.preReadFromStream(gcode_stream) # type: ignore
return gcode_reader.readFromStream(gcode_stream) # type: ignore

View File

@ -32,8 +32,8 @@ class CloudOutputDeviceManager:
# The translation catalog for this device.
I18N_CATALOG = i18nCatalog("cura")
addedCloudCluster = Signal(CloudOutputDevice)
removedCloudCluster = Signal(CloudOutputDevice)
addedCloudCluster = Signal()
removedCloudCluster = Signal()
def __init__(self) -> None:
# Persistent dict containing the remote clusters for the authenticated user.