X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=cura.git;a=blobdiff_plain;f=Cura%2Futil%2Fprofile.py;h=84d7d2f85e9175645c68302e9e9c2a0229ac2ffa;hp=451d79a011167f98c62ce8a0a451a8161b230e72;hb=97bec552916154d4dcc42fc9be4c1a6628a59dca;hpb=6208201bafdeaf82883181471c6da3a41283cfe7 diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 451d79a0..84d7d2f8 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -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: