3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Tim Kuipers 2016-07-15 13:34:21 +02:00
commit 4c3860e06a
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -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

3
plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml
View file

@ -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)