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

Send materials asynchronously

Browse source 
This way we won't block the interface while those materials are sending.

Contributes to issue CURA-5034.
This commit is contained in:
Ghostkeeper 2018-06-08 15:06:06 +02:00
parent 63f5c8346a
commit ddb80be1ec
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
2 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -4,6 +4,7 @@
from UM.FileHandler.FileWriter import FileWriter #To choose based on the output file mode (text vs. binary).
from UM.FileHandler.WriteFileJob import WriteFileJob #To call the file writer asynchronously.
from UM.Logger import Logger
from UM.JobQueue import JobQueue #To send material profiles in the background.
from UM.Application import Application
from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.i18n import i18nCatalog
@ -20,6 +21,7 @@ from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
from cura.PrinterOutput.NetworkCamera import NetworkCamera
from .ClusterUM3PrinterOutputController import ClusterUM3PrinterOutputController
from .SendMaterialJob import SendMaterialJob
from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
from PyQt5.QtGui import QDesktopServices
@ -27,7 +29,7 @@ from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject
from time import time
from datetime import datetime
from typing import Optional, Dict, List
from typing import Optional, Dict, List, Set
import io #To create the correct buffers for sending data to the printer.
import json
@ -554,16 +556,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
continue #If there's no base file then there was no file for it (such as empty_material).
base_files.add(material_metadata["base_file"])
for file in base_files:
Logger.log("d", "Syncing material profile with printer: {file}".format(file = file))
parts = []
material = container_registry.findContainers(id = file)[0]
serialized_material = material.serialize().encode("utf-8")
parts.append(self._createFormPart("name=\"file\"; filename=\"{file_name}.xml.fdm_material\"".format(file_name = file), serialized_material))
parts.append(self._createFormPart("name=\"filename\"", (file + ".xml.fdm_material").encode("utf-8"), "text/plain"))
self.postFormWithParts(target = "/materials", parts = parts)
job = SendMaterialJob(material_ids = base_files, device = self)
job.run()
def loadJsonFromReply(reply):
try: