继续优化深色模式显示
This commit is contained in:
@@ -148,35 +148,41 @@ def _draw_measured_triangle(ax, vertices, *, uv_space=False):
|
||||
# )
|
||||
|
||||
|
||||
def _draw_coverage_box(ax, x_pos, y_pos, current_ref, coverage):
|
||||
def _draw_coverage_box(ax, x_pos, y_pos, current_ref, coverage, *, dark_mode):
|
||||
text_color = "#FFF" if dark_mode else "#111"
|
||||
box_face = "#111" if dark_mode else "#FFFFFF"
|
||||
box_edge = "#FFF" if dark_mode else "#333"
|
||||
ax.text(
|
||||
x_pos, y_pos,
|
||||
f"{current_ref}\n覆盖率: {coverage:.1f}%",
|
||||
ha="right", va="bottom",
|
||||
fontsize=11, fontweight="bold",
|
||||
color="#FFF",
|
||||
color=text_color,
|
||||
bbox=dict(
|
||||
boxstyle="round,pad=0.38",
|
||||
facecolor="#111",
|
||||
edgecolor="#FFF",
|
||||
facecolor=box_face,
|
||||
edgecolor=box_edge,
|
||||
linewidth=1.7,
|
||||
alpha=0.98,
|
||||
),
|
||||
zorder=30,
|
||||
)
|
||||
|
||||
def _style_axes(ax, *, title, xlabel, ylabel, xlim, ylim):
|
||||
ax.set_facecolor("#000")
|
||||
ax.set_title(title, fontsize=12, fontweight="bold", color="#FFF", pad=8)
|
||||
ax.set_xlabel(xlabel, fontsize=10, color="#FFF")
|
||||
ax.set_ylabel(ylabel, fontsize=10, color="#FFF")
|
||||
def _style_axes(ax, *, title, xlabel, ylabel, xlim, ylim, dark_mode):
|
||||
text = "#F4F6F8" if dark_mode else "#111"
|
||||
grid = "#444" if dark_mode else "#B8BDC3"
|
||||
spine_color = "#888" if dark_mode else "#666"
|
||||
ax.set_facecolor("#000" if dark_mode else "#FFFFFF")
|
||||
ax.set_title(title, fontsize=12, fontweight="bold", color=text, pad=8)
|
||||
ax.set_xlabel(xlabel, fontsize=10, color=text)
|
||||
ax.set_ylabel(ylabel, fontsize=10, color=text)
|
||||
ax.set_xlim(*xlim)
|
||||
ax.set_ylim(*ylim)
|
||||
ax.set_aspect("equal", adjustable="datalim")
|
||||
ax.grid(True, linestyle=":", linewidth=0.7, color="#444", alpha=0.32)
|
||||
ax.tick_params(axis="both", labelsize=9, colors="#FFF")
|
||||
ax.grid(True, linestyle=":", linewidth=0.7, color=grid, alpha=0.32)
|
||||
ax.tick_params(axis="both", labelsize=9, colors=text)
|
||||
for spine in ax.spines.values():
|
||||
spine.set_color("#888")
|
||||
spine.set_color(spine_color)
|
||||
spine.set_linewidth(0.8)
|
||||
ax.set_clip_on(False)
|
||||
|
||||
@@ -201,13 +207,19 @@ def _blit_background(ax, background, bbox):
|
||||
def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
"""绘制色域图(图像层 + 框架层分离架构)。"""
|
||||
|
||||
try:
|
||||
from app.views.theme_manager import is_dark
|
||||
dark_mode = is_dark()
|
||||
except Exception:
|
||||
dark_mode = False
|
||||
|
||||
ax_xy = self.gamut_ax_xy
|
||||
ax_uv = self.gamut_ax_uv
|
||||
|
||||
ax_xy.clear()
|
||||
ax_uv.clear()
|
||||
# 全局黑色背景
|
||||
self.gamut_fig.patch.set_facecolor("#000")
|
||||
# 全局背景跟随浅/深色主题
|
||||
self.gamut_fig.patch.set_facecolor("#0D1014" if dark_mode else "#FFFFFF")
|
||||
|
||||
# ========== 读取用户选择的参考标准 ==========
|
||||
if test_type == "screen_module":
|
||||
@@ -265,6 +277,7 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
xlabel="x", ylabel="y",
|
||||
xlim=(bbox_xy[0], bbox_xy[1]),
|
||||
ylim=(bbox_xy[2], bbox_xy[3]),
|
||||
dark_mode=dark_mode,
|
||||
)
|
||||
|
||||
for ref_name in other_refs:
|
||||
@@ -289,7 +302,8 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
_draw_measured_triangle(ax_xy, measured_xy, uv_space=False)
|
||||
|
||||
_draw_coverage_box(
|
||||
ax_xy, bbox_xy[1] - 0.02, bbox_xy[2] + 0.02, current_ref, xy_coverage
|
||||
ax_xy, bbox_xy[1] - 0.02, bbox_xy[2] + 0.02, current_ref, xy_coverage,
|
||||
dark_mode=dark_mode,
|
||||
)
|
||||
|
||||
# 暗化三角形外部区域(黑色半透明遮罩)
|
||||
@@ -303,18 +317,19 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
codes = [Path.MOVETO] + [Path.LINETO]*3 + [Path.CLOSEPOLY]
|
||||
codes += [Path.MOVETO] + [Path.LINETO]*2 + [Path.CLOSEPOLY]
|
||||
path = Path(verts, codes)
|
||||
patch = PathPatch(path, facecolor=(0,0,0,0.65), lw=0, zorder=7)
|
||||
mask_face = (0, 0, 0, 0.65) if dark_mode else (1, 1, 1, 0.50)
|
||||
patch = PathPatch(path, facecolor=mask_face, lw=0, zorder=7)
|
||||
ax_xy.add_patch(patch)
|
||||
|
||||
legend = ax_xy.legend(
|
||||
loc="upper right", fontsize=8.5,
|
||||
framealpha=0.0, edgecolor="#000", fancybox=True,
|
||||
labelcolor="#FFF"
|
||||
labelcolor="#FFF" if dark_mode else "#111"
|
||||
)
|
||||
legend.set_zorder(200)
|
||||
legend.get_frame().set_facecolor("#000")
|
||||
legend.get_frame().set_alpha(0.5)
|
||||
legend.get_frame().set_edgecolor("#FFF")
|
||||
legend.get_frame().set_facecolor("#000" if dark_mode else "#FFFFFF")
|
||||
legend.get_frame().set_alpha(0.5 if dark_mode else 0.78)
|
||||
legend.get_frame().set_edgecolor("#FFF" if dark_mode else "#333")
|
||||
ax_xy.add_artist(legend)
|
||||
|
||||
except Exception as e:
|
||||
@@ -334,6 +349,7 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
xlabel="u'", ylabel="v'",
|
||||
xlim=(bbox_uv[0], bbox_uv[1]),
|
||||
ylim=(bbox_uv[2], bbox_uv[3]),
|
||||
dark_mode=dark_mode,
|
||||
)
|
||||
|
||||
measured_uv = None
|
||||
@@ -367,7 +383,8 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
_draw_measured_triangle(ax_uv, measured_uv, uv_space=True)
|
||||
|
||||
_draw_coverage_box(
|
||||
ax_uv, bbox_uv[1] - 0.015, bbox_uv[2] + 0.015, current_ref, uv_coverage
|
||||
ax_uv, bbox_uv[1] - 0.015, bbox_uv[2] + 0.015, current_ref, uv_coverage,
|
||||
dark_mode=dark_mode,
|
||||
)
|
||||
|
||||
u0, u1 = bbox_uv[0], bbox_uv[1]
|
||||
@@ -379,18 +396,19 @@ def plot_gamut(self: "PQAutomationApp", results, coverage, test_type):
|
||||
codes = [Path.MOVETO] + [Path.LINETO]*3 + [Path.CLOSEPOLY]
|
||||
codes += [Path.MOVETO] + [Path.LINETO]*2 + [Path.CLOSEPOLY]
|
||||
path = Path(verts, codes)
|
||||
patch = PathPatch(path, facecolor=(0,0,0,0.65), lw=0, zorder=7)
|
||||
mask_face = (0, 0, 0, 0.65) if dark_mode else (1, 1, 1, 0.50)
|
||||
patch = PathPatch(path, facecolor=mask_face, lw=0, zorder=7)
|
||||
ax_uv.add_patch(patch)
|
||||
|
||||
legend_uv = ax_uv.legend(
|
||||
loc="upper right", fontsize=8.5,
|
||||
framealpha=0.0, edgecolor="#000", fancybox=True,
|
||||
labelcolor="#FFF"
|
||||
labelcolor="#FFF" if dark_mode else "#111"
|
||||
)
|
||||
legend_uv.set_zorder(200)
|
||||
legend_uv.get_frame().set_facecolor("#000")
|
||||
legend_uv.get_frame().set_alpha(0.72)
|
||||
legend_uv.get_frame().set_edgecolor("#FFF")
|
||||
legend_uv.get_frame().set_facecolor("#000" if dark_mode else "#FFFFFF")
|
||||
legend_uv.get_frame().set_alpha(0.72 if dark_mode else 0.82)
|
||||
legend_uv.get_frame().set_edgecolor("#FFF" if dark_mode else "#333")
|
||||
ax_uv.add_artist(legend_uv)
|
||||
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user