Better support for units in LengthEntry.
This commit is contained in:
parent
60461d0724
commit
3f6ba30f3e
|
@ -85,15 +85,16 @@ class LengthEntry(QtGui.QLineEdit):
|
||||||
|
|
||||||
def get_value(self):
|
def get_value(self):
|
||||||
raw = str(self.text()).strip(' ')
|
raw = str(self.text()).strip(' ')
|
||||||
match = self.format_re.search(raw)
|
# match = self.format_re.search(raw)
|
||||||
|
|
||||||
if not match:
|
|
||||||
return None
|
|
||||||
try:
|
try:
|
||||||
if match.group(2) is not None and match.group(2).upper() in self.scales:
|
units = raw[-2:]
|
||||||
return float(eval(match.group(1)))*float(self.scales[self.output_units][match.group(2).upper()])
|
units = self.scales[self.output_units][units.upper()]
|
||||||
else:
|
value = raw[:-2]
|
||||||
return float(eval(match.group(1)))
|
return float(eval(value))*units
|
||||||
|
except IndexError:
|
||||||
|
value = raw
|
||||||
|
return float(eval(value))
|
||||||
except:
|
except:
|
||||||
log.warning("Could not parse value in entry: %s" % str(raw))
|
log.warning("Could not parse value in entry: %s" % str(raw))
|
||||||
return None
|
return None
|
||||||
|
|
Loading…
Reference in New Issue