kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Unicode fixes for Python3

Browse Source
This commit is contained in:
cclauss
2019-01-04 12:18:25 +01:00
committed by wmayer
parent 0453ee71e6
commit e3545c8c06
12 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Plot/plotAxes/TaskPanel.py
View File

@@ -21,6 +21,8 @@
#* *
#***************************************************************************
import six
import FreeCAD as App
import FreeCADGui as Gui
@@ -454,8 +456,8 @@ class TaskPanel:
if loc in ['left', 'right']:
spine.set_position(('outward', form.yOffset.value()))
# Now we can restore axes labels
Plot.xlabel(unicode(x))
Plot.ylabel(unicode(y))
Plot.xlabel(six.text_type(x))
Plot.ylabel(six.text_type(y))
plt.update()
def onScales(self):

8
src/Mod/Plot/plotLabels/TaskPanel.py
View File

@@ -21,6 +21,8 @@
#* *
#***************************************************************************
import six
import FreeCAD as App
import FreeCADGui as Gui
@@ -221,9 +223,9 @@ class TaskPanel:
form.xLabel = self.widget(QtGui.QLineEdit, "titleX")
form.yLabel = self.widget(QtGui.QLineEdit, "titleY")
Plot.title(unicode(form.title.text()))
Plot.xlabel(unicode(form.xLabel.text()))
Plot.ylabel(unicode(form.yLabel.text()))
Plot.title(six.text_type(form.title.text()))
Plot.xlabel(six.text_type(form.xLabel.text()))
Plot.ylabel(six.text_type(form.yLabel.text()))
plt.update()
def onFontSizes(self, value):

4
src/Mod/Plot/plotSave/TaskPanel.py
View File

@@ -23,6 +23,8 @@
import os
import six
import FreeCAD as App
import FreeCADGui as Gui
@@ -51,7 +53,7 @@ class TaskPanel:
form.sizeX = self.widget(QtGui.QDoubleSpinBox, "sizeX")
form.sizeY = self.widget(QtGui.QDoubleSpinBox, "sizeY")
form.dpi = self.widget(QtGui.QSpinBox, "dpi")
path = unicode(form.path.text())
path = six.text_type(form.path.text())
size = (form.sizeX.value(), form.sizeY.value())
dpi = form.dpi.value()
Plot.save(path, size, dpi)