rsplotlib 0.1.9__tar.gz → 0.2.6__tar.gz

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main, master]
+    branches: [main]
   pull_request:
-    branches: [main, master]
+    branches: [main]
 
 # 同一分支/PR 的新推送会取消仍在进行的旧运行，节省 CI 时间。
 concurrency:

rsplotlib-0.2.6/.github/workflows/rust.yml

@@ -0,0 +1,61 @@
+name: Rust Checks
+
+# dev 分支的快速 Rust 静态检查（fmt + clippy）。
+# 完整的 maturin 构建 / wheel / 冒烟测试由 main 分支的 ci.yml 负责。
+on:
+  push:
+    branches: [dev]
+  pull_request:
+    branches: [dev]
+
+# 同一分支/PR 的新推送会取消仍在进行的旧运行，节省 CI 时间。
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+
+jobs:
+  checks:
+    name: fmt + clippy (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      # 三大平台都跑 clippy：src/lib.rs 中的字体注册逻辑按
+      # #[cfg(target_os = "macos" / "linux" / "windows")] 分支实现，
+      # 只有在对应平台上 clippy 才会真正检查到这些代码。
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # pyo3 的 build script 需要一个 Python 解释器来探测 ABI / 版本，
+      # 否则 cargo clippy / check 无法编译（找不到 Python 配置）。
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy, rustfmt
+
+      # 按操作系统自动隔离缓存，rust-cache 默认已区分 runner OS。
+      - uses: Swatinem/rust-cache@v2
+
+      # 格式检查与平台无关，只需在一个平台上跑一次。
+      - name: Check formatting
+        if: matrix.os == 'ubuntu-latest'
+        run: cargo fmt --all -- --check
+
+      # clippy 走 cargo check 模式（不做最终链接），因此无需 extension-module，
+      # 也不会去链接 libpython。不加 --target：直接用各 runner 的原生架构
+      # （修复原先在 arm64 的 macos-latest 上交叉编译 x86_64-apple-darwin 的问题）。
+      - name: Run clippy
+        run: cargo clippy --all-targets -- -D warnings

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/Cargo.lock

@@ -81,6 +81,37 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
+
+[[package]]
+name = "either"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -149,6 +180,9 @@ name = "jpeg-decoder"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
+dependencies = [
+ "rayon",
+]
 
 [[package]]
 name = "jpeg-encoder"
@@ -361,10 +395,31 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rsplotlib"
-version = "0.1.9"
+version = "0.2.6"
 dependencies = [
+ "jpeg-decoder",
  "jpeg-encoder",
  "owned_ttf_parser",
  "plotters",
@@ -374,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "simd-adler32"

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsplotlib"
-version = "0.1.9"
+version = "0.2.6"
 edition = "2024"
 readme = "README.md"
 
@@ -12,8 +12,9 @@ crate-type = ["cdylib"]
 pyo3 = "0.29.0"
 plotters = { version = "0.3.7", default-features = false, features = ["svg_backend", "bitmap_backend", "bitmap_encoder", "ab_glyph", "line_series", "point_series"] }
 png = "0.18.1"
-owned_ttf_parser = "0.25"
+owned_ttf_parser = "0.25.1"
 jpeg-encoder = "0.7.0"
+jpeg-decoder = "0.3.2"
 
 [profile.release]
 lto = "fat"

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rsplotlib
-Version: 0.1.9
+Version: 0.2.6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 > 一个由 Rust 强力驱动的高性能 Python 绘图库，提供 Matplotlib 兼容 API
 
 [![Python](https://img.shields.io/badge/Python-3.10%2B-blue)](https://www.python.org/)
-[![Rust](https://img.shields.io/badge/Rust-2021-orange)](https://www.rust-lang.org/)
+[![Rust](https://img.shields.io/badge/Rust-2024-orange)](https://www.rust-lang.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![PyO3](https://img.shields.io/badge/PyO3-0.29-2c2d72)](https://pyo3.rs/)
 [![plotters](https://img.shields.io/badge/plotters-0.3-7d5cff)](https://github.com/plotters-rs/plotters)

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/README.md

@@ -3,7 +3,7 @@
 > A high-performance Python plotting library powered by Rust, with a Matplotlib-compatible API
 
 [![Python](https://img.shields.io/badge/Python-3.10%2B-blue)](https://www.python.org/)
-[![Rust](https://img.shields.io/badge/Rust-2021-orange)](https://www.rust-lang.org/)
+[![Rust](https://img.shields.io/badge/Rust-2024-orange)](https://www.rust-lang.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![PyO3](https://img.shields.io/badge/PyO3-0.29-2c2d72)](https://pyo3.rs/)
 [![plotters](https://img.shields.io/badge/plotters-0.3-7d5cff)](https://github.com/plotters-rs/plotters)
@@ -503,22 +503,25 @@ ax.axline(xy1, xy2, color=None, linestyle=None, linewidth=None)
 Add arrowed text annotations.
 
 ```python
-ax.annotate(text, xy, xytext=None, fontsize=12.0, color='black',
-            arrowprops=None, arrowstyle=None, arrowsize=1.0)
+ax.annotate(text, xy, xytext=None, fontsize=12.0, color='black', arrowprops=None)
 ```
 
 **Parameters:**
 
 - `text` (str): Annotation text
 - `xy` (tuple): Coordinates of the point being annotated `(x, y)`
-- `xytext` (tuple, optional): Position to place the text. If provided, an arrow is automatically drawn from this position to `xy`
+- `xytext` (tuple, optional): Position to place the text. Defaults to `xy`
 - `fontsize` (float): Font size, default 12.0
-- `color` (str): Text and arrow color, default `'black'`
-- `arrowprops` (dict, optional): Arrow properties dictionary. Supports:
-  - `arrowstyle`: Arrow style (e.g., `'->'`, `'-|>'`)
-  - `arrowsize`: Arrow relative size
-- `arrowstyle` (str, optional): Arrow style independent of `arrowprops`
-- `arrowsize` (float, optional): Arrow size independent of `arrowprops`
+- `color` (str): Text color, default `'black'`
+- `arrowprops` (dict, optional): Arrow properties dictionary. `None` (default)
+  draws no arrow; when provided (even an empty dict) an arrow is drawn from the
+  text-box edge to `xy`. Two modes, matching matplotlib:
+  - **Simple** (no `arrowstyle` key): `width`, `headwidth`, `headlength` (points)
+    and `shrink` (fraction) produce a filled arrow.
+  - **Fancy** (`arrowstyle` given): `arrowstyle` (`'-'`, `'->'`, `'<-'`, `'<->'`,
+    `'-|>'`, `'<|-'`, `'<|-|>'`, `'simple'`, `'fancy'`, `'wedge'`),
+    `mutation_scale` (head size, defaults to font size), `shrinkA` / `shrinkB`
+    (points), `linewidth` / `lw`, `color` / `ec`, `facecolor` / `fc`, `alpha`.
 
 ### hlines / vlines (Rust-level batch implementation)
 

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/README_zh.md

@@ -3,7 +3,7 @@
 > 一个由 Rust 强力驱动的高性能 Python 绘图库，提供 Matplotlib 兼容 API
 
 [![Python](https://img.shields.io/badge/Python-3.10%2B-blue)](https://www.python.org/)
-[![Rust](https://img.shields.io/badge/Rust-2021-orange)](https://www.rust-lang.org/)
+[![Rust](https://img.shields.io/badge/Rust-2024-orange)](https://www.rust-lang.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![PyO3](https://img.shields.io/badge/PyO3-0.29-2c2d72)](https://pyo3.rs/)
 [![plotters](https://img.shields.io/badge/plotters-0.3-7d5cff)](https://github.com/plotters-rs/plotters)

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/build_wheel.sh

@@ -31,6 +31,23 @@ if ! command -v cargo >/dev/null 2>&1; then
   exit 1
 fi
 
+# ========== 依据 rust-toolchain.toml 准备工具链与 clippy 组件 ==========
+# 项目用 rust-toolchain.toml 固定了 Rust channel；rustup 会自动据此选择工具链，
+# 但构建前的 clippy 检查依赖 clippy 组件，全新环境未必已安装，这里显式补齐。
+if [[ -f rust-toolchain.toml ]]; then
+  RUST_CHANNEL=$(grep -m1 '^channel *= *' rust-toolchain.toml | sed -E 's/.*"([^"]+)".*/\1/')
+  if [[ -n "${RUST_CHANNEL:-}" ]]; then
+    echo "Pinned Rust toolchain (rust-toolchain.toml): $RUST_CHANNEL"
+    if command -v rustup >/dev/null 2>&1; then
+      # 幂等：已安装则为空操作；离线且缺失时失败被忽略，交由后续 clippy 步骤明确报错。
+      rustup toolchain install "$RUST_CHANNEL" >/dev/null 2>&1 || true
+      rustup component add clippy --toolchain "$RUST_CHANNEL" >/dev/null 2>&1 || true
+    else
+      echo "  -> rustup not found; using the cargo/clippy already on PATH." >&2
+    fi
+  fi
+fi
+
 RELEASE=true
 OUT_DIR="wheelhouse"
 
@@ -86,6 +103,22 @@ else
   exit 1
 fi
 
+# ========== 构建前的 Fmt 静态检查（-check：任何错误都当作错误） ==========
+echo "Running fmt checks (cargo fmt --all -- --check) ..."
+if ! cargo fmt --all -- --check; then
+  echo "Error: fmt checks failed. Fix the warnings above before building." >&2
+  exit 1
+fi
+echo "  -> fmt checks passed."
+
+# ========== 构建前的 Clippy 静态检查（-D warnings：任何告警都当作错误） ==========
+echo "Running clippy checks (cargo clippy --all-targets -- -D warnings) ..."
+if ! cargo clippy --all-targets -- -D warnings; then
+  echo "Error: clippy checks failed. Fix the warnings above before building." >&2
+  exit 1
+fi
+echo "  -> clippy checks passed."
+
 BUILD_ARGS=()
 if $RELEASE; then BUILD_ARGS+=(--release); else BUILD_ARGS+=(--debug); fi
 

rsplotlib-0.2.6/ci/smoke_test.py

@@ -0,0 +1,17 @@
+import rsplotlib.pyplot as plt
+
+fig, ax = plt.subplots()
+
+ax.plot([1, 2, 3], label=r'$\sqrt{x^2}$')
+ax.legend()
+ax.plot([0, 2, 3], label=r'$\sqrt{x^2}$')
+ax.set_xlabel(r'$\Delta_i^j$', fontsize=20)
+ax.set_ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
+ax.set_title(r'$\Delta_i^j \hspace{0.4} \mathrm{versus} \hspace{0.4} '
+             r'\Delta_{i+1}^j$', fontsize=20)
+
+tex = r'$\mathcal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\sin(2 \pi f x_i)$'
+ax.text(1, 1.6, tex, fontsize=20, va='bottom')
+ax.text(0.5, 2, r'$\sqrt{x^2}$', fontsize=20, va='bottom')
+fig.tight_layout()
+plt.savefig("ci/test_barh.png")

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "rsplotlib"
-version = "0.1.9"
+version = "0.2.6"
 description = "A high-performance matplotlib-compatible plotting library powered by Rust"
 readme = "README_zh.md"
 license = { text = "MIT" }
@@ -29,7 +29,6 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Visualization",
 ]
 keywords = ["plotting", "matplotlib", "visualization", "rust", "scientific"]
-dependencies = []
 
 [tool.maturin]
 python-source = "python"

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/python/rsplotlib/__init__.py

@@ -13,7 +13,7 @@ MaxNLocator = ticker.MaxNLocator
 MultipleLocator = ticker.MultipleLocator
 AutoMinorLocator = ticker.AutoMinorLocator
 
-__version__ = "0.1.9"
+__version__ = "0.2.6"
 # 从内部 Rust 模块导出字体注册函数
 
 __all__ = list(_api_all) + [

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/python/rsplotlib/_font_resolver.py

@@ -164,4 +164,4 @@ def apply_rcparams_font() -> Optional[str]:
                 return path
             except Exception:
                 continue
-    return None
+    return None

rsplotlib-0.2.6/python/rsplotlib/colors.py

@@ -0,0 +1,147 @@
+"""rsplotlib.colors - Matplotlib colors 兼容接口 (子集)。
+
+提供归一化类 Normalize / LogNorm，用于将数据映射到 [0, 1] 供 colormap 上色。
+当前 imshow/pcolormesh 等接受 norm 参数，Normalize/LogNorm 在此处提供兼容 API。
+"""
+
+import math
+
+
+class Normalize:
+    """将数据线性归一化到 [0, 1]，兼容 matplotlib.colors.Normalize。
+
+    Args:
+        vmin, vmax: 归一化值域端点，缺省时在首次调用时按数据自动推断。
+        clip: 是否将越界值裁剪到 [0, 1]。
+    """
+
+    # 归一化类型标记：供 pyplot 把归一化方式（线性/对数）下沉给 Rust 上色与颜色条。
+    _norm_kind = 'linear'
+
+    def __init__(self, vmin=None, vmax=None, clip=False):
+        self.vmin = vmin
+        self.vmax = vmax
+        self.clip = clip
+
+    def autoscale_None(self, values):
+        """当 vmin/vmax 未设置时，根据数据填充。"""
+        seq = _flatten(values)
+        if seq:
+            if self.vmin is None:
+                self.vmin = min(seq)
+            if self.vmax is None:
+                self.vmax = max(seq)
+
+    def _normalize_scalar(self, value):
+        vmin = 0.0 if self.vmin is None else float(self.vmin)
+        vmax = 1.0 if self.vmax is None else float(self.vmax)
+        if vmax == vmin:
+            return 0.0
+        t = (float(value) - vmin) / (vmax - vmin)
+        if self.clip:
+            t = max(0.0, min(1.0, t))
+        return t
+
+    def __call__(self, value, clip=None):
+        if clip is not None:
+            saved = self.clip
+            self.clip = clip
+            try:
+                return self._apply(value)
+            finally:
+                self.clip = saved
+        return self._apply(value)
+
+    def _apply(self, value):
+        if not _is_sequence(value):
+            return self._normalize_scalar(value)
+        # 循环不变量外提：vmin/vmax 的 float 转换与除数只算一次，再逐元素映射。
+        seq = _flatten(value)
+        vmin = 0.0 if self.vmin is None else float(self.vmin)
+        vmax = 1.0 if self.vmax is None else float(self.vmax)
+        if vmax == vmin:
+            return [0.0] * len(seq)
+        inv = 1.0 / (vmax - vmin)
+        if self.clip:
+            return [max(0.0, min(1.0, (v - vmin) * inv)) for v in seq]
+        return [(v - vmin) * inv for v in seq]
+
+    def __repr__(self):
+        return f'Normalize(vmin={self.vmin}, vmax={self.vmax})'
+
+
+class LogNorm(Normalize):
+    """对数归一化，兼容 matplotlib.colors.LogNorm。
+
+    将数据按对数刻度映射到 [0, 1]；非正值被视为越界。
+    """
+
+    _norm_kind = 'log'
+
+    def autoscale_None(self, values):
+        """当 vmin/vmax 未设置时，用数据的最小正值 / 最大值填充（对数刻度要求正值）。"""
+        seq = [v for v in _flatten(values) if v > 0]
+        if seq:
+            if self.vmin is None:
+                self.vmin = min(seq)
+            if self.vmax is None:
+                self.vmax = max(seq)
+
+    def _normalize_scalar(self, value):
+        vmin = self.vmin
+        vmax = self.vmax
+        if vmin is None or vmax is None or vmin <= 0 or vmax <= 0:
+            return 0.0
+        v = float(value)
+        if v <= 0:
+            return 0.0
+        t = (math.log(v) - math.log(vmin)) / (math.log(vmax) - math.log(vmin))
+        if self.clip:
+            t = max(0.0, min(1.0, t))
+        return t
+
+    def _apply(self, value):
+        if not _is_sequence(value):
+            return self._normalize_scalar(value)
+        # 循环不变量外提：log(vmin) 与对数跨度只算一次，避免逐元素重复求 log。
+        seq = _flatten(value)
+        vmin = self.vmin
+        vmax = self.vmax
+        if vmin is None or vmax is None or vmin <= 0 or vmax <= 0:
+            return [0.0] * len(seq)
+        log_vmin = math.log(vmin)
+        span = math.log(vmax) - log_vmin
+        if span == 0.0:
+            return [0.0] * len(seq)
+        inv = 1.0 / span
+        if self.clip:
+            return [max(0.0, min(1.0, (math.log(v) - log_vmin) * inv)) if v > 0 else 0.0
+                    for v in seq]
+        return [(math.log(v) - log_vmin) * inv if v > 0 else 0.0 for v in seq]
+
+    def __repr__(self):
+        return f'LogNorm(vmin={self.vmin}, vmax={self.vmax})'
+
+
+def _is_sequence(obj):
+    if obj is None or isinstance(obj, str):
+        return False
+    return hasattr(obj, 'tolist') or hasattr(obj, '__iter__')
+
+
+def _flatten(values):
+    """递归展开嵌套序列 / rsnumpy 数组为一维浮点列表。"""
+    if values is None:
+        return []
+    if hasattr(values, 'tolist'):
+        values = values.tolist()
+    out = []
+    if isinstance(values, (list, tuple)):
+        for item in values:
+            if isinstance(item, (list, tuple)):
+                out.extend(_flatten(item))
+            else:
+                out.append(float(item))
+    else:
+        out.append(float(values))
+    return out

{rsplotlib-0.1.9 → rsplotlib-0.2.6}/python/rsplotlib/core/api.py

@@ -65,8 +65,9 @@ def plot(x, y, label=None, color=None, linestyle=None, marker=None, linewidth=No
         linestyle = ls
     return _rsplotlib.plot(
         _to_list(x), _to_list(y),
-        label, color, linestyle, marker, linewidth,
-        lw, c, ls, markersize, markeredgewidth, solid_capstyle,
+        label=label, color=color, linestyle=linestyle, marker=marker,
+        linewidth=linewidth, lw=lw, c=c, ls=ls, markersize=markersize,
+        markeredgewidth=markeredgewidth, solid_capstyle=solid_capstyle,
     )
 
 
@@ -115,18 +116,45 @@ def barh(y, width, height=0.8, color=None, label=None):
     return _rsplotlib.barh(_to_list(y), _to_list(width), height, color, label)
 
 
-def hist(x, bins=10, density=False, label=None, alpha=0.7, color=None):
+def hist(x, bins=10, range=None, density=False, weights=None,
+         cumulative=False, bottom=None, histtype='bar', align='mid',
+         orientation='vertical', rwidth=None, log=False, color=None,
+         facecolor=None, label=None, stacked=False, alpha=1.0):
     """绘制直方图
 
     Args:
-        x: 数据
-        bins: 区间数 (默认: 10)
-        density: 是否归一化 (默认: False)
-        label: 图例标签 (默认: None)
-        alpha: 透明度 (默认: 0.7)
-        color: 颜色 (默认: None)
-    """
-    return _rsplotlib.hist(_to_list_recursive(x), bins, density, label, alpha, color)
+        x: 数据 (一维数组, 或多组数据组成的列表)
+        bins: 分箱数量 (默认 10) 或箱边界列表
+        range: 值域范围 (lo, hi)
+        density: 是否归一化为概率密度 (默认 False)
+        weights: 每个数据点的权重
+        cumulative: 是否绘制累积分布 (True/False/-1)
+        bottom: 每个柱子的起始基线
+        histtype: 'bar' | 'barstacked' | 'step' | 'stepfilled'
+        align: 'left' | 'mid' | 'right'
+        orientation: 'vertical' | 'horizontal'
+        rwidth: 柱子相对分箱宽度比例 (0~1)
+        log: 计数轴是否对数刻度
+        color / facecolor: 颜色或颜色列表
+        label: 图例标签
+        stacked: 是否堆叠
+        alpha: 透明度 (默认 1.0)
+    """
+    if cumulative is True:
+        cum = 1
+    elif cumulative is False or cumulative is None:
+        cum = 0
+    else:
+        cum = int(cumulative)
+    weights_arg = _to_list_recursive(weights) if weights is not None else None
+    range_arg = tuple(range) if range is not None else None
+    return _rsplotlib.hist(
+        _to_list_recursive(x), bins=bins, range=range_arg, density=density,
+        weights=weights_arg, cumulative=cum, bottom=bottom, histtype=histtype,
+        align=align, orientation=orientation, rwidth=rwidth, log=log,
+        color=color, facecolor=facecolor, label=label, stacked=stacked,
+        alpha=alpha,
+    )
 
 
 def pie(x, labels=None, colors=None, autopct=False):
@@ -217,15 +245,20 @@ def step(x, y, where_='pre', label=None, color=None, linestyle='-', linewidth=1.
     return _rsplotlib.step(_to_list(x), _to_list(y), where_, label, color, linestyle, linewidth)
 
 
-def imshow(x, cmap='gray', aspect='auto'):
+def imshow(x, cmap='gray', aspect='auto', vmin=None, vmax=None,
+           alpha=None, origin=None):
     """显示图像
 
     Args:
-        x: 2D 数据数组
-        cmap: 色图 (默认: 'gray', 可选: 'hot', 'cool')
+        x: 2D 标量数组 (经 cmap 上色) 或 3D RGB(A) 数组 (H, W, 3/4)
+        cmap: 色图 (默认: 'gray', 可选: 'hot', 'cool')，仅对 2D 数据生效
         aspect: 纵横比 (默认: 'auto', 可选: 'equal')
+        vmin, vmax: 2D 数据的颜色映射值域 (缺省取数据 min/max)
+        alpha: 图像整体透明度 (0.0-1.0)
+        origin: 'upper' (默认) 或 'lower'
     """
-    return _rsplotlib.imshow(_to_list_recursive(x), cmap, aspect)
+    return _rsplotlib.imshow(_to_list_recursive(x), cmap, aspect,
+                             vmin, vmax, alpha, origin)
 
 
 def violinplot(dataset, positions=None, widths=0.5, showmeans=False, showmedians=True):