qubitclient 0.1.4__py3-none-any.whl

qubitclient/__init__.py

@@ -0,0 +1,5 @@
+from .nnscope.nnscope_api.curve.curve_type import CurveType  # noqa: F401
+from .scope.scope import QubitScopeClient
+from .nnscope.nnscope import QubitNNScopeClient
+from .scope.task import TaskName
+from .nnscope.task import NNTaskName

qubitclient/draw/optpipulsepltplotter.py

@@ -0,0 +1,75 @@
+from .pltplotter import QuantumDataPltPlotter
+import matplotlib.pyplot as plt
+import numpy as np
+
+
+class OptPiPulseDataPltPlotter(QuantumDataPltPlotter):
+    def __init__(self):
+        super().__init__("optpipulse")
+
+    def plot_result_npy(self, **kwargs):
+        result     = kwargs.get('result')
+        dict_param = kwargs.get('dict_param')      
+
+        if not result or not dict_param:
+            fig, ax = plt.subplots()
+            ax.text(0.5, 0.5, "No data", ha='center', transform=ax.transAxes)
+            plt.close(fig)
+            return fig
+
+        data = dict_param.item() if isinstance(dict_param, np.ndarray) else dict_param
+        image_dict = data.get("image", {})
+        qubit_names = list(image_dict.keys())
+        if not qubit_names:
+            fig, ax = plt.subplots()
+            ax.text(0.5, 0.5, "No qubits", ha='center', transform=ax.transAxes)
+            plt.close(fig)
+            return fig
+
+        cols = min(3, len(qubit_names))
+        rows = (len(qubit_names) + cols - 1) // cols
+
+        fig = plt.figure(figsize=(5.8 * cols, 4.5 * rows))
+        fig.suptitle("Opt-Pi-Pulse", fontsize=14, y=0.96)
+
+        wave_colors = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728',
+                       '#9467bd', '#8c564b', '#e377c2', '#7f7f7f']
+
+        params_list = result.get("params", [])
+        confs_list  = result.get("confs", [])
+
+        for q_idx, q_name in enumerate(qubit_names):
+            ax = fig.add_subplot(rows, cols, q_idx + 1)
+            item = image_dict[q_name]
+            if not isinstance(item, (list, tuple)) or len(item) < 2:
+                continue
+
+            waveforms = np.asarray(item[0])
+            x_axis    = np.asarray(item[1])
+
+            for w_idx, wave in enumerate(waveforms):
+                ax.plot(x_axis, wave,
+                        color=wave_colors[w_idx % len(wave_colors)],
+                        linewidth=1.2)
+
+            if q_idx < len(params_list):
+                peaks = params_list[q_idx]
+                confs = confs_list[q_idx] if q_idx < len(confs_list) else []
+                for p_idx, (peak, conf) in enumerate(zip(peaks, confs)):
+                    ax.axvline(peak, color='red', linestyle='--', linewidth=1.8)
+                    ax.annotate(f"x={peak:.4f}\nconf:{conf:.3f}",
+                                (peak, ax.get_ylim()[1]),
+                                xytext=(0, 8), textcoords='offset points',
+                                ha='center', va='bottom',
+                                fontsize=8, color='red',
+                                bbox=dict(boxstyle="round,pad=0.3", facecolor="yellow", alpha=0.8))
+
+            ax.set_title(q_name, fontsize=11, pad=10)
+            ax.set_xlabel("Time")
+            ax.set_ylabel("Amp")
+            ax.grid(True, linestyle='--', alpha=0.5)
+            ax.legend(['wave', 'peak'], fontsize=8, loc='upper right', framealpha=0.9)
+
+        plt.tight_layout(rect=[0, 0, 1, 0.94])
+        plt.close(fig)
+        return fig

qubitclient/draw/optpipulseplyplotter.py

@@ -0,0 +1,114 @@
+from .plyplotter import QuantumDataPlyPlotter
+import plotly.graph_objects as go
+from plotly.subplots import make_subplots
+import numpy as np
+
+
+class OptPiPulseDataPlyPlotter(QuantumDataPlyPlotter):
+    def __init__(self):
+        super().__init__("optpipulse")
+
+    def plot_result_npy(self, **kwargs):
+        result     = kwargs.get('result')
+        dict_param = kwargs.get('dict_param')
+
+        if not result or not dict_param:
+            fig = go.Figure()
+            fig.add_annotation(text="Missing data", xref="paper", yref="paper", x=0.5, y=0.5, showarrow=False)
+            return fig
+
+        data = dict_param.item() if isinstance(dict_param, np.ndarray) else dict_param
+        image_dict = data.get("image", {})
+        if not image_dict:
+            fig = go.Figure()
+            fig.add_annotation(text="No image data", xref="paper", yref="paper", x=0.5, y=0.5, showarrow=False)
+            return fig
+
+        qubit_names = list(image_dict.keys())
+        cols = min(3, len(qubit_names))
+        rows = (len(qubit_names) + cols - 1) // cols
+
+        fig = make_subplots(
+            rows=rows, cols=cols,
+            subplot_titles=qubit_names,
+            vertical_spacing=0.08,
+            horizontal_spacing=0.08,
+        )
+
+        wave_colors = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728',
+                       '#9467bd', '#8c564b', '#e377c2', '#7f7f7f']
+
+        params_list = result.get("params", [])
+        confs_list  = result.get("confs", [])
+
+        wave_legend_shown = False
+        peak_legend_shown = False
+
+        for q_idx, q_name in enumerate(qubit_names):
+            row = q_idx // cols + 1
+            col = q_idx % cols + 1
+
+            item = image_dict[q_name]
+            if not isinstance(item, (list, tuple)) or len(item) < 2:
+                continue
+
+            waveforms = np.asarray(item[0])
+            x_axis    = np.asarray(item[1])
+
+            for w_idx, wave in enumerate(waveforms):
+                fig.add_trace(
+                    go.Scatter(x=x_axis, y=wave,
+                               mode='lines',
+                               line=dict(color=wave_colors[w_idx % len(wave_colors)]),
+                               name='wave',
+                               legendgroup='wave',
+                               showlegend=not wave_legend_shown),
+                    row=row, col=col
+                )
+                if not wave_legend_shown:
+                    wave_legend_shown = True
+
+            if q_idx < len(params_list):
+                peaks = params_list[q_idx]
+                confs = confs_list[q_idx] if q_idx < len(confs_list) else []
+                for p_idx, (peak, conf) in enumerate(zip(peaks, confs)):
+                    show_peak_legend = (not peak_legend_shown) and (p_idx == 0)
+
+                    fig.add_trace(
+                        go.Scatter(x=[peak, peak],
+                                   y=[waveforms.min(), waveforms.max()],
+                                   mode='lines',
+                                   line=dict(color='red', width=2, dash='dash'),
+                                   name='peak',
+                                   legendgroup='peak',
+                                   showlegend=show_peak_legend),
+                        row=row, col=col
+                    )
+                    if not peak_legend_shown:
+                        peak_legend_shown = True
+
+                    fig.add_trace(
+                        go.Scatter(x=[peak],
+                                   y=[waveforms.max() * 1.08],
+                                   mode='text',
+                                   text=[f"x={peak:.4f}<br>conf:{conf:.3f}"],
+                                   textposition="top center",
+                                   showlegend=False,
+                                   textfont=dict(size=10, color="red")),
+                        row=row, col=col
+                    )
+
+            if row == rows:
+                fig.update_xaxes(title_text="Time", row=row, col=col)
+            if col == 1:
+                fig.update_yaxes(title_text="Amp", row=row, col=col)
+
+        fig.update_layout(
+            height=400 * rows,
+            width=520 * cols,
+            title_text="Opt-Pi-Pulse",
+            title_x=0.5,
+            legend=dict(font=dict(size=10), bgcolor="rgba(255,255,255,0.8)"),
+            margin=dict(l=60, r=60, t=80, b=60)
+        )
+        return fig

qubitclient/draw/pltmanager.py

@@ -0,0 +1,50 @@
+from typing import Dict, List
+from .pltplotter import QuantumDataPltPlotter
+from .spectrum2dpltplotter import Spectrum2DDataPltPlotter
+from .s21vfluxpltplotter import S21VfluxDataPltPlotter
+from .singleshotpltplotter import SingleShotDataPltPlotter
+from .spectrum2dscopepltplotter import Spectrum2DScopeDataPltPlotter
+from .spectrumpltplotter import SpectrumDataPltPlotter
+from .s21peakpltplotter import S21PeakDataPltPlotter
+
+from .optpipulsepltplotter import OptPiPulseDataPltPlotter
+from .rabipltplotter import RabiDataPltPlotter
+from .t1fitpltplotter import T1FitDataPltPlotter
+from .t2fitpltplotter import T2FitDataPltPlotter
+from .rabicospltplotter import RabiCosDataPltPlotter
+from .powershiftpltplotter import PowerShiftDataPltPlotter
+
+class QuantumPlotPltManager:
+    def __init__(self):
+        self.plotters: Dict[str, QuantumDataPltPlotter] = {}
+        self.register_plotters()
+
+    def register_plotters(self):
+        self.plotters["spectrum2d"] = Spectrum2DDataPltPlotter()
+        self.plotters["s21vflux"] = S21VfluxDataPltPlotter()
+        self.plotters["singleshot"] = SingleShotDataPltPlotter()
+        self.plotters["spectrum2dscope"] = Spectrum2DScopeDataPltPlotter()
+        self.plotters["spectrum"] = SpectrumDataPltPlotter()
+        self.plotters["optpipulse"] = OptPiPulseDataPltPlotter()
+        self.plotters["rabicos"] = RabiCosDataPltPlotter()
+        self.plotters["t1fit"] = T1FitDataPltPlotter()
+        self.plotters["t2fit"] = T2FitDataPltPlotter()
+        self.plotters["rabi"] = RabiDataPltPlotter()
+        self.plotters["s21peak"] = S21PeakDataPltPlotter()
+        self.plotters["powershift"] = PowerShiftDataPltPlotter()
+
+    def get_plotter(self, task_type: str) -> QuantumDataPltPlotter:
+        if task_type not in self.plotters:
+            raise ValueError(f"未找到任务 '{task_type}' 的绘图器")
+        return self.plotters[task_type]
+
+    def list_available_tasks(self) -> List[str]:
+        return list(self.plotters.keys())
+
+    def plot_quantum_data(self, data_type: str, task_type: str, save_path, **kwargs):
+        plotter = self.get_plotter(task_type)
+        if data_type=='npy':
+            fig = plotter.plot_result_npy(**kwargs)
+        if data_type=='npz':
+            fig = plotter.plot_result_npz(**kwargs)
+        plotter.save_plot(fig,save_path)

qubitclient/draw/pltplotter.py

@@ -0,0 +1,20 @@
+import os
+from abc import ABC, abstractmethod
+
+class QuantumDataPltPlotter(ABC):
+    def __init__(self, task_type: str):
+        self.task_type = task_type
+
+
+    @abstractmethod
+    def plot_result_npy(self, **kwargs):
+        pass
+
+    def plot_result_npz(self, **kwargs):
+        pass
+
+    def save_plot(self, fig, save_path: str):
+        directory = os.path.dirname(save_path)
+        if os.path.exists(directory):
+            fig.savefig(save_path)  # save_path  最中存储路径 “./tmp/client/result_s21peak_tmp***.png”
+        return fig

qubitclient/draw/plymanager.py

@@ -0,0 +1,57 @@
+
+from typing import Dict, List
+from .plyplotter import QuantumDataPlyPlotter
+from .spectrum2dplyplotter import Spectrum2DDataPlyPlotter
+from .s21vfluxplyplotter import S21VfluxDataPlyPlotter
+from .singleshotplyplotter import SingleShotDataPlyPlotter
+from .spectrum2dscopeplyplotter import Spectrum2DScopeDataPlyPlotter
+from .spectrumplyplotter import SpectrumDataPlyPlotter
+
+from .optpipulseplyplotter import OptPiPulseDataPlyPlotter
+from .rabiplyplotter import RabiDataPlyPlotter
+from .t1fitplyplotter import T1FitDataPlyPlotter
+from .t2fitplyplotter import T2FitDataPlyPlotter
+from .rabicosplyplotter import RabiCosDataPlyPlotter
+from .s21peakplyplotter import S21PeakDataPlyPlotter
+from .powershiftplyplotter import PowerShiftDataPlyPlotter
+
+class QuantumPlotPlyManager:
+
+
+    def __init__(self):
+        self.plotters: Dict[str, QuantumDataPlyPlotter] = {}
+        self.register_plotters()
+
+    def register_plotters(self):
+
+        self.plotters["spectrum2d"] = Spectrum2DDataPlyPlotter()
+        self.plotters["s21vflux"] = S21VfluxDataPlyPlotter()
+        self.plotters["singleshot"] = SingleShotDataPlyPlotter()
+        self.plotters["spectrum2dscope"] = Spectrum2DScopeDataPlyPlotter()
+        self.plotters["spectrum"] = SpectrumDataPlyPlotter()
+        self.plotters["optpipulse"] = OptPiPulseDataPlyPlotter()
+        self.plotters["rabicos"] = RabiCosDataPlyPlotter()
+        self.plotters["t1fit"] = T1FitDataPlyPlotter()
+        self.plotters["t2fit"] = T2FitDataPlyPlotter()
+        self.plotters["rabi"] = RabiDataPlyPlotter()
+        self.plotters["s21peak"] = S21PeakDataPlyPlotter()
+        self.plotters["powershift"] = PowerShiftDataPlyPlotter()
+
+    def get_plotter(self, task_type: str) -> QuantumDataPlyPlotter:
+
+        if task_type not in self.plotters:
+            raise ValueError(f"未找到任务 '{task_type}' 的绘图器")
+        return self.plotters[task_type]
+
+    def list_available_tasks(self) -> List[str]:
+
+        return list(self.plotters.keys())
+
+    def plot_quantum_data(self, data_type: str, task_type: str,save_path: str,**kwargs):
+        plotter = self.get_plotter(task_type)
+        if data_type=='npy':
+            fig = plotter.plot_result_npy(**kwargs)
+        if data_type=='npz':
+            fig = plotter.plot_result_npz(**kwargs)
+
+        plotter.save_plot(fig,save_path)

qubitclient/draw/plyplotter.py

@@ -0,0 +1,21 @@
+
+from abc import ABC, abstractmethod
+import json
+import os
+
+class QuantumDataPlyPlotter(ABC):
+
+
+    def __init__(self, task_type: str):
+        self.task_type = task_type
+    @abstractmethod
+    def plot_result_npy(self, **kwargs):
+        pass
+    def plot_result_npz(self, **kwargs):
+        pass
+
+    def save_plot(self, fig,  save_path: str):
+        directory = os.path.dirname(save_path)
+        if os.path.exists(directory):
+            fig.write_html(save_path)   # save_path  最中存储路径 “./tmp/client/result_s21peak_tmp***.html”
+        return fig

qubitclient/draw/powershiftpltplotter.py

@@ -0,0 +1,108 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from .pltplotter import QuantumDataPltPlotter
+
+class PowerShiftDataPltPlotter(QuantumDataPltPlotter):
+
+    def __init__(self):
+        super().__init__("powershift")
+
+    def plot_result_npy(self, **kwargs):
+        result = kwargs.get('result')
+        dict_param = kwargs.get('dict_param')
+
+        data = dict_param.item()
+        image = data["image"]
+        q_list = list(image.keys())  # 确保q_list是列表形式，便于索引
+        num_qubits = len(q_list)
+
+        # 数据提取
+        items = []
+        for q_name in q_list:
+            image_q = image[q_name]
+            x, y, value = image_q[0], image_q[1], image_q[2]
+            
+            # 获取当前量子比特对应的关键点、类别和配置
+            idx = q_list.index(q_name)
+            keypoints = result['keypoints_list'][idx] if idx < len(result['keypoints_list']) else []
+            class_num = result['class_num_list'][idx] if idx < len(result['class_num_list']) else None
+            conf = result['confs'][idx] if idx < len(result['confs']) else None
+            
+            items.append({
+                'x': x,
+                'y': y,
+                'value': value,
+                'keypoints': keypoints,
+                'q_name': q_name,
+                'class_num': class_num,
+                'conf': conf
+            })
+
+        # 结果数据（原代码保留）
+        confs = result['confs']
+        class_num_list = result['class_num_list']
+        keypoints_list = result['keypoints_list']
+
+        # 合并所有item的图像到一张图中（多行多列布局）
+        num_items = len(items)
+        if num_items == 0:
+            raise ValueError("没有可合并的item数据")
+        
+        # 配置每行最多显示的子图数量
+        max_cols = 4
+        # 计算需要的行数和列数
+        rows = (num_items + max_cols - 1) // max_cols  # 向上取整计算行数
+        cols = min(num_items, max_cols)                # 列数不超过max_cols
+        
+        # 创建多行多列布局的画布
+        fig, axes = plt.subplots(rows, cols, figsize=(6 * cols, 6 * rows))
+        # 将axes转换为一维数组（方便统一处理单一行/列的情况）
+        axes = axes.flatten() if rows * cols > 1 else [axes]
+        
+        # 为每个item绘制内容
+        for i, item in enumerate(items):
+            ax = axes[i]
+            x = item["x"]
+            y = item["y"]
+            values = item["value"]
+            keypoints = item["keypoints"]
+            q_name = item["q_name"]
+            class_num = item["class_num"]
+            conf = item["conf"]
+            
+            # 绘制原始图像
+            im = ax.pcolormesh(x, y, values, cmap='viridis', shading='auto')
+            fig.colorbar(im, ax=ax)
+            
+            # 绘制关键点
+            if keypoints:
+                sorted_keypoints = sorted(keypoints, key=lambda p: (-p[1], p[0]))
+                kp_x = [p[0] for p in sorted_keypoints]
+                kp_y = [p[1] for p in sorted_keypoints]
+                ax.scatter(kp_x, kp_y, color='red', s=50, marker='*', label='Key Points')
+                ax.plot(kp_x, kp_y, 'r--', linewidth=2)
+            
+            # 添加class和confs信息
+            info_text = f"Qubit: {q_name}\n"
+            if class_num is not None:
+                info_text += f"Class: {class_num}\n"
+            if conf is not None:
+                # 格式化置信度为两位小数
+                info_text += f"Confidence: {conf:.2f}"
+            
+            # 在图中添加文本信息
+            ax.text(0.05, 0.95, info_text, transform=ax.transAxes,
+                    verticalalignment='top', bbox=dict(boxstyle='round', facecolor='wheat', alpha=0.5))
+            
+            ax.set_title('Original Image')
+            ax.set_xlabel('X')
+            ax.set_ylabel('Y')
+            ax.legend()
+        
+        # 隐藏多余的子图
+        for i in range(num_items, rows * cols):
+            axes[i].axis('off')
+        
+        # 调整布局
+        plt.tight_layout()
+        return fig

qubitclient/draw/powershiftplyplotter.py

@@ -0,0 +1,194 @@
+import numpy as np
+import plotly.graph_objects as go
+from plotly.subplots import make_subplots
+from .plyplotter import QuantumDataPlyPlotter
+
+class PowerShiftDataPlyPlotter(QuantumDataPlyPlotter):
+
+    def __init__(self):
+        super().__init__("powershift")
+
+    def plot_result_npy(self, **kwargs):
+        result = kwargs.get('result')
+        dict_param = kwargs.get('dict_param')
+
+        data = dict_param.item()
+        image = data["image"]
+        q_list = list(image.keys())
+        if not q_list:
+            raise ValueError("没有找到量子比特数据")
+
+        items = []
+        for q_name in q_list:
+            image_q = image[q_name]
+            x, y, value = image_q[0], image_q[1], image_q[2]
+            
+            idx = q_list.index(q_name)
+            keypoints = result['keypoints_list'][idx] if idx < len(result['keypoints_list']) else []
+            class_num = result['class_num_list'][idx] if idx < len(result['class_num_list']) else None
+            conf = result['confs'][idx] if idx < len(result['confs']) else None
+            
+            # 数据格式处理
+            x = np.squeeze(x)
+            y = np.squeeze(y)
+            value = np.squeeze(value)
+            
+            # 热力图网格与坐标匹配处理
+            if value.shape[0] == len(y) - 1 and value.shape[1] == len(x) - 1:
+                pass
+            else:
+                value = value[:len(y), :len(x)]
+            
+            items.append({
+                'x': x,
+                'y': y,
+                'value': value,
+                'keypoints': keypoints,
+                'q_name': q_name,
+                'class_num': class_num,
+                'conf': conf
+            })
+
+        num_items = len(items)
+        max_cols = 4  # 保持每行4个子图，平衡宽度和可读性
+        rows = (num_items + max_cols - 1) // max_cols
+        cols = min(num_items, max_cols)
+
+        # 1. 增大子图基础尺寸，按数量动态调整（优先保证显示完整）
+        base_size = 320  # 基础尺寸从250提升到320，显著增大子图
+        if num_items > 30:
+            base_size = 280  # 30个以上子图适当缩小，但仍比之前200大
+        elif num_items > 15:
+            base_size = 300  # 15-30个子图微调
+        fig_height = base_size * rows
+        fig_width = base_size * cols
+
+        # 2. 调整间距：增大垂直/水平间距，避免内容挤压
+        vertical_spacing = 0.08  # 从0.02提升到0.06，增加上下子图间隙
+        horizontal_spacing = 0.08  # 从0.03提升到0.08，增加左右子图间隙
+        # 子图数量过多时，间距适度缩小（但仍大于之前的最小间距）
+        if num_items > 35:
+            vertical_spacing = 0.06
+            horizontal_spacing = 0.06
+        
+        subplot_titles = []
+        for item in items:
+            q_name = item['q_name']
+            class_num = item['class_num']
+            conf = item['conf']
+            
+            # 构建标题基础部分
+            title_parts = [f"Qubit: {q_name}"]
+            
+            # 添加class信息（如果存在）
+            if class_num is not None:
+                title_parts.append(f"class: {class_num}")
+            
+            # 添加conf信息（如果存在，保留两位小数）
+            if conf is not None:
+                title_parts.append(f"conf: {conf:.2f}")
+            
+            # 拼接所有部分为最终标题
+            subplot_titles.append("_".join(title_parts))
+
+        # 创建子图
+        fig = make_subplots(
+            rows=rows, cols=cols,
+            subplot_titles=subplot_titles,
+            vertical_spacing=vertical_spacing,
+            horizontal_spacing=horizontal_spacing,
+            shared_yaxes=False,
+            shared_xaxes=False
+        )
+
+        # 统一颜色条范围
+        all_values = np.concatenate([item['value'].flatten() for item in items])
+        z_min, z_max = np.min(all_values), np.max(all_values)
+
+        for i, item in enumerate(items):
+            row = (i // cols) + 1
+            col = (i % cols) + 1
+            x = item["x"]
+            y = item["y"]
+            values = item["value"]
+            keypoints = item["keypoints"]
+            q_name = item["q_name"]
+            class_num = item["class_num"]
+            conf = item["conf"]
+
+            # 绘制热力图（保持颜色条配置正确）
+            heatmap = go.Heatmap(
+                z=values,
+                x=x,
+                y=y,
+                zmin=z_min,
+                zmax=z_max,
+                colorscale='Viridis',
+                colorbar=dict(
+                    thickness=12,  # 增大颜色条厚度，提升可读性
+                    title=dict(
+                        text="Value",
+                        side="right",
+                        font=dict(size=10)  # 颜色条标题字体
+                    )
+                ) if i == (num_items - 1) else None,
+                showscale=(i == num_items - 1),
+                transpose=False
+            )
+            fig.add_trace(heatmap, row=row, col=col)
+
+            # 关键点连线按y从高到低排序
+            if keypoints and len(keypoints) > 0:
+                keypoints = np.array(keypoints).reshape(-1, 2)
+                sorted_keypoints = sorted(keypoints, key=lambda p: (-p[1], p[0]))
+                kp_x = [p[0] for p in sorted_keypoints]
+                kp_y = [p[1] for p in sorted_keypoints]
+
+                # 关键点散点（增大尺寸，避免看不清）
+                scatter = go.Scatter(
+                    x=kp_x, y=kp_y,
+                    mode='markers',
+                    marker=dict(color='red', size=11, symbol='star', line=dict(width=1.2, color='white')),
+                    name='Key Points',
+                    showlegend=False  
+                )
+                fig.add_trace(scatter, row=row, col=col)
+
+                # 关键点连接线（加粗线条）
+                if len(kp_x) > 1:
+                    line = go.Scatter(
+                        x=kp_x, y=kp_y,
+                        mode='lines',
+                        line=dict(color='red', dash='dash', width=1.8),
+                        showlegend=False
+                    )
+                    fig.add_trace(line, row=row, col=col)
+
+            # 4. 坐标轴优化：增大字体，避免刻度/标题看不清
+            fig.update_xaxes(
+                title_text="X",
+                row=row, col=col,
+                range=[np.min(x), np.max(x)],
+                title_font=dict(size=11),  # 轴标题字体增大
+                tickfont=dict(size=9),     # 刻度字体增大
+                ticklen=4  # 增大刻度长度，提升可读性
+            )
+            fig.update_yaxes(
+                title_text="Y",
+                row=row, col=col,
+                range=[np.min(y), np.max(y)],
+                title_font=dict(size=11),
+                tickfont=dict(size=9),
+                ticklen=4
+            )
+
+        # 整体布局优化：增大边距，避免边缘内容被截断
+        fig.update_layout(
+            height=fig_height,
+            width=fig_width,
+            title_text="Power Shift Data Visualization",
+            title_font=dict(size=16, weight='bold'),
+            margin=dict(l=40, r=60, t=60, b=40)  # 增大右/上/左/下边距，适配颜色条和标题
+        )
+
+        return fig