From 2e55e5b0ca4676a648366a04e5fca39650823181 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 30 Nov 2018 13:55:04 -0500 Subject: [PATCH] FR1973 Draft ShapeString Ui - load new ui from Resource file - minor updates to translate for Py3 --- src/Mod/Draft/Draft.py | 2 - src/Mod/Draft/DraftGui.py | 121 +++++++++++- src/Mod/Draft/DraftTools.py | 28 +-- src/Mod/Draft/Resources/Draft.qrc | 3 +- src/Mod/Draft/Resources/ui/TaskShapeString.ui | 180 ++++++++++++++++++ 5 files changed, 316 insertions(+), 18 deletions(-) create mode 100644 src/Mod/Draft/Resources/ui/TaskShapeString.ui diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 23d3f53803..4bb7e7728b 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3181,10 +3181,8 @@ def makePoint(X=0, Y=0, Z=0,color=None,name = "Point", point_size= 5): return obj def makeShapeString(String,FontFile,Size = 100,Tracking = 0): - '''ShapeString(Text,FontFile,Height,Track): Turns a text string into a Compound Shape''' - if not FreeCAD.ActiveDocument: FreeCAD.Console.PrintError("No active document. Aborting\n") return diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index 4515340f31..5bc81e478d 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -47,7 +47,10 @@ except ImportError: FreeCAD.Console.PrintMessage("Error: Python-pyside package must be installed on your system to use the Draft module.") try: - _encoding = QtGui.QApplication.UnicodeUTF8 + if sys.version_info.major >= 3: + _encoding = None + else: + _encoding = QtGui.QApplication.UnicodeUTF8 def translate(context, text, utf8_decode=True): """convenience function for Qt translator context: str @@ -58,7 +61,9 @@ try: if set to true utf8 encoded unicode will be returned. This option does not have influence on python3 as for python3 we are returning utf-8 encoded unicode by default! """ - if sys.version_info.major >= 3 or utf8_decode: + if sys.version_info.major >= 3: + return QtGui.QApplication.translate(context, text, None) + elif utf8_decode: return QtGui.QApplication.translate(context, text, None, _encoding) else: return QtGui.QApplication.translate(context, text, None, _encoding).encode("utf8") @@ -74,10 +79,12 @@ except AttributeError: if set to true utf8 encoded unicode will be returned. This option does not have influence on python3 as for python3 we are returning utf-8 encoded unicode by default! """ - if sys.version_info.major >= 3 or utf8_decode: + if sys.version_info.major >= 3: return QtGui.QApplication.translate(context, text, None) + elif utf8_decode: + return QtGui.QApplication.translate(context, text, None, _encoding) else: - return QtGui.QApplication.translate(context, text, None).encode("utf8") + return QtGui.QApplication.translate(context, text, None, _encoding).encode("utf8") def utf8_decode(text): """py2: str -> unicode @@ -2366,6 +2373,112 @@ class ScaleTaskPanel: FreeCADGui.ActiveDocument.resetEdit() return True +def translateWidget(w, context=None, disAmb=None): + '''translator for items where retranslateUi() is unavailable. + translates widget w and children.''' + #handle w itself + if w.metaObject().className() == "QWidget": + origText = None + origText = w.windowTitle() + if origText: + newText = translate(context, str(origText)) + if newText: + w.setWindowTitle(newText) + + #handle children + wKids = w.findChildren(QtGui.QWidget) + for i in wKids: + className = i.metaObject().className() + if hasattr(i,"text") and hasattr(i,"setText"): + origText = i.text() + newText = translate(context, str(origText)) + if newText: + i.setText(newText) + elif hasattr(i,"title") and hasattr(i,"setTitle"): + origText = i.title() + newText = translate(context, str(origText)) + if newText: + i.setTitle(newText) + elif hasattr(i,"itemText") and hasattr(i,"setItemText"): + for item in range(i.count()): + oldText = i.itemText(item) + newText = translate(context, str(origText)) + if newText: + i.setItemText(item,newText) +#for debugging: +# else: +# msg = "TranslateWidget: Can not translate widget: {0} type: {1}\n".format(w.objectName(),w.metaObject().className()) +# FreeCAD.Console.PrintMessage(msg) + +class ShapeStringTaskPanel: + '''A TaskPanel for ShapeString''' + def __init__(self): + self.form = QtGui.QWidget() + self.form.setObjectName("ShapeStringTaskPanel") + self.form.setWindowTitle(translate("draft","ShapeString")) + layout = QtGui.QVBoxLayout(self.form) + uiFile = QtCore.QFile(u":/ui/TaskShapeString.ui") #this has to change if ui not in Resource file + loader = FreeCADGui.UiLoader() + self.task = loader.load(uiFile) + layout.addWidget(self.task) + + qStart = FreeCAD.Units.Quantity(0.0, FreeCAD.Units.Length) + self.task.sbX.setProperty('rawValue',qStart.Value) + self.task.sbX.setProperty('unit',qStart.getUserPreferred()[2]) + self.task.sbY.setProperty('rawValue',qStart.Value) + self.task.sbY.setProperty('unit',qStart.getUserPreferred()[2]) + self.task.sbZ.setProperty('rawValue',qStart.Value) + self.task.sbZ.setProperty('unit',qStart.getUserPreferred()[2]) + self.task.sbHeight.setProperty('rawValue',10.0) + self.task.sbHeight.setProperty('unit',qStart.getUserPreferred()[2]) + + self.stringText = translate("draft","Default") + self.task.leString.setText(self.stringText) + self.task.fcFontFile.setFileName(Draft.getParam("FontFile","")) + self.fileSpec = Draft.getParam("FontFile","") + + QtCore.QObject.connect(self.task.fcFontFile,QtCore.SIGNAL("fileNameSelected(const QString&)"),self.fileSelect) + + self.retranslateUi() + + def fileSelect(self, fn): + self.fileSpec = fn + + def accept(self): + FreeCAD.ActiveDocument.openTransaction("ShapeString") + qr,sup,points,fil = self.sourceCmd.getStrings() + height = FreeCAD.Units.Quantity(self.task.sbHeight.text()).Value + ss = Draft.makeShapeString(str(self.task.leString.text()), ##needs to be bytes for Py3! + str(self.fileSpec), + height, + 0.0) + + x = FreeCAD.Units.Quantity(self.task.sbX.text()).Value + y = FreeCAD.Units.Quantity(self.task.sbY.text()).Value + z = FreeCAD.Units.Quantity(self.task.sbZ.text()).Value + ssBase = FreeCAD.Vector(x,y,z) + plm=FreeCAD.Placement() + plm.Base = ssBase + elements = qr[1:-1].split(",") #string to tuple + mytuple = tuple(elements) #to prevent + plm.Rotation.Q = mytuple #PyCXX: Error creating object of type N2Py5TupleE from '(0.0,-0.0,-0.0,1.0)' + ss.Placement=plm + if sup: + ss.Support = FreeCAD.ActiveDocument.getObject(sup) + Draft.autogroup(ss) + FreeCAD.ActiveDocument.commitTransaction() + + FreeCAD.ActiveDocument.recompute() + FreeCADGui.ActiveDocument.resetEdit() + return True + + def reject(self): + FreeCADGui.ActiveDocument.resetEdit() + return True + + def retranslateUi(self): + translateWidget(self.form, "draft") + if not hasattr(FreeCADGui,"draftToolBar"): FreeCADGui.draftToolBar = DraftToolBar() #----End of Python Features Definitions----# diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 5a5c147276..33c47172ff 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -2221,17 +2221,23 @@ class ShapeString(Creator): Creator.Activated(self,name) if self.ui: self.ui.sourceCmd = self - self.dialog = None - self.text = '' - self.ui.sourceCmd = self - self.ui.pointUi(name) - self.active = True - self.call = self.view.addEventCallback("SoEvent",self.action) - self.ssBase = None - self.ui.xValue.setFocus() - self.ui.xValue.selectAll() - msg(translate("draft", "Pick ShapeString location point:")+"\n") - FreeCADGui.draftToolBar.show() + self.taskmode = Draft.getParam("UiMode",1) + if self.taskmode: + self.task = DraftGui.ShapeStringTaskPanel() + self.task.sourceCmd = self + DraftGui.todo.delay(FreeCADGui.Control.showDialog,self.task) + else: + self.dialog = None + self.text = '' + self.ui.sourceCmd = self + self.ui.pointUi(name) + self.active = True + self.call = self.view.addEventCallback("SoEvent",self.action) + self.ssBase = None + self.ui.xValue.setFocus() + self.ui.xValue.selectAll() + msg(translate("draft", "Pick ShapeString location point:")+"\n") + FreeCADGui.draftToolBar.show() def createObject(self): "creates object in the current doc" diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 881620f935..d9bdae005a 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -128,5 +128,6 @@ ui/preferences-dwg.ui ui/preferences-svg.ui ui/preferences-oca.ui + ui/TaskShapeString.ui - + diff --git a/src/Mod/Draft/Resources/ui/TaskShapeString.ui b/src/Mod/Draft/Resources/ui/TaskShapeString.ui new file mode 100644 index 0000000000..9c132d72f1 --- /dev/null +++ b/src/Mod/Draft/Resources/ui/TaskShapeString.ui @@ -0,0 +1,180 @@ + + + DraftShapeStringGui + + + + 0 + 0 + 445 + 480 + + + + + 0 + 0 + + + + + 250 + 0 + + + + ShapeString + + + + + + + 0 + 0 + + + + + + + + + + + + Text to be made into ShapeString + + + + + + + String + + + + + + + + + + + Height + + + + + + + Height of the result + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + + + + + + + + Y + + + + + + + Z + + + + + + + + + + + Font file + + + + + + + + + + + + + + + + Gui::FileChooser + QWidget +
Gui/FileDialog.h
+ + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ + + + + + +