chiark / gitweb /
If gcode tags have integer values then export them as integer, else export them as...
authorDaid <daid303@gmail.com>
Wed, 9 May 2012 18:16:32 +0000 (20:16 +0200)
committerDaid <daid303@gmail.com>
Wed, 9 May 2012 18:16:32 +0000 (20:16 +0200)
Cura/util/profile.py

index 22d30fb0a0a7fca15b99c89b2331107c500b9b95..2be195e740b876de228f9880a314b44bbfba7279 100644 (file)
@@ -359,12 +359,16 @@ def calculateSolidLayerCount():
 def replaceTagMatch(m):\r
        tag = m.group(0)[1:-1]\r
        if tag in ['print_speed', 'retraction_speed', 'travel_speed', 'max_z_speed', 'bottom_layer_speed', 'cool_min_feedrate']:\r
-               return str(getProfileSettingFloat(tag) * 60)\r
-       if isProfileSetting(tag):\r
-               return str(getProfileSettingFloat(tag))\r
-       if isPreference(tag):\r
-               return str(getProfileSettingFloat(tag))\r
-       return tag\r
+               f = getProfileSettingFloat(tag) * 60\r
+       elif isProfileSetting(tag):\r
+               f = getProfileSettingFloat(tag)\r
+       elif isPreference(tag):\r
+               f = getProfileSettingFloat(tag)\r
+       else:\r
+               return tag\r
+       if (f % 1) == 0:\r
+               return str(int(f))\r
+       return str(f)\r
 \r
 ### Get aleration raw contents. (Used internally in Cura)\r
 def getAlterationFile(filename):\r