dicube 0.1.4__cp38-cp38-win_amd64.whl → 0.2.2__cp38-cp38-win_amd64.whl

dicube/storage/pixel_utils.py

@@ -31,37 +31,37 @@ def derive_pixel_header_from_array(
     dtype = str(image.dtype)
     if image.dtype in (np.uint16, np.uint8, np.uint32):
         return image, PixelDataHeader(
-            RESCALE_SLOPE=1,
-            RESCALE_INTERCEPT=0,
-            PIXEL_DTYPE=dtype,
-            ORIGINAL_PIXEL_DTYPE=dtype,
+            RescaleSlope=1,
+            RescaleIntercept=0,
+            PixelDtype=dtype,
+            OriginalPixelDtype=dtype,
         )
     elif image.dtype == np.int16:
         min_val = int(np.min(image))
         image = (image - min_val).astype("uint16")
         return image, PixelDataHeader(
-            RESCALE_SLOPE=1,
-            RESCALE_INTERCEPT=min_val,
-            PIXEL_DTYPE="uint16",
-            ORIGINAL_PIXEL_DTYPE=dtype,
+            RescaleSlope=1,
+            RescaleIntercept=min_val,
+            PixelDtype="uint16",
+            OriginalPixelDtype=dtype,
         )
     elif image.dtype == np.int8:
         min_val = int(np.min(image))
         image = (image - min_val).astype("uint8")
         return image, PixelDataHeader(
-            RESCALE_SLOPE=1,
-            RESCALE_INTERCEPT=min_val,
-            PIXEL_DTYPE="uint8",
-            ORIGINAL_PIXEL_DTYPE=dtype,
+            RescaleSlope=1,
+            RescaleIntercept=min_val,
+            PixelDtype="uint8",
+            OriginalPixelDtype=dtype,
         )
     elif image.dtype == np.int32:
         min_val = int(np.min(image))
         image = (image - min_val).astype("uint32")
         return image, PixelDataHeader(
-            RESCALE_SLOPE=1,
-            RESCALE_INTERCEPT=min_val,
-            PIXEL_DTYPE="uint32",
-            ORIGINAL_PIXEL_DTYPE=dtype,
+            RescaleSlope=1,
+            RescaleIntercept=min_val,
+            PixelDtype="uint32",
+            OriginalPixelDtype=dtype,
         )
     elif image.dtype in (np.float16, np.float32, np.float64):
         if preferred_dtype == "uint8":
@@ -78,10 +78,10 @@ def derive_pixel_header_from_array(
             # Set all pixels to 0, slope=0, intercept=min_val
             # When reading back: i*slope+intercept = min_val
             header = PixelDataHeader(
-                RESCALE_SLOPE=1.0,
-                RESCALE_INTERCEPT=float(min_val),
-                PIXEL_DTYPE=preferred_dtype,
-                ORIGINAL_PIXEL_DTYPE=dtype,
+                RescaleSlope=1.0,
+                RescaleIntercept=float(min_val),
+                PixelDtype=preferred_dtype,
+                OriginalPixelDtype=dtype,
             )
             raw_image = np.zeros_like(image, dtype=preferred_dtype)
             return raw_image, header
@@ -92,12 +92,12 @@ def derive_pixel_header_from_array(
                 preferred_dtype
             )
             header = PixelDataHeader(
-                RESCALE_SLOPE=slope,
-                RESCALE_INTERCEPT=intercept,
-                PIXEL_DTYPE=preferred_dtype,
-                ORIGINAL_PIXEL_DTYPE=dtype,
-                MAX_VAL=max_val,
-                MIN_VAL=min_val,
+                RescaleSlope=slope,
+                RescaleIntercept=intercept,
+                PixelDtype=preferred_dtype,
+                OriginalPixelDtype=dtype,
+                MaxVal=max_val,
+                MinVal=min_val,
             )
             return raw_image, header
     else:
@@ -132,10 +132,128 @@ def get_float_data(
 
     # Note: Output may be positive or negative depending on original dtype and slope/intercept
     output_img = raw_image.astype(dtype)
-    if pixel_header.RESCALE_SLOPE is not None:
-        slope = np.array(pixel_header.RESCALE_SLOPE).astype(dtype)
-        output_img *= slope
-    if pixel_header.RESCALE_INTERCEPT is not None:
-        intercept = np.array(pixel_header.RESCALE_INTERCEPT).astype(dtype)
-        output_img += intercept
-    return output_img 
+    if pixel_header.RescaleSlope is not None:
+        slope = np.array(pixel_header.RescaleSlope).astype(dtype)
+        if slope != 1.0:
+            output_img *= slope
+    if pixel_header.RescaleIntercept is not None:
+        intercept = np.array(pixel_header.RescaleIntercept).astype(dtype)
+        if intercept != 0.0:
+            output_img += intercept
+    return output_img
+
+
+def determine_optimal_nifti_dtype(
+    image: np.ndarray, pixel_header: PixelDataHeader
+) -> Tuple[np.ndarray, str]:
+    """Determine the optimal data type for saving to NIfTI and return the converted data.
+
+    This function selects the most appropriate data type for NIfTI export based on the value range
+    of the raw image and the rescale slope/intercept. It minimizes unnecessary data conversion and
+    only applies scaling or offset if needed.
+
+    Args:
+        image (np.ndarray): The raw image data (integer type guaranteed).
+        pixel_header (PixelDataHeader): Pixel header containing rescale information.
+
+    Returns:
+        Tuple[np.ndarray, str]:
+            - The image data converted to the optimal type for NIfTI export.
+            - The name of the chosen data type as a string.
+
+    Raises:
+        ValueError: If the data cannot be represented in any supported NIfTI type.
+
+    Example:
+        >>> arr = np.array([0, 100, 200], dtype=np.uint16)
+        >>> header = PixelDataHeader(RescaleSlope=1.0, RescaleIntercept=0.0, OriginalPixelDtype="uint16", PixelDtype="uint16")
+        >>> data, dtype_name = determine_optimal_nifti_dtype(arr, header)
+        >>> print(data.dtype, dtype_name)
+        uint8 uint8
+    """
+    # 获取slope和intercept
+    slope = pixel_header.RescaleSlope if pixel_header.RescaleSlope is not None else 1.0
+    intercept = pixel_header.RescaleIntercept if pixel_header.RescaleIntercept is not None else 0.0
+    
+    # 直接从原始数据计算值域
+    raw_min = float(image.min())
+    raw_max = float(image.max())
+    
+    # 计算应用slope和intercept后的值域
+    min_val = raw_min * slope + intercept
+    max_val = raw_max * slope + intercept
+    
+    # 如果斜率为负，需要交换min和max
+    if slope < 0:
+        min_val, max_val = max_val, min_val
+    
+    # 检查原始数据类型
+    original_dtype = pixel_header.OriginalPixelDtype
+    is_signed_original = original_dtype in ("int8", "int16", "int32", "int64")
+    
+    # 检查slope和intercept是否为整数值
+    has_integer_transform = (
+        np.isclose(slope % 1, 0) and 
+        np.isclose(intercept % 1, 0)
+    )
+    
+    # 准备最终数据 - 仅在确定dtype后执行一次转换
+    result_dtype = None
+    result_dtype_name = None
+    
+    # 如果slope和intercept都是整数，则可以使用整数类型
+    if has_integer_transform:
+        # 尊重原始数据类型的符号属性
+        if is_signed_original or min_val < 0:
+            # 有符号整数
+            if min_val >= -128 and max_val <= 127:
+                result_dtype = np.int8
+                result_dtype_name = "int8"
+            elif min_val >= -32768 and max_val <= 32767:
+                result_dtype = np.int16
+                result_dtype_name = "int16"
+            elif min_val >= -2147483648 and max_val <= 2147483647:
+                result_dtype = np.int32
+                result_dtype_name = "int32"
+            elif max_val <= 2147483647:  # 值域在int32范围内，但原始类型是int32
+                result_dtype = np.int32
+                result_dtype_name = "int32"
+        else:
+            # 无符号整数
+            if max_val <= 255:
+                result_dtype = np.uint8
+                result_dtype_name = "uint8"
+            elif max_val <= 65535:
+                result_dtype = np.uint16
+                result_dtype_name = "uint16"
+            elif max_val <= 4294967295:
+                result_dtype = np.uint32
+                result_dtype_name = "uint32"
+    
+    # 如果没有找到合适的整数类型，使用浮点类型
+    if result_dtype is None:
+        if np.issubdtype(image.dtype, np.float64) or min_val < -3.4e38 or max_val > 3.4e38:
+            result_dtype = np.float64
+            result_dtype_name = "float64"
+        else:
+            result_dtype = np.float32
+            result_dtype_name = "float32"
+            
+    if has_integer_transform:
+        intercept = int(intercept)
+    else:
+        intercept = np.array(intercept,dtype=result_dtype)
+
+    if slope == 1.0:
+        # 只要加法
+        return image.astype(result_dtype) + intercept, result_dtype_name
+    else:
+        # 需要乘法，生成最终数据
+        if result_dtype in (np.float32, np.float64):
+            # 浮点类型，直接使用浮点运算
+            result = image.astype(result_dtype) * slope + intercept
+        else:
+            # 整数类型，先做浮点运算再转换
+            result = (image.astype(np.float32) * slope + intercept).astype(result_dtype)
+        
+        return result, result_dtype_name 

{dicube-0.1.4.dist-info → dicube-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dicube
-Version: 0.1.4
+Version: 0.2.2
 Summary: Medical Image Storage Library with DICOM compatibility
 Author: Fangzhou Liao
 License: MIT
@@ -38,6 +38,7 @@ Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: build>=0.8.0; extra == "dev"
 Requires-Dist: pylibjpeg>=2.0; extra == "dev"
 Requires-Dist: pylibjpeg-openjpeg>=2.0; extra == "dev"
+Requires-Dist: nibabel>=3.2.0; extra == "dev"
 Provides-Extra: all
 Requires-Dist: pybind11>=2.10.0; extra == "all"
 Requires-Dist: nibabel>=3.2.0; extra == "all"

{dicube-0.1.4.dist-info → dicube-0.2.2.dist-info}/RECORD

@@ -1,18 +1,16 @@
-dicube/__init__.py,sha256=CwVdLfPEkB6t5szG1eZnpF0JIbuOR1dC6WZ4pwNd0lI,4328
+dicube/__init__.py,sha256=XI_Zeif8FOQ-i_G7LabwVFpubzDniXSFb-8H_WdYW8c,5059
 dicube/codecs/__init__.py,sha256=Tqw2vmQML-pcaNtnyTtj4W4kBqGhV2FTiVAT5bW5FgA,3905
 dicube/codecs/jph/__init__.py,sha256=pWYkTNWYeGZx3khsJBAKRdB2Vgyr0BX5aLDKaanfe_o,407
 dicube/codecs/jph/codec.py,sha256=BMZM3ReemQheraSIYn19aqH-1NrbjQTPAx3iCTms7KU,5620
-dicube/codecs/jph/ojph_complete.cp38-win32.pyd,sha256=g3NgC2GHqAEi85rd5OII7y9ecntQIJs3b0eOz_kImOk,507904
-dicube/codecs/jph/ojph_complete.cp38-win_amd64.pyd,sha256=18JF5Nd1AECJFgkkAUsimUJCAoeaSMp3CIo57EV7fV8,601600
-dicube/codecs/jph/ojph_decode_complete.cp38-win32.pyd,sha256=HoJrMZc_Na-I2oRc0NKyBKuBOzHd98-S0I4MHz_jvoY,543232
-dicube/codecs/jph/ojph_decode_complete.cp38-win_amd64.pyd,sha256=wt4cGlqv5DYqVJjGKQaxSJzg8gtqtuSqzciaa9tRK_Q,639488
+dicube/codecs/jph/ojph_complete.cp38-win_amd64.pyd,sha256=5A8LW4oiuxFKTgM8g5QXcgFA1Jp8gT0-5Ag2n3JIWWw,601600
+dicube/codecs/jph/ojph_decode_complete.cp38-win_amd64.pyd,sha256=ZsXsgMf-j47XI4gk0XiiyeLdLddvwM_PyYUjrqbrXj0,639488
 dicube/core/__init__.py,sha256=TJBS1xA2qVS7xxH6vZKPrd7YiQYtyLfNSs48tlmBCD8,676
-dicube/core/image.py,sha256=24oBY6sjW52yuJ2DS4Cq8cyvCY1vdT-WmkXsUehV4qI,14530
-dicube/core/io.py,sha256=yvN7eCmJr6OarJz1m-YTE6yw_xinqvGqNCLnPpnAcco,14116
-dicube/core/pixel_header.py,sha256=KM61i3ZPAQYcu-IKgou8DruDJIjcbq5qSsTL0sFMtro,4045
+dicube/core/image.py,sha256=WR9GKat0st0ior7zw1wi_5Bpd5cZoHWvsPzjYJAwpcg,14525
+dicube/core/io.py,sha256=htVflYmSgB--2CSKftfEfNLEtIJ7Jrg02A1MveW3Xs8,16036
+dicube/core/pixel_header.py,sha256=gikXfkjTGVQUqTWUk8Q2xAPsDfWm0iRPcwdIxIImr94,4124
 dicube/dicom/__init__.py,sha256=OGnAHS3pCbb94Vpsc0x3d2gjv5UBAM9oUR3mxQVruYQ,383
-dicube/dicom/dcb_streaming.py,sha256=MSPLTfUYQF1Wb4ut5I3xuxPjum1xW5DgZRGhMPX9Lq4,9291
-dicube/dicom/dicom_io.py,sha256=7TPfDz3f4qlvYhmweacT5GURRj2aZu3Tc6F8N7Yn1Hc,5093
+dicube/dicom/dcb_streaming.py,sha256=6b50m5SEHFkdkWYKl6_ClzvPZZJKlJlVNR08sWF-Xdo,9335
+dicube/dicom/dicom_io.py,sha256=EWR-VYXUYEF066dxucSb9E7xPpIReN-BbCeIZSsNskU,5069
 dicube/dicom/dicom_meta.py,sha256=PgVeIWoYE7udQ3M26ytX1r3ic9leL35MMVfEJhTk-3Q,27552
 dicube/dicom/dicom_status.py,sha256=VYp6q6UbxPkGwJ8_udEBRGSCFeSWedwRuEB4vfREOaE,10375
 dicube/dicom/dicom_tags.py,sha256=BRw099dC-9FvAJ43QKESHBxtGtsGSSodcijJKXcCnsE,4065
@@ -20,10 +18,10 @@ dicube/dicom/merge_utils.py,sha256=ji0twDUBpR261l0pS2i8knetZI5Jg-OEaYsc2G_SBzk,9
 dicube/dicom/space_from_meta.py,sha256=i6zIXbFaNyz0g6z2oeoO5lzsfaeo4sgz_FI-PrEmqsg,2489
 dicube/exceptions.py,sha256=VNnW7Dd9MwKzSK_y9GQITrsaHYiL-Crwmntzf-YS1sY,6877
 dicube/storage/__init__.py,sha256=6WG1hdok-TkKShXCKFvH9ShoNILq3qvyZ6sNEO_urW4,481
-dicube/storage/dcb_file.py,sha256=yl1fIgkP_qbCR_jj-rTt9FmHuVI9S2NSvJ3M1xunWeQ,31183
-dicube/storage/pixel_utils.py,sha256=Wspas9QyH5GUoGpVzs9DAB1PtO1jo0sDUvYjwQ8RVpM,5276
+dicube/storage/dcb_file.py,sha256=tt7aYi4x_gxf4s6De6tSkpiwyoCp1ZcG-Piixai1Jw8,32055
+dicube/storage/pixel_utils.py,sha256=_KrsMoKHsgGc9QFSkmpx5YlDNcTOYPkCSu-zGt3WS7k,10017
 dicube/utils/__init__.py,sha256=r4wAqNWphzYWaeYN9fcoFCX7mTcOtNACzZ4O-dDCQ10,154
 dicube/validation.py,sha256=aFu2lKW9NDl13eKedYhOjw1g50uOf_x0wx3y3g9cLsA,12857
-dicube-0.1.4.dist-info/METADATA,sha256=lLPPqXaJcIOIHhGuU3buJPhmi3GCMeKi5KW0FhlY0nk,10581
-dicube-0.1.4.dist-info/WHEEL,sha256=AmELy_2Xx7O_V7LBv-s-ztFbR13e4jkKGwV7sVzppgU,104
-dicube-0.1.4.dist-info/RECORD,,
+dicube-0.2.2.dist-info/METADATA,sha256=nBhXpfkqIUhGO2LUB-HmTwmDIolxcvd-cr8tW4CJNzM,10627
+dicube-0.2.2.dist-info/WHEEL,sha256=AmELy_2Xx7O_V7LBv-s-ztFbR13e4jkKGwV7sVzppgU,104
+dicube-0.2.2.dist-info/RECORD,,