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

Mismatched configuration is now shown correctly again

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-30 11:04:13 +01:00
parent 3d3b140526
commit f30f0a7194
3 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -198,11 +198,17 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
print_job.updateTimeTotal(print_job_data["time_total"])
print_job.updateTimeElapsed(print_job_data["time_elapsed"])
print_job.updateState(print_job_data["status"])
print_job.updateOwner(print_job_data["owner"])
printer = None
if print_job.state != "queued":
# Print job should be assigned to a printer.
printer = self._getPrinterByKey(print_job_data["printer_uuid"])
if printer:
printer.updateActivePrintJob(print_job)
else: # Status is queued
# The job can "reserve" a printer if some changes are required.
printer = self._getPrinterByKey(print_job_data["assigned_to"])
if printer:
printer.updateActivePrintJob(print_job)
print_jobs_seen.append(print_job)
for old_job in self._print_jobs:

17
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -269,14 +269,7 @@ Rectangle
case "sent_to_printer":
return catalog.i18nc("@label", "Preparing to print")
case "queued":
if (printJob.configuration_changes_required != null && printJob.configuration_changes_required.length !== 0)
{
return catalog.i18nc("@label:status", "Action required");
}
else
{
return "";
}
case "pausing":
case "paused":
return catalog.i18nc("@label:status", "Paused");
@ -334,10 +327,7 @@ Rectangle
{
if(printJob.state === "queued")
{
if (printJob.configuration_changes_required != null && printJob.configuration_changes_required.length !== 0)
{
return "action-required-icon.svg";
}
return "action-required-icon.svg";
}
else if (printJob.state === "wait_cleanup")
{
@ -401,10 +391,7 @@ Rectangle
case "wait_for_configuration":
return catalog.i18nc("@label", "Not accepting print jobs")
case "queued":
if (printJob.configuration_changes_required != undefined)
{
return catalog.i18nc("@label", "Waiting for configuration change");
}
return catalog.i18nc("@label", "Waiting for configuration change");
default:
return "";
}