Arxml limits number formats (#457)

* add number decoding in arxml for different basis
* fix #454

Author: ebroecker

src/canmatrix/formats/arxml.py

@@ -918,7 +918,7 @@ def decode_compu_method(compu_method, root_or_cache, ns, float_factory):
         # Modification to support sourcing the COMPU_METHOD info from the Vector NETWORK-REPRESENTATION-PROPS
         # keyword definition. 06Jun16
         #####################################################################################################
-        if ll is not None and desc is not None and int(float_factory(ul.text)) == int(float_factory(ll.text)):
+        if ll is not None and desc is not None and canmatrix.utils.decode_number(ul.text) == canmatrix.utils.decode_number(ll.text):
             #####################################################################################################
             #####################################################################################################
             values[ll.text] = desc
@@ -1187,7 +1187,7 @@ def get_signals(signal_array, frame, root_or_cache, ns, multiplex_id, float_fact
                 new_signal.initial_value = float_factory(initvalue.text)
 
             for key, value in list(values.items()):
-                new_signal.add_values(key, value)
+                new_signal.add_values(canmatrix.utils.decode_number(key), value)
             if signal_name is not None:
                 new_signal.add_attribute("LongName", signal_name)
             frame.add_signal(new_signal)

src/canmatrix/tests/test_utils.py

@@ -10,3 +10,7 @@ def test_utils_guess_value():
     assert canmatrix.utils.guess_value("False") == "0"
     assert canmatrix.utils.guess_value("faLse") == "0"
 
+def test_decode_number():
+    assert canmatrix.utils.decode_number("0x10") == 16
+    assert canmatrix.utils.decode_number("0b10") == 2
+    assert canmatrix.utils.decode_number("10") == 10

src/canmatrix/utils.py

@@ -60,3 +60,21 @@ def get_gcd(value1, value2):  # type (int,int) -> (int)
         return math.gcd(value1, value2)
     else:
         return fractions.gcd(value1, value2)
+
+def decode_number(value):  # type(string) -> (int)
+    """
+    Decode string to integer and guess correct base
+    :param value: string input value
+    :return: integer
+    """
+
+    value = value.strip()
+    base = 10
+    if len(value) > 1 and value[1] == 'b':  # bin coded
+        base = 2
+        value = value[2:]
+    if len(value) > 1 and value[1] == 'x':  # hex coded
+        base = 16
+        value = value[2:]
+
+    return int(value, base)