oafuncs 0.0.98.29__py3-none-any.whl → 0.0.98.30__py3-none-any.whl

oafuncs/_script/plot_dataset.py

@@ -13,6 +13,28 @@ import oafuncs
 import xarray as xr
 from rich import print
 
+def get_data_name(data: xr.DataArray) -> str:
+    """Attempt to get a descriptive name for the DataArray."""
+    possible_names = [
+        "long_name",
+        "standard_name",
+        "description",
+        "title",
+        "var_desc",
+        # "units", # Usually not a name, but can be a fallback if desperate
+    ]
+    
+    name_attr = getattr(data, "name", None) # xarray's own name for the DataArray
+
+    for attr in possible_names:
+        outname = getattr(data, attr, None)
+        if outname is not None and isinstance(outname, str) and outname.strip():
+            return outname.strip()
+    
+    if name_attr is not None and isinstance(name_attr, str) and name_attr.strip():
+        return name_attr.strip()
+        
+    return "Unnamed DataArray"
 
 def plot_1d(data: xr.DataArray, output_path: str, x_dim: str, y_dim: str, z_dim: str, t_dim: str) -> None:
     """Plot 1D data."""
@@ -32,9 +54,8 @@ def plot_1d(data: xr.DataArray, output_path: str, x_dim: str, y_dim: str, z_dim:
     plt.plot(x, y, linewidth=2)
 
     # Add chart info
-    long_name = getattr(data, "long_name", "No long_name")
     units = getattr(data, "units", "")
-    plt.title(f"{data.name} | {long_name}", fontsize=12)
+    plt.title(f"{data.name} | {get_data_name(data)}", fontsize=12)
     plt.xlabel(x_label)
     plt.ylabel(f"{data.name} ({units})" if units else data.name)
 
@@ -126,14 +147,14 @@ def plot_2d(data: xr.DataArray, output_path: str, data_range: Optional[Tuple[flo
             plt.figure(figsize=(10, 8))
             mappable = ax.imshow(data.values, cmap="viridis", aspect="auto")
             colorbar = plt.colorbar(mappable, ax=ax, label=getattr(data, "units", ""))
-            plt.title(f"{data.name} | {getattr(data, 'long_name', 'No long_name')} (basic plot)", fontsize=12)
+            plt.title(f"{data.name} | {get_data_name(data)} (basic plot)", fontsize=12)
             plt.tight_layout()
             os.makedirs(os.path.dirname(output_path), exist_ok=True)
             plt.savefig(output_path, bbox_inches="tight", dpi=600)
             plt.close()
             return True
 
-    plt.title(f"{data.name} | {getattr(data, 'long_name', 'No long_name')}", fontsize=12)
+    plt.title(f"{data.name} | {get_data_name(data)}", fontsize=12)
     units = getattr(data, "units", "")
     if units and colorbar:
         colorbar.set_label(units)

oafuncs/oa_cmap.py

@@ -13,62 +13,86 @@ def show(
 ) -> None:
     """Helper function to plot data with associated colormap.
 
-    This function creates a visualization of one or more colormaps by applying them
-    to randomly generated data in a pcolormesh plot.
+    此函数为每个颜色映射创建一行两个子图：
+    1. 左侧: 使用 pcolormesh 绘制随机数据
+    2. 右侧: 使用 contourf 绘制双高斯山峰数据以展示发散色图
+    颜色条只在右侧的 contourf 图旁边显示。
 
     Parameters
     ----------
     colormaps : Union[str, mpl.colors.Colormap, List[Union[str, mpl.colors.Colormap]]]
-        List of colormaps, or a single colormap; can be a string name or a colormap object.
-
-    Returns
-    -------
-    None
-        This function displays the plot but does not return any value.
-
-    Examples
-    --------
-    >>> cmap = matplotlib.colors.ListedColormap(["darkorange", "gold", "lawngreen", "lightseagreen"])
-    >>> show([cmap])
-    >>> show("viridis")
-    >>> show(["viridis", "cividis"])
+        单个颜色映射或颜色映射列表；可以是名称字符串或颜色映射对象。
     """
-    # Convert single colormap to list for uniform processing
     if not isinstance(colormaps, list):
         colormaps = [colormaps]
 
-    # Create a formatted list of colormap names for display
-    cmap_names = []
-    for cmap in colormaps:
-        if isinstance(cmap, str):
-            cmap_names.append(cmap)
-        elif hasattr(cmap, "name"):
-            cmap_names.append(cmap.name)
-        else:
-            cmap_names.append("unnamed_colormap")
+    if not colormaps:
+        print("警告: 没有提供颜色映射")
+        return
 
-    print(f"Visualizing {len(colormaps)} colormap(s): {', '.join(cmap_names)}")
+    valid_colormaps = []
+    for i, cmap_item in enumerate(colormaps):
+        try:
+            if isinstance(cmap_item, str):
+                cmap_obj = plt.get_cmap(cmap_item)
+            else:
+                cmap_obj = cmap_item
+            if hasattr(cmap_obj, "__call__") or hasattr(cmap_obj, "colors"):
+                valid_colormaps.append((cmap_item, cmap_obj))
+            else:
+                print(f"警告: 跳过无效的颜色映射 #{i + 1}")
+        except Exception as e:
+            print(f"警告: 无法加载颜色映射 '{cmap_item}': {str(e)}")
+
+    num_cmaps = len(valid_colormaps)
+    if num_cmaps == 0:
+        print("错误: 没有有效的颜色映射可供显示")
+        return
+
+    base_height_per_cmap = 5
+    figure_width = 12
+    figsize = (figure_width, num_cmaps * base_height_per_cmap)
+    fig, axs = plt.subplots(num_cmaps, 2, figsize=figsize)
+
+    if num_cmaps == 1:
+        axs = np.array([axs])
 
-    # Generate random data with fixed seed for reproducibility
     np.random.seed(19680801)
-    data = np.random.randn(30, 30)
+    pcolor_data = np.random.randn(30, 30)
+
+    ngridx = 100
+    ngridy = 100
+    xi = np.linspace(-2.1, 2.1, ngridx)
+    yi = np.linspace(-2.1, 2.1, ngridy)
+    Xi, Yi = np.meshgrid(xi, yi)
+
+    sigma = 0.6
+    zi = np.exp(-((Xi - 0.8) ** 2 + (Yi - 0.8) ** 2) / (2 * sigma**2)) - np.exp(-((Xi + 0.8) ** 2 + (Yi + 0.8) ** 2) / (2 * sigma**2))
+
+    levels = 14
+    contour_kw = {"levels": levels, "linewidths": 0.5, "colors": "k"}
+    contourf_kw = {"levels": levels}
+
+    for i, (cmap_item, cmap_obj) in enumerate(valid_colormaps):
+        cmap_name = cmap_item if isinstance(cmap_item, str) else getattr(cmap_obj, "name", f"自定义_{i + 1}")
+
+        ax_left = axs[i, 0]
+        ax_left.pcolormesh(pcolor_data, cmap=cmap_obj, rasterized=True, vmin=-4, vmax=4)
+        ax_left.set_title(f"Pcolormesh: {cmap_name}")
+        ax_left.set_aspect("equal")
 
-    # Create subplots based on number of colormaps
-    n = len(colormaps)
-    fig, axs = plt.subplots(1, n, figsize=(n * 2 + 2, 3), constrained_layout=True, squeeze=False)
+        ax_right = axs[i, 1]
+        ax_right.contour(Xi, Yi, zi, **contour_kw)
+        cntr = ax_right.contourf(Xi, Yi, zi, cmap=cmap_obj, **contourf_kw)
 
-    # Plot each colormap
-    for ax, cmap in zip(axs.flat, colormaps):
-        psm = ax.pcolormesh(data, cmap=cmap, rasterized=True, vmin=-4, vmax=4)
-        fig.colorbar(psm, ax=ax)
+        cbar = fig.colorbar(cntr, ax=ax_right)
+        cbar.set_label(f"Colormap: {cmap_name}")
 
-        # Set title if colormap has a name
-        if isinstance(cmap, str):
-            ax.set_title(cmap)
-        elif hasattr(cmap, "name") and cmap.name:
-            ax.set_title(cmap.name)
+        ax_right.set(xlim=(-2, 2), ylim=(-2, 2))
+        ax_right.set_title(f"Contourf: {cmap_name}")
+        ax_right.set_aspect("equal")
 
-    print("Displaying colormap visualization...")
+    plt.tight_layout(pad=0.5, w_pad=0.5, h_pad=1.0)
     plt.show()
 
 

{oafuncs-0.0.98.29.dist-info → oafuncs-0.0.98.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.29
+Version: 0.0.98.30
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.29.dist-info → oafuncs-0.0.98.30.dist-info}/RECORD

@@ -1,5 +1,5 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
-oafuncs/oa_cmap.py,sha256=pUFAGzbIg0WLxObBP2t_--ZIg00Dxdojx0y7OjTeqEo,11551
+oafuncs/oa_cmap.py,sha256=cBPVr61SD5HD1SqmE_bFqdO29DGmJ8jgjCrUXI24Ys4,12545
 oafuncs/oa_data.py,sha256=Wp7Yn6n-WNddAp1UtwK5CSEdGSrzzgOH5gtaOHBaxtw,8065
 oafuncs/oa_date.py,sha256=WhM6cyD4G3IeghjLTHhAMtlvJbA7kwQG2sHnxdTgyso,6303
 oafuncs/oa_draw.py,sha256=IaBGDx-EOxyMM2IuJ4zLZt6ruHHV5qFStPItmUOXoWk,17635
@@ -18,7 +18,7 @@ oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDP
 oafuncs/_script/netcdf_write.py,sha256=GvyUyUhzMonzSp3y4pT8ZAfbQrsh5J3dLnmINYJKhuE,21422
 oafuncs/_script/parallel.py,sha256=07-BJVHxXJNlrOrhrSGt7qCZiKWq6dBvNDBA1AANYnI,8861
 oafuncs/_script/parallel_test.py,sha256=0GBqZOX7IaCOKF2t1y8N8YYu53GJ33OkfsWgpvZNqM4,372
-oafuncs/_script/plot_dataset.py,sha256=Hr4X0BHJ1qmf2YHT40Vu3nF8JS_4MlZ2MK6yeJCSHOg,15642
+oafuncs/_script/plot_dataset.py,sha256=4jhUZNIc2DLHnk5GH0rotzhOq0cAMmB7rhMJKorYObo,16329
 oafuncs/_script/replace_file_content.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJRfgXd6DdCjk,5982
 oafuncs/oa_down/User_Agent-list.txt,sha256=pHaMlElMvZ8TG4vf4BqkZYKqe0JIGkr4kCN0lM1Y9FQ,514295
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
@@ -38,8 +38,8 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=8091SHo2L8kl4dCFmmSH5NGVHDku5i5lSiLEG5DLnOQ,6489
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs-0.0.98.29.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.29.dist-info/METADATA,sha256=V1EJ9J4TUr06OWk13eB8mqLDKwAbCYudtBx4U7HrlIE,4326
-oafuncs-0.0.98.29.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-oafuncs-0.0.98.29.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.29.dist-info/RECORD,,
+oafuncs-0.0.98.30.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.30.dist-info/METADATA,sha256=NRBInCPeawjfSNZhTLkAaM_xK4sce_dFOllXpbdRFdQ,4326
+oafuncs-0.0.98.30.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+oafuncs-0.0.98.30.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.30.dist-info/RECORD,,