hsi-preprocessing-toolkit 2.1.1.dev5__tar.gz → 2.2.1__tar.gz

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hsi-preprocessing-toolkit
-Version: 2.1.1.dev5
+Version: 2.2.1
 Summary: HSI Preprocessing Toolkit
 Author: songyz2023
 Author-email: songyz2023 <songyz2023dlut@outlook.com>
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: einops>=0.8.0
 Requires-Dist: gradio>=5.50.0,<6.0.0
 Requires-Dist: matplotlib>=3.10.0
+Requires-Dist: opencv-python>=4.13.0.90
 Requires-Dist: rasterio>=1.4.0
 Requires-Dist: rs-fusion-datasets>=0.16.0
 Requires-Dist: scipy>=1.16.0
@@ -33,7 +34,7 @@ Description-Content-Type: text/markdown
 ![](asset/screenshot.jpg)
 
 HSI Preprocessing Toolkit (HPT, formerly HDR2MAT) is a hyperspectral image preprocessing toolset that:
-1. Read the raw data from the HSI camera, and convert it into `.mat` file
+1. Read the raw data directly from HSI cameras, and convert it into `.mat` file
 2. Read the `.mat` file
 3. Preview HSI and convert it to RGB `.png` file
 4. Crop, rotate, transform the HSI and preview in realtime

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/README.md

@@ -10,7 +10,7 @@
 ![](asset/screenshot.jpg)
 
 HSI Preprocessing Toolkit (HPT, formerly HDR2MAT) is a hyperspectral image preprocessing toolset that:
-1. Read the raw data from the HSI camera, and convert it into `.mat` file
+1. Read the raw data directly from HSI cameras, and convert it into `.mat` file
 2. Read the `.mat` file
 3. Preview HSI and convert it to RGB `.png` file
 4. Crop, rotate, transform the HSI and preview in realtime

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hsi-preprocessing-toolkit"
-version = "2.1.1.dev5" # This will be changed by dunami according to git tag when releasing.
+version = "2.2.1" # This will be changed by dunami according to git tag when releasing.
 description = "HSI Preprocessing Toolkit"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -8,6 +8,7 @@ dependencies = [
     "einops>=0.8.0",
     "gradio>=5.50.0,<6.0.0",
     "matplotlib>=3.10.0",
+    "opencv-python>=4.13.0.90",
     "rasterio>=1.4.0",
     "rs-fusion-datasets>=0.16.0",
     "scipy>=1.16.0",

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/src/hsi_preprocessing_toolkit/algorithm.py

@@ -6,6 +6,7 @@ import matplotlib
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
 import einops
+import cv2
 
 # Return A HWC Image, the C should work with both RGB and HSI
 def composite_img(imgs :list[np.ndarray], transforms:list[dict]):
@@ -52,21 +53,67 @@ def _min_max_normalize(x :np.ndarray):
 def compose_spectral_profile(x: np.ndarray) -> np.ndarray:
     '''
     x: a [H C] or [W C] array, any dtype
-    return: HW4 RGBA Uint8 Image (0~225), x (as row direction) is height or width, y (as col direction) is spectral
+    return: HC4 RGB Uint8 Image (0~225), x (as row direction) is height or width, y (as col direction) is spectral
     '''
-    x = x.transpose(1,0) # convert to [C X]
     x = _min_max_normalize(x)
     mapper = matplotlib.colormaps.get_cmap('viridis')
-    rgb = mapper(x)
+    rgb = mapper(x)[:,:,:3]
     rgb = (rgb*255).astype('uint8')
     return rgb
 
+def generate_oblique_cube(front, top, right):
+    """
+    符号说明:
+    w, h, d : 原长方体的宽、高、深
+    W, H    : 合成画布(Canvas)的宽、高
+    a     : 投影偏移量 (d * 0.5 * sin(45°))
+    """
+    # top:   w d 3
+    # right: h d 3
+    # front: h w 3
+    top = top[:,::-1,:] # dirty fix
+    h, w = front.shape[:2]
+    d = top.shape[1]
+    assert d==right.shape[1]
+    assert h==right.shape[0]
+    assert w==  top.shape[0]
 
+    a = int(d * 0.5 * 0.7071)
+    W, H = w + a, h + a
+    canvas = np.zeros((H, W, 3), dtype=np.uint8)
 
+    # 加减1是为了防止出现缝隙，这也算是一种off by one了...
+    canvas_r = cv2.warpAffine(right, 
+        cv2.getAffineTransform(
+            np.array([[0, 0], [0, h], [d, 0]], dtype=np.float32),
+            np.array([[w, a], [w, H], [W, 0]], dtype=np.float32)),
+        (W, H), flags=cv2.INTER_LANCZOS4)
+    canvas_t = cv2.warpAffine(top, 
+        cv2.getAffineTransform(
+            np.array([[0, 0], [0, w], [d, 0]], dtype=np.float32),
+            np.array([[a, 0], [W, 0], [0, a]], dtype=np.float32)),
+        (W, H), flags=cv2.INTER_LANCZOS4)
+    canvas[a:H, 0:w] = front
 
-def compose_bread_edge(hsi: np.ndarray) -> (np.ndarray, np.ndarray): # input HWC, output HWC
-    top = _min_max_normalize(hsi[:,0,:])   # H C
-    right = _min_max_normalize(hsi[0,:,:]) # W C
+    m_r = np.any(canvas_r > 0, axis=-1)
+    m_t = np.any(canvas_t > 0, axis=-1)
+    canvas[m_r] = canvas_r[m_r]
+    canvas[m_t] = canvas_t[m_t]
+    return canvas
+
+def compose_hsi_cube(hsi: np.ndarray, front: np.ndarray) -> (np.ndarray, np.ndarray, np.ndarray): 
+    '''
+    input HWC,HW3(u8)
+    output HWC,HWC,HWC
+    '''
+    top   = _min_max_normalize(hsi[0,:,:])   # W C, 有宽度W和深度，是侧面
+    right = _min_max_normalize(hsi[:,0,:])   # H C
+    top   = compose_spectral_profile(top)    # W C 3
+    right = compose_spectral_profile(right)  # H C 3 
+
+    cube = generate_oblique_cube(front, top, right)
+
+    return cube, einops.rearrange(top, 'H C c -> C H c'), einops.rearrange(right, 'H C c -> C H c')
     
     # top_fig = plt.figure()
     # top_im = plt.imshow(top, cmap='viridis')
@@ -80,7 +127,4 @@ def compose_bread_edge(hsi: np.ndarray) -> (np.ndarray, np.ndarray): # input HWC
     # right_fig = plt.figure()
     # plt.imshow(right, cmap='viridis')
     # plt.axis('off')
-    # plt.margins(0, 0)
-
-    return compose_spectral_profile(top), compose_spectral_profile(right)
-    
+    # plt.margins(0, 0)

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/src/hsi_preprocessing_toolkit/common.py

@@ -80,6 +80,8 @@ TRANSLATION = {
         "hsi_processing.spectral_profiles.generate": "Generate Spectral Profiles",
         "hsi_processing.spectral_profiles.x_lambda_plane": "x-λ",
         "hsi_processing.spectral_profiles.y_lambda_plane": "y-λ",
+        "hsi_processing.spectral_profiles.hsi_cube": "HSI Cube",
+
 
         "scanner_calc.tab_title": "Scanner Parameters",
     },
@@ -136,6 +138,7 @@ TRANSLATION = {
         "hsi_processing.spectral_profiles.generate": "生成光谱剖面",
         "hsi_processing.spectral_profiles.x_lambda_plane": "x-λ剖面",
         "hsi_processing.spectral_profiles.y_lambda_plane": "y-λ剖面",
+        "hsi_processing.spectral_profiles.hsi_cube": "光谱立方体",
 
         "scanner_calc.tab_title": "推扫仪计算",
     }

{hsi_preprocessing_toolkit-2.1.1.dev5 → hsi_preprocessing_toolkit-2.2.1}/src/hsi_preprocessing_toolkit/page/hsi_preprocessing.py

@@ -12,7 +12,7 @@ import gradio.utils
 from rs_fusion_datasets.util.hsi2rgb import _hsi2rgb, hsi2rgb
 from jaxtyping import Float
 from enum import Enum
-from ..algorithm import composite_img, compose_bread_edge
+from ..algorithm import composite_img, compose_hsi_cube
 from ..common import i18n, LOGGER, TRANSLATION, DEBUG
 import logging
 
@@ -511,6 +511,10 @@ def HSIProcessingTab():
                         )
 
                 with gr.Accordion(i18n('hsi_processing.spectral_profiles'),visible=False) as spectral_profile_panel:
+                    hsi_cube_image = gr.Image(
+                        label=i18n('hsi_processing.spectral_profiles.hsi_cube'),
+                        format="png", height="auto", width="auto", interactive=False
+                    )
                     x_lambda_image = gr.Image(
                         label=i18n('hsi_processing.spectral_profiles.x_lambda_plane'),
                         format="png", height="auto", width="auto", interactive=False
@@ -522,11 +526,7 @@ def HSIProcessingTab():
                     generate_spectral_profiles = gr.Button(
                         i18n('hsi_processing.spectral_profiles.generate')
                     )
-                    generate_spectral_profiles.click(
-                        fn=compose_bread_edge,
-                        inputs=[state_processed_data],
-                        outputs=[y_lambda_plane, x_lambda_image]
-                    )
+
                                 
 
             with gr.Column(scale=2):
@@ -540,6 +540,11 @@ def HSIProcessingTab():
                     )
 
         # 回调函数   
+        generate_spectral_profiles.click(
+            fn=compose_hsi_cube,
+            inputs=[state_processed_data, preview_img],
+            outputs=[hsi_cube_image, y_lambda_plane, x_lambda_image]
+        )
         reload_btn.click(
             fn=gr_load,
             inputs=[state_current_layer_index, state_transforms, state_original_rgb, state_original_data, state_data_path, dat_files, input_format, input_mat_key, manual_normalize, normalize_min, normalize_max, wavelength_from, wavelength_to],