Fix typing

This commit is contained in:
Lipu Fei 2019-04-26 15:39:28 +02:00
parent a86311fea3
commit 04c39824cb

View file

@ -355,6 +355,8 @@ class StartSliceJob(Job):
try: try:
# any setting can be used as a token # any setting can be used as a token
fmt = GcodeStartEndFormatter(default_extruder_nr = default_extruder_nr) fmt = GcodeStartEndFormatter(default_extruder_nr = default_extruder_nr)
if self._all_extruders_settings is None:
return ""
settings = self._all_extruders_settings.copy() settings = self._all_extruders_settings.copy()
settings["default_extruder_nr"] = default_extruder_nr settings["default_extruder_nr"] = default_extruder_nr
return str(fmt.format(value, **settings)) return str(fmt.format(value, **settings))
@ -368,6 +370,10 @@ class StartSliceJob(Job):
message.id = int(stack.getMetaDataEntry("position")) message.id = int(stack.getMetaDataEntry("position"))
if not self._all_extruders_settings: if not self._all_extruders_settings:
self._cacheAllExtruderSettings() self._cacheAllExtruderSettings()
if self._all_extruders_settings is None:
return
extruder_nr = stack.getProperty("extruder_nr", "value") extruder_nr = stack.getProperty("extruder_nr", "value")
settings = self._all_extruders_settings[str(extruder_nr)].copy() settings = self._all_extruders_settings[str(extruder_nr)].copy()
@ -396,6 +402,9 @@ class StartSliceJob(Job):
if not self._all_extruders_settings: if not self._all_extruders_settings:
self._cacheAllExtruderSettings() self._cacheAllExtruderSettings()
if self._all_extruders_settings is None:
return
settings = self._all_extruders_settings["-1"].copy() settings = self._all_extruders_settings["-1"].copy()
# Pre-compute material material_bed_temp_prepend and material_print_temp_prepend # Pre-compute material material_bed_temp_prepend and material_print_temp_prepend