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

Limit the amount of emits happening for PrintJobs changed

Browse Source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-30 15:17:08 +01:00
parent 1c1c195b93
commit 51c4062f1b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View File

@ -223,6 +223,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
Logger.log("w", "Received an invalid print jobs message: Not valid JSON.") Logger.log("w", "Received an invalid print jobs message: Not valid JSON.")
return return
print_jobs_seen = [] print_jobs_seen = []
job_list_changed = False
for print_job_data in result: for print_job_data in result:
print_job = None print_job = None
for job in self._print_jobs: for job in self._print_jobs:
@ -234,6 +235,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
print_job = PrintJobOutputModel(output_controller = ClusterUM3PrinterOutputController(self), print_job = PrintJobOutputModel(output_controller = ClusterUM3PrinterOutputController(self),
key = print_job_data["uuid"], key = print_job_data["uuid"],
name = print_job_data["name"]) name = print_job_data["name"])
job_list_changed = True
self._print_jobs.append(print_job)
print_job.updateTimeTotal(print_job_data["time_total"]) print_job.updateTimeTotal(print_job_data["time_total"])
print_job.updateTimeElapsed(print_job_data["time_elapsed"]) print_job.updateTimeElapsed(print_job_data["time_elapsed"])
print_job.updateState(print_job_data["status"]) print_job.updateState(print_job_data["status"])
@ -250,13 +253,18 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
printer.updateActivePrintJob(print_job) printer.updateActivePrintJob(print_job)
print_jobs_seen.append(print_job) print_jobs_seen.append(print_job)
for old_job in self._print_jobs:
if old_job not in print_jobs_seen and old_job.assignedPrinter:
# Print job needs to be removed.
old_job.assignedPrinter.updateActivePrintJob(None)
self._print_jobs = print_jobs_seen # Check what jobs need to be removed.
self.printJobsChanged.emit() removed_jobs = [print_job for print_job in self._print_jobs if print_job not in print_jobs_seen]
for removed_job in removed_jobs:
if removed_job.assignedPrinter:
removed_job.assignedPrinter.updateActivePrintJob(None)
self._print_jobs.remove(removed_job)
job_list_changed = True
# Do a single emit for all print job changes.
if job_list_changed:
self.printJobsChanged.emit()
def _onGetPrintersDataFinished(self, reply: QNetworkReply): def _onGetPrintersDataFinished(self, reply: QNetworkReply):
status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute)