diff options
author | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2017-12-28 13:23:54 +0100 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2017-12-28 14:12:36 +0100 |
commit | 21723b0d0b97a71aad8aafeb5d413015b2909320 (patch) | |
tree | f74b2129366fed432db9438cfd19f8e8fda2716e /glucometerutils | |
parent | Use Python3 Enum class for measurement methods. (diff) | |
download | glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar.gz glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar.bz2 glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar.lz glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar.xz glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.tar.zst glucometerutils-21723b0d0b97a71aad8aafeb5d413015b2909320.zip |
Diffstat (limited to 'glucometerutils')
-rw-r--r-- | glucometerutils/common.py | 10 | ||||
-rw-r--r-- | glucometerutils/drivers/accuchek_reports.py | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/glucometerutils/common.py b/glucometerutils/common.py index 31584b4..318fc86 100644 --- a/glucometerutils/common.py +++ b/glucometerutils/common.py @@ -28,7 +28,7 @@ class MeasurementMethod(enum.Enum): CGM = 'CGM' # Continuous Glucose Monitoring -def convert_glucose_unit(value, from_unit, to_unit=None): +def convert_glucose_unit(value, from_unit, to_unit): """Convert the given value of glucose level between units. Args: @@ -38,14 +38,14 @@ def convert_glucose_unit(value, from_unit, to_unit=None): Returns: The converted representation of the blood glucose level. - - Raises: - exceptions.InvalidGlucoseUnit: If the parameters are incorrect. """ + from_unit = Unit(from_unit) + to_unit = Unit(to_unit) + if from_unit == to_unit: return value - if from_unit is Unit.MG_DL: + if from_unit == Unit.MG_DL: return round(value / 18.0, 2) else: return round(value * 18.0, 0) diff --git a/glucometerutils/drivers/accuchek_reports.py b/glucometerutils/drivers/accuchek_reports.py index d55ac0f..404ed9b 100644 --- a/glucometerutils/drivers/accuchek_reports.py +++ b/glucometerutils/drivers/accuchek_reports.py @@ -130,6 +130,8 @@ class Device(object): yield common.GlucoseReading( self._extract_datetime(record), - common.convert_glucose_unit(float(record[_RESULT_CSV_KEY]), - _UNIT_MAP[record[_UNIT_CSV_KEY]]), + common.convert_glucose_unit( + float(record[_RESULT_CSV_KEY]), + _UNIT_MAP[record[_UNIT_CSV_KEY]], + common.Unit.MG_DL), meal=self._extract_meal(record)) |