chiark / gitweb /
Fixed #198 - This was a tricky one, because the project planner added an override...
authordaid <daid303@gmail.com>
Thu, 30 Aug 2012 16:03:42 +0000 (18:03 +0200)
committerdaid <daid303@gmail.com>
Thu, 30 Aug 2012 16:03:42 +0000 (18:03 +0200)
Cura/util/profile.py

index ab4f0302af95c5ee288d65d845203f827c24026e..9b3f2a48c84496f640094522e2257e3283b193c3 100644 (file)
@@ -242,7 +242,7 @@ def getGlobalProfileString():
        if globalProfileParser.has_section('profile'):\r
                for key in globalProfileParser.options('profile'):\r
                        if key in tempOverride:\r
-                               p.append(key + "=" + unicode(tempOverride[key]))\r
+                               p.append(key + "=" + tempOverride[key])\r
                                tempDone.append(key)\r
                        else:\r
                                p.append(key + "=" + globalProfileParser.get('profile', key))\r
@@ -255,14 +255,14 @@ def getGlobalProfileString():
                                alt.append(key + "=" + globalProfileParser.get('alterations', key))\r
        for key in tempOverride:\r
                if key not in tempDone:\r
-                       p.append(key + "=" + unicode(tempOverride[key]))\r
+                       p.append(key + "=" + tempOverride[key])\r
        ret = '\b'.join(p) + '\f' + '\b'.join(alt)\r
        ret = base64.b64encode(zlib.compress(ret, 9))\r
        return ret\r
 \r
 def getProfileSetting(name):\r
        if name in tempOverride:\r
-               return unicode(tempOverride[name])\r
+               return unicode(tempOverride[name], "utf-8")\r
        #Check if we have a configuration file loaded, else load the default.\r
        if not globals().has_key('globalProfileParser'):\r
                loadGlobalProfile(getDefaultProfilePath())\r
@@ -362,7 +362,7 @@ def isPreference(name):
 ## Temp overrides for multi-extruder slicing and the project planner.\r
 tempOverride = {}\r
 def setTempOverride(name, value):\r
-       tempOverride[name] = value\r
+       tempOverride[name] = unicode(value).encode("utf-8")\r
 def resetTempOverride():\r
        tempOverride.clear()\r
 \r