suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the problems with the group separator in some locales

Browse Source
This commit is contained in:
J.L. Cercos-Pita 2015-05-31 18:36:08 +02:00 committed by Yorik van Havre
parent 5c79b2f762
commit f867db6f71
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Ship/shipCreateShip/TaskPanel.py
View File

@ -266,17 +266,17 @@ class TaskPanel:
form.breadth = self.widget(QtGui.QLineEdit, "Breadth") form.breadth = self.widget(QtGui.QLineEdit, "Breadth")
form.draft = self.widget(QtGui.QLineEdit, "Draft") form.draft = self.widget(QtGui.QLineEdit, "Draft")
qty = Units.Quantity(form.length.text()) qty = Units.Quantity(Locale.fromString(form.length.text()))
val_min = 0.001 val_min = 0.001
val_max = self.bounds[0] / Units.Metre.Value val_max = self.bounds[0] / Units.Metre.Value
val = qty.getValueAs('m').Value val = qty.getValueAs('m').Value
self.L = self.clampVal(form.length, val_min, val_max, val) self.L = self.clampVal(form.length, val_min, val_max, val)
qty = Units.Quantity(form.breadth.text()) qty = Units.Quantity(Locale.fromString(form.breadth.text()))
val_min = 0.001 val_min = 0.001
val_max = self.bounds[1] / Units.Metre.Value val_max = self.bounds[1] / Units.Metre.Value
val = qty.getValueAs('m').Value val = qty.getValueAs('m').Value
self.B = self.clampVal(form.breadth, val_min, val_max, val) self.B = self.clampVal(form.breadth, val_min, val_max, val)
qty = Units.Quantity(form.draft.text()) qty = Units.Quantity(Locale.fromString(form.draft.text()))
val_min = 0.001 val_min = 0.001
val_max = self.bounds[2] / Units.Metre.Value val_max = self.bounds[2] / Units.Metre.Value
val = qty.getValueAs('m').Value val = qty.getValueAs('m').Value

6
src/Mod/Ship/shipUtils/Locale.py
View File

@ -29,3 +29,9 @@ def toString(valueStr):
conveniently transforming a value string""" conveniently transforming a value string"""
dec_sep = QtCore.QLocale.system().decimalPoint() dec_sep = QtCore.QLocale.system().decimalPoint()
return valueStr.replace(".", dec_sep) return valueStr.replace(".", dec_sep)
def fromString(valueStr):
"""Natural extension of QtCore.QLocale.toFloat method, in this case
conveniently transforming a value string"""
grp_sep = QtCore.QLocale.system().groupSeparator()
return valueStr.replace(grp_sep, "")