From 84b736df07e8699faa5ca8667191529d76f30486 Mon Sep 17 00:00:00 2001 From: "U-ULTIMAKER\\j.ha" Date: Mon, 4 Jul 2016 17:08:35 +0200 Subject: [PATCH 1/3] first commit in Cura! fix CURA-1085, time estimate is reset before every slice action --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index c91e414a13..89be5fef08 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -126,6 +126,8 @@ class CuraEngineBackend(Backend): ## Perform a slice of the scene. def slice(self): + self.printDurationMessage.emit(0, 0) + self._stored_layer_data = [] if not self._enabled or not self._global_container_stack: #We shouldn't be slicing. From 7b4137ce205b90c45ce3753ae3c5b5ec17a77b35 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 4 Jul 2016 18:35:47 +0200 Subject: [PATCH 2/3] Tweak color and icon logic (add "pre_print" state) CURA-1036 --- resources/qml/MonitorButton.qml | 2 +- resources/qml/Sidebar.qml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 8a232e62f1..bbb39b188e 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -22,7 +22,7 @@ Rectangle { if(!printerConnected) return UM.Theme.getColor("status_offline") - else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing") + else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print") return UM.Theme.getColor("status_busy") else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready") return UM.Theme.getColor("status_ready") diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 25931932d3..78930c8d90 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -101,12 +101,16 @@ Rectangle iconSource: { if(!printerConnected) return UM.Theme.getIcon("tab_monitor") - else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing") + else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print") return UM.Theme.getIcon("tab_monitor_busy") + else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready") + return UM.Theme.getIcon("tab_monitor_connected") else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused") return UM.Theme.getIcon("tab_monitor_paused") - else if (Cura.MachineManager.printerOutputDevices[0].jobState != "error") - return UM.Theme.getIcon("tab_monitor_connected") + else if (Cura.MachineManager.printerOutputDevices[0].jobState == "error") + return UM.Theme.getIcon("tab_monitor_stopped") + else + return UM.Theme.getIcon("tab_monitor") } checkable: true checked: monitoringPrint From 793f7824c73614f037822905c5b97bf37a42a5ff Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 4 Jul 2016 19:14:48 +0200 Subject: [PATCH 3/3] Quick fix to restore slicing This list of zeros may have to match the number of extruders CURA-1687 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 646400c2c2..6af51c4cc6 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -127,7 +127,7 @@ class CuraEngineBackend(Backend): ## Perform a slice of the scene. def slice(self): - self.printDurationMessage.emit(0, 0) + self.printDurationMessage.emit(0, [0]) self._stored_layer_data = []