- in Tool Calculators fixed an application crash if the user typed letters instead of numbers in the boxes. Now the boxes accept only numbers, dots, comma, spaces and arithmetic operators

- NumericalEvalEntry allow the input of commas now
- Tool Calculators: allowed comma to be used as decimal separator
This commit is contained in:
Marius Stanciu 2020-06-05 04:43:41 +03:00 committed by Marius
parent fb602d6f9b
commit 487e7bbfe8
2 changed files with 14 additions and 1 deletions

View File

@ -123,6 +123,8 @@ CHANGELOG for FlatCAM beta
- working on Isolation Tool: made to work the Isolation with multiple tools without rest machining
- in Tool Calculators fixed an application crash if the user typed letters instead of numbers in the boxes. Now the boxes accept only numbers, dots, comma, spaces and arithmetic operators
- NumericalEvalEntry allow the input of commas now
- Tool Calculators: allowed comma to be used as decimal separator
26.05.2020

View File

@ -666,10 +666,21 @@ class NumericalEvalEntry(EvalEntry):
def __init__(self, border_color=None):
super().__init__(border_color=border_color)
regex = QtCore.QRegExp("[0-9\/\*\+\-\%\.\s]*")
regex = QtCore.QRegExp("[0-9\/\*\+\-\%\.\,\s]*")
validator = QtGui.QRegExpValidator(regex, self)
self.setValidator(validator)
def get_value(self):
raw = str(self.text()).strip(' ')
raw = raw.replace(',', '.')
try:
evaled = eval(raw)
except Exception as e:
if raw != '':
log.error("Could not evaluate val: %s, error: %s" % (str(raw), str(e)))
return None
return evaled
class NumericalEvalTupleEntry(FCEntry):
"""