From bd183266c671e18d050ede9567fc9980ac1a3f28 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 15 Jul 2016 13:11:36 +0200 Subject: [PATCH 1/2] Forced size of heatup buttons in checkup CURA-422 --- plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml index 86429ed119..34544dca75 100644 --- a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml @@ -196,8 +196,8 @@ Cura.MachineAction visible: checkupMachineAction.usbConnected Button { + height: 20 text: checkupMachineAction.heatupHotendStarted ? catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating") - // onClicked: { if (checkupMachineAction.heatupHotendStarted) @@ -259,6 +259,7 @@ Cura.MachineAction Button { text: checkupMachineAction.heatupBedStarted ?catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating") + height: 20 onClicked: { if (checkupMachineAction.heatupBedStarted) From d48b4bf7901b197854b7833df6c265efe207f494 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 15 Jul 2016 13:23:25 +0200 Subject: [PATCH 2/2] Material GUID is now sent to engine for each extruder CURA-1836 --- plugins/CuraEngineBackend/StartSliceJob.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 6aa9c4660b..5b715230e2 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -180,6 +180,12 @@ class StartSliceJob(Job): setting.value = str(stack.getProperty(key, "value")).encode("utf-8") Job.yieldThread() + # ALso send the material GUID as a setting. + material_instance_container = stack.findContainer({"type": "material"}) + if material_instance_container: + setting = message.getMessage("settings").addRepeatedMessage("settings") + setting.name = "material_GUID" + setting.value = str(material_instance_container.getMetaDataEntry("GUID", "")).encode("utf-8") ## Sends all global settings to the engine. # # The settings are taken from the global stack. This does not include any