T576: Added date and time keywords

This commit is contained in:
Victor Larchenko 2016-11-14 14:51:25 +06:00
parent 7adc1f4870
commit dbb971fef5

View file

@ -4,6 +4,7 @@
import numpy import numpy
from string import Formatter from string import Formatter
from enum import IntEnum from enum import IntEnum
import time
from UM.Job import Job from UM.Job import Job
from UM.Application import Application from UM.Application import Application
@ -254,6 +255,16 @@ class StartSliceJob(Job):
settings["print_bed_temperature"] = settings["material_bed_temperature"] settings["print_bed_temperature"] = settings["material_bed_temperature"]
settings["print_temperature"] = settings["material_print_temperature"] settings["print_temperature"] = settings["material_print_temperature"]
settings["time"] = time.strftime('%H:%M:%S')
settings["date"] = time.strftime('%d-%m-%Y')
settings["day"] = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][int(time.strftime('%w'))]
settings["print_time"] = Application.getInstance().getPrintInformation().currentPrintTime
settings["filament_amount"] = Application.getInstance().getPrintInformation().materialLengths
settings["filament_weight"] = Application.getInstance().getPrintInformation().materialWeights
settings["filament_cost"] = None
settings["profile_string"] = None
for key, value in settings.items(): #Add all submessages for each individual setting. for key, value in settings.items(): #Add all submessages for each individual setting.
setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings") setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings")
setting_message.name = key setting_message.name = key
@ -263,8 +274,6 @@ class StartSliceJob(Job):
setting_message.value = str(value).encode("utf-8") setting_message.value = str(value).encode("utf-8")
Job.yieldThread() Job.yieldThread()
## Sends for some settings which extruder they should fallback to if not ## Sends for some settings which extruder they should fallback to if not
# set. # set.
# #