Merge branch 'gcode-keywords' of https://github.com/alephobjects/Cura2 into alephobjects-gcode-keywords

This commit is contained in:
Ghostkeeper 2017-05-02 13:50:37 +02:00
commit a988571d2b
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -446,8 +446,7 @@ class CuraEngineBackend(QObject, Backend):
replaced = line.replace("{print_time}", str(Application.getInstance().getPrintInformation().currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601)))
replaced = replaced.replace("{filament_amount}", str(Application.getInstance().getPrintInformation().materialLengths))
replaced = replaced.replace("{filament_weight}", str(Application.getInstance().getPrintInformation().materialWeights))
# TODO: calculate filament cost
replaced = replaced.replace("{filament_cost}", "Not yet implemented")
replaced = replaced.replace("{filament_cost}", str(Application.getInstance().getPrintInformation().materialCosts))
replaced = replaced.replace("{jobname}", str(Application.getInstance().getPrintInformation().jobName))
self._scene.gcode_list[self._scene.gcode_list.index(line)] = replaced