giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better support for units in LengthEntry.

This commit is contained in:
Juan Pablo Caram 2015-11-04 18:52:56 -05:00
parent 60461d0724
commit 3f6ba30f3e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
GUIElements.py
View File

@ -85,15 +85,16 @@ class LengthEntry(QtGui.QLineEdit):
def get_value(self):
raw = str(self.text()).strip(' ')
match = self.format_re.search(raw)
# match = self.format_re.search(raw)
if not match:
return None
try:
if match.group(2) is not None and match.group(2).upper() in self.scales:
return float(eval(match.group(1)))*float(self.scales[self.output_units][match.group(2).upper()])
else:
return float(eval(match.group(1)))
units = raw[-2:]
units = self.scales[self.output_units][units.upper()]
value = raw[:-2]
return float(eval(value))*units
except IndexError:
value = raw
return float(eval(value))
except:
log.warning("Could not parse value in entry: %s" % str(raw))
return None