Draft: Used replace strategy in latin1 encodings - issue #853

FreeCAD · May 17, 2014 · da4f1bd · da4f1bd
1 parent 293930b
commit da4f1bd
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
@@ -3217,9 +3217,9 @@ def updateData(self, obj, prop):
                         if coin.COIN_MAJOR_VERSION >= 4:
                             self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string)
                         else:
-                            self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1")
+                            self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1","replace")
                     except:
-                        self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1")
+                        self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1","replace")
             self.text.string = self.text3d.string = self.string
 
             # set the distance property
@@ -3497,7 +3497,14 @@ def updateData(self, obj, prop):
             else:
                 self.string = DraftGui.displayExternal(a,getParam("dimPrecision",2),'Angle',su)
             if obj.ViewObject.Override:
-                self.string = obj.ViewObject.Override.decode("utf8").encode("latin1").replace("$dim",self.string)
+                try:
+                    from pivy import coin
+                    if coin.COIN_MAJOR_VERSION >= 4:
+                        self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string)
+                    else:
+                        self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1","replace")
+                except:
+                    self.string = obj.ViewObject.Override.encode("utf8").replace("$dim",self.string).decode("latin1","replace")
             self.text.string = self.text3d.string = self.string
 
             # check display mode