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