From 638fa8ba758f270f7328b8439a2e2f85d5a6f332 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Mon, 29 Dec 2014 17:54:04 -0200 Subject: [PATCH 1/2] Draft: Changed working plane button text to Auto - fixes #1879 --- src/Mod/Draft/DraftGui.py | 4 ++-- src/Mod/Draft/DraftTools.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index ad356b18aa..2d5e97544d 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -521,7 +521,7 @@ class DraftToolBar: elif defaultWP == 3: self.wplabel.setText("Side") else: - self.wplabel.setText("None") + self.wplabel.setText("Auto") self.constrButton = self._pushbutton("constrButton", self.toptray, hide=False, icon='Draft_Construction',width=22, checkable=True) self.constrColor = QtGui.QColor(self.paramconstr) self.colorButton = self._pushbutton("colorButton",self.bottomtray, hide=False,width=22) @@ -607,7 +607,7 @@ class DraftToolBar: self.yzButton.setToolTip(translate("draft", "Select YZ plane")) self.currentViewButton.setText(translate("draft", "View")) self.currentViewButton.setToolTip(translate("draft", "Select plane perpendicular to the current view")) - self.resetPlaneButton.setText(translate("draft", "None")) + self.resetPlaneButton.setText(translate("draft", "Auto")) self.resetPlaneButton.setToolTip(translate("draft", "Do not project points to a drawing plane")) self.isCopy.setText(translate("draft", "&Copy")) self.isCopy.setToolTip(translate("draft", "If checked, objects will be copied instead of moved (C)")) diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index e77dc4a6c3..08f4b2f80a 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -369,15 +369,15 @@ class SelectPlane(DraftTool): self.offset = 0 if arg == "XY": FreeCADGui.doCommandGui("FreeCAD.DraftWorkingPlane.alignToPointAndAxis(FreeCAD.Vector(0,0,0), FreeCAD.Vector(0,0,1), "+str(self.offset)+")") - self.display('top') + self.display('Top') self.finish() elif arg == "XZ": FreeCADGui.doCommandGui("FreeCAD.DraftWorkingPlane.alignToPointAndAxis(FreeCAD.Vector(0,0,0), FreeCAD.Vector(0,-1,0), "+str(self.offset)+")") - self.display('front') + self.display('Front') self.finish() elif arg == "YZ": FreeCADGui.doCommandGui("FreeCAD.DraftWorkingPlane.alignToPointAndAxis(FreeCAD.Vector(0,0,0), FreeCAD.Vector(1,0,0), "+str(self.offset)+")") - self.display('side') + self.display('Side') self.finish() elif arg == "currentView": d = self.view.getViewDirection().negative() @@ -386,7 +386,7 @@ class SelectPlane(DraftTool): self.finish() elif arg == "reset": FreeCADGui.doCommandGui("FreeCAD.DraftWorkingPlane.reset()") - self.display('None') + self.display('Auto') self.finish() def offsetHandler(self, arg): From 2f78c021db8d11daf00c1e0ad7bf0e49be7f6be2 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Mon, 29 Dec 2014 18:54:33 -0200 Subject: [PATCH 2/2] Arch: Fixed encodings in Survey - fixes #1825 --- src/Mod/Arch/ArchCommands.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index a247cefa3d..489e22bc9e 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -727,7 +727,7 @@ def survey(callback=False): t = t.getUserPreferred()[0] t = t.encode("utf8") anno.LabelText = "l " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Length: " + t + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: Whole, Length: " + t.decode("utf8") + "\n") if FreeCAD.GuiUp and t: QtGui.qApp.clipboard().setText(t) else: @@ -755,13 +755,13 @@ def survey(callback=False): t = t.getUserPreferred()[0] t = t.encode("utf8") anno.LabelText = "l " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + t + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + t.decode("utf8") + "\n") elif "Vertex" in el: t = FreeCAD.Units.Quantity(e.Z,FreeCAD.Units.Length) t = t.getUserPreferred()[0] t = t.encode("utf8") anno.LabelText = "z " + t - FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + t + "\n") + FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + t.decode("utf8") + "\n") if FreeCAD.GuiUp and t: QtGui.qApp.clipboard().setText(t)