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

Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-04 14:22:17 +01:00
commit a79cfcbe47
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py
View file

@ -338,7 +338,9 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
for job_id in updated_job_ids: for job_id in updated_job_ids:
self._updateUM3PrintJobOutputModel(current_jobs[job_id], remote_jobs[job_id]) self._updateUM3PrintJobOutputModel(current_jobs[job_id], remote_jobs[job_id])
# TODO: properly handle removed and updated printers # We only have to update when jobs are added or removed
# updated jobs push their changes via their outputmodel
if len(removed_job_ids) > 0 or len(new_job_ids) > 0:
self.printJobsChanged.emit() self.printJobsChanged.emit()
def _addPrintJob(self, job: CloudClusterPrintJob) -> None: def _addPrintJob(self, job: CloudClusterPrintJob) -> None:

1
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -1,7 +1,6 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import json import json
from time import sleep
from threading import Timer from threading import Timer
from typing import Dict, Optional from typing import Dict, Optional