Added convert_array_to_standard_type

Author: PierreRaybaut

cdl/core/io/conv.py

@@ -40,3 +40,49 @@ def data_to_xy(data: np.ndarray) -> list[np.ndarray]:
     if len(data) == 4:
         dx, dy = data[2:]
     return x, y, dx, dy
+
+
+def convert_array_to_standard_type(array: np.ndarray) -> np.ndarray:
+    """Convert an integer array to a standard type
+    (int8, int16, int32, uint8, uint16, uint32).
+
+    Ignores floating point arrays.
+
+    Args:
+        array: array to convert
+
+    Raises:
+        ValueError: if array is not of integer type
+
+    Returns:
+        Converted array
+    """
+    # Determine the kind and size of the data type
+    kind = array.dtype.kind
+    itemsize = array.dtype.itemsize
+
+    if kind in ["f", "c"]:  # 'f' for floating point, 'c' for complex
+        return array
+
+    if kind == "b":
+        # Convert to uint8 if it is not already
+        if array.dtype != np.uint8:
+            return array.astype(np.uint8)
+        return array
+
+    if kind in ["i", "u"]:  # 'i' for signed integers, 'u' for unsigned integers
+        if itemsize == 1:  # 8-bit
+            new_type = np.dtype(f"{kind}1").newbyteorder("=")
+        elif itemsize == 2:  # 16-bit
+            new_type = np.dtype(f"{kind}2").newbyteorder("=")
+        elif itemsize == 4:  # 32-bit
+            new_type = np.dtype(f"{kind}4").newbyteorder("=")
+        else:
+            raise ValueError("Unsupported item size for integer type")
+
+        # Convert to the new type if it is different from the current type
+        if array.dtype != new_type:
+            return array.astype(new_type)
+        return array
+
+    raise ValueError("Unsupported data type")

cdl/core/io/h5/common.py

@@ -19,7 +19,7 @@
 import numpy as np
 
 from cdl.config import Conf
-from cdl.core.io.conv import data_to_xy
+from cdl.core.io.conv import convert_array_to_standard_type, data_to_xy
 from cdl.utils.misc import to_string
 
 
@@ -118,6 +118,7 @@ def set_signal_data(self, obj):
         data = self.data
         if data.dtype not in (float, np.complex128):
             data = np.array(data, dtype=float)
+        data = convert_array_to_standard_type(data)
         if len(data.shape) == 1:
             obj.set_xydata(np.arange(data.size), data)
         else:
@@ -131,7 +132,7 @@ def set_image_data(self, obj):
             self.uint32_wng = data.max() > np.iinfo(np.int32).max
             clipped_data = data.clip(0, np.iinfo(np.int32).max)
             data = np.array(clipped_data, dtype=np.int32)
-        obj.data = data
+        obj.data = convert_array_to_standard_type(data)
 
 
 class H5Importer:

cdl/core/io/image/formats.py

@@ -15,6 +15,7 @@
 
 from cdl.config import _
 from cdl.core.io.base import FormatInfo
+from cdl.core.io.conv import convert_array_to_standard_type
 from cdl.core.io.image import funcs
 from cdl.core.io.image.base import ImageFormatBase
 from cdl.core.model.image import ImageObj
@@ -67,7 +68,7 @@ class NumPyImageFormat(ImageFormatBase):
     @staticmethod
     def read_data(filename: str) -> np.ndarray:
         """Read data and return it"""
-        return np.load(filename)
+        return convert_array_to_standard_type(np.load(filename))
 
     def write(self, filename: str, obj: ImageObj) -> None:
         """Write data to file"""

cdl/core/io/signal/formats.py

@@ -11,6 +11,7 @@
 
 from cdl.config import _
 from cdl.core.io.base import FormatInfo
+from cdl.core.io.conv import convert_array_to_standard_type
 from cdl.core.io.signal import funcs
 from cdl.core.io.signal.base import SignalFormatBase
 from cdl.core.model.signal import SignalObj
@@ -36,7 +37,7 @@ def read_xydata(self, filename: str, obj: SignalObj) -> np.ndarray:
         Returns:
             np.ndarray: xydata
         """
-        return np.load(filename)
+        return convert_array_to_standard_type(np.load(filename))
 
     def write(self, filename: str, obj: SignalObj) -> None:
         """Write data to file

cdl/data/dependencies-py3-win32.txt

@@ -1,2 +1,2 @@
-guidata:cb7baedddd8db3f67fb914d751f5a4c39e6545ee
-plotpy:34883d5c7d23262ec6b5f1d7bd8ea99858ad0dbf
+guidata:6189db04e502cc0a63453221df916e873b90fa0b
+plotpy:c73d5efc5a5101a745d73cca8b99419a1fe85d31