chiark / gitweb /
fix issue #704, replacing variables in gcode file damaging line at file offset 2048
authorhg42@gmx.net <hg42@gmx.net>
Sat, 18 Jan 2014 18:55:43 +0000 (19:55 +0100)
committerhg42@gmx.net <hg42@gmx.net>
Sat, 18 Jan 2014 18:55:43 +0000 (19:55 +0100)
Cura/util/profile.py

index 414699758b1dc441762ddae6e0c59c561a8fe481..05b280fe38e5f65698e1411700dab4f23cd56e82 100644 (file)
@@ -963,8 +963,8 @@ def replaceGCodeTags(filename, gcodeInt):
 def replaceGCodeTagsFromSlicer(filename, slicerInt):
        f = open(filename, 'r+')
        data = f.read(2048)
-       data = data.replace('#P_TIME#', slicerInt.getPrintTime())
-       data = data.replace('#F_AMNT#', slicerInt.getFilamentAmount())
+       data = data.replace('#P_TIME#', ('%8.2f' % (int(slicerInt._printTimeSeconds)))[-8:])
+       data = data.replace('#F_AMNT#', ('%8.2f' % (slicerInt._filamentMM[0]))[-8:])
        data = data.replace('#F_WGHT#', ('%8.2f' % (float(slicerInt.getFilamentWeight()) * 1000))[-8:])
        cost = slicerInt.getFilamentCost()
        if cost is None: