diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index d0ce15269d..95c1f5d4a4 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -29,7 +29,6 @@ if FreeCAD.GuiUp: import FreeCADGui from PySide import QtGui,QtCore from draftutils.translate import translate - from draftutils.utils import utf8_decode else: # \cond def translate(ctxt,txt): @@ -862,14 +861,14 @@ def survey(callback=False): t = u.getUserPreferred()[0] t = t.replace("^3","³") anno.LabelText = "v " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Volume: " + utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Volume: " + t + "\n") FreeCAD.SurveyObserver.totalVolume += u.Value elif o.Object.Shape.Faces: u = FreeCAD.Units.Quantity(o.Object.Shape.Area,FreeCAD.Units.Area) t = u.getUserPreferred()[0] t = t.replace("^2","²") anno.LabelText = "a " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Area: " + utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Area: " + t + "\n") FreeCAD.SurveyObserver.totalArea += u.Value if hasattr(FreeCAD,"SurveyDialog"): FreeCAD.SurveyDialog.update(2,t) @@ -878,7 +877,7 @@ def survey(callback=False): t = u.getUserPreferred()[0] t = t.encode("utf8") anno.LabelText = "l " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Length: " + utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Length: " + t + "\n") FreeCAD.SurveyObserver.totalLength += u.Value if hasattr(FreeCAD,"SurveyDialog"): FreeCAD.SurveyDialog.update(1,t) @@ -905,7 +904,7 @@ def survey(callback=False): t = u.getUserPreferred()[0] t = t.replace("^2","²") anno.LabelText = "a " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Area: "+ utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Area: "+ t + "\n") FreeCAD.SurveyObserver.totalArea += u.Value if hasattr(FreeCAD,"SurveyDialog"): FreeCAD.SurveyDialog.update(2,t) @@ -913,7 +912,7 @@ def survey(callback=False): u= FreeCAD.Units.Quantity(e.Length,FreeCAD.Units.Length) t = u.getUserPreferred()[0] anno.LabelText = "l " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + t + "\n") FreeCAD.SurveyObserver.totalLength += u.Value if hasattr(FreeCAD,"SurveyDialog"): FreeCAD.SurveyDialog.update(1,t) @@ -921,7 +920,7 @@ def survey(callback=False): u = FreeCAD.Units.Quantity(e.Z,FreeCAD.Units.Length) t = u.getUserPreferred()[0] anno.LabelText = "z " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + utf8_decode(t) + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + t + "\n") if FreeCAD.GuiUp and t: if showUnit: QtGui.QApplication.clipboard().setText(t) @@ -1087,7 +1086,7 @@ class SurveyTaskPanel: def update(self,column,txt): item = QtGui.QTreeWidgetItem(self.tree) self.tree.setCurrentItem(item) - item.setText(column,utf8_decode(txt)) + item.setText(column,txt) def setDescr(self,item,col): self.descr.setText(item.text(0)) @@ -1539,7 +1538,7 @@ class _CommandCheck: else: FreeCADGui.Selection.clearSelection() for i in result: - FreeCAD.Console.PrintWarning("Object "+i[0].Name+" ("+i[0].Label+") "+ utf8_decode(i[1])) + FreeCAD.Console.PrintWarning("Object "+i[0].Name+" ("+i[0].Label+") "+i[1]) FreeCADGui.Selection.addSelection(i[0]) diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py index 9762ddbb20..b2c1f148bc 100644 --- a/src/Mod/Arch/ArchPanel.py +++ b/src/Mod/Arch/ArchPanel.py @@ -36,7 +36,7 @@ if FreeCAD.GuiUp: import draftguitools.gui_trackers as DraftTrackers else: # \cond - def translate(ctxt,txt,utf8_decode=False): + def translate(ctxt,txt): return txt def QT_TRANSLATE_NOOP(ctxt,txt): return txt diff --git a/src/Mod/Arch/ArchReference.py b/src/Mod/Arch/ArchReference.py index 47f20d6450..0b1d0ec55c 100644 --- a/src/Mod/Arch/ArchReference.py +++ b/src/Mod/Arch/ArchReference.py @@ -35,7 +35,7 @@ if FreeCAD.GuiUp: from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond - def translate(ctxt,txt, utf8_decode=False): + def translate(ctxt,txt): return txt def QT_TRANSLATE_NOOP(ctxt,txt): return txt @@ -159,7 +159,6 @@ class ArchReference: f = zdoc.open(self.parts[obj.Part][1]) shapedata = f.read() f.close() - shapedata = shapedata.decode("utf8") shape = self.cleanShape(shapedata,obj,self.parts[obj.Part][2]) obj.Shape = shape if not pl.isIdentity(): @@ -261,7 +260,6 @@ class ArchReference: materials = {} writemode = False for line in docf: - line = line.decode("utf8") if "