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

Ensure that the order of the cluster queue is correctly show in monitor tab

Browse source 
CL-894
This commit is contained in:
Jaime van Kessel 2018-08-16 15:23:16 +02:00
parent af4b7c38c7
commit 0fe0e4ac54
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -432,12 +432,15 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
print_jobs_seen = [] print_jobs_seen = []
job_list_changed = False job_list_changed = False
for print_job_data in result: for idx, print_job_data in enumerate(result):
print_job = findByKey(self._print_jobs, print_job_data["uuid"]) print_job = findByKey(self._print_jobs, print_job_data["uuid"])
if print_job is None: if print_job is None:
print_job = self._createPrintJobModel(print_job_data) print_job = self._createPrintJobModel(print_job_data)
job_list_changed = True job_list_changed = True
elif not job_list_changed:
# Check if the order of the jobs has changed since the last check
if self._print_jobs.index(print_job) != idx:
job_list_changed = True
self._updatePrintJob(print_job, print_job_data) self._updatePrintJob(print_job, print_job_data)
@ -462,6 +465,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
job_list_changed = job_list_changed or self._removeJob(removed_job) job_list_changed = job_list_changed or self._removeJob(removed_job)
if job_list_changed: if job_list_changed:
# Override the old list with the new list (either because jobs were removed / added or order changed)
self._print_jobs = print_jobs_seen
self.printJobsChanged.emit() # Do a single emit for all print job changes. self.printJobsChanged.emit() # Do a single emit for all print job changes.
def _onGetPrintersDataFinished(self, reply: QNetworkReply) -> None: def _onGetPrintersDataFinished(self, reply: QNetworkReply) -> None:
@ -521,7 +526,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
print_job.updateConfiguration(configuration) print_job.updateConfiguration(configuration)
print_job.stateChanged.connect(self._printJobStateChanged) print_job.stateChanged.connect(self._printJobStateChanged)
self._print_jobs.append(print_job)
return print_job return print_job
def _updatePrintJob(self, print_job: PrintJobOutputModel, data: Dict[str, Any]) -> None: def _updatePrintJob(self, print_job: PrintJobOutputModel, data: Dict[str, Any]) -> None: