3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into master

Browse source
This commit is contained in:
griehsler 2018-10-31 21:44:44 +01:00 • committed by GitHub
commit 3a84a5868f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
220 changed files with 30385 additions and 25983 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/PostProcessingPlugin/scripts/FilamentChange.py
View file

@ -1,5 +1,6 @@
# This PostProcessing Plugin script is released
# under the terms of the AGPLv3 or higher
# Copyright (c) 2018 Ultimaker B.V.
# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
from typing import Optional, Tuple
from UM.Logger import Logger
@ -72,12 +73,12 @@ class FilamentChange(Script):
later_retract = self.getSettingValueByKey("later_retract")
x_pos = self.getSettingValueByKey("x_position")
y_pos = self.getSettingValueByKey("y_position")
color_change = "M600"
if initial_retract is not None and initial_retract > 0.:
color_change = color_change + (" E-%.2f" % initial_retract)
color_change = color_change + (" E%.2f" % initial_retract)
if later_retract is not None and later_retract > 0.:
color_change = color_change + (" L-%.2f" % later_retract)
@ -88,7 +89,7 @@ class FilamentChange(Script):
color_change = color_change + (" Y%.2f" % y_pos)
color_change = color_change + " ; Generated by FilamentChange plugin"
layer_targets = layer_nums.split(",")
if len(layer_targets) > 0:
for layer_num in layer_targets: