From f02e0806dedc7e38be00bec0e1b36c1f207472ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduard=20Br=C3=B6cker?= Date: Thu, 2 Jan 2025 10:10:51 +0100 Subject: [PATCH] xls load: (#762) allow to explicite overwrite factor (#824) --- src/canmatrix/formats/xls.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/canmatrix/formats/xls.py b/src/canmatrix/formats/xls.py index b25bb280..b7d2a77c 100644 --- a/src/canmatrix/formats/xls.py +++ b/src/canmatrix/formats/xls.py @@ -545,7 +545,9 @@ def load(file, **options): unit = unit.strip() new_signal.unit = unit try: - new_signal.factor = float_factory(factor) + # if prevents overwriting explicit factor (if given) + if new_signal.factor in (1, 1.0): + new_signal.factor = float_factory(factor) except: logger.warning( "Some error occurred while decoding scale of Signal %s: '%s'",