修改深色模式下结果图片显示异常
This commit is contained in:
@@ -4,6 +4,7 @@ Step 2 重构:从 pqAutomationApp.PQAutomationApp.plot_gamma 原样搬迁。
|
||||
"""
|
||||
|
||||
import numpy as np
|
||||
from app.views.modern_styles import get_theme_palette
|
||||
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
@@ -11,18 +12,44 @@ if TYPE_CHECKING:
|
||||
from pqAutomationApp import PQAutomationApp
|
||||
|
||||
|
||||
def _is_dark_palette(palette: dict[str, str]) -> bool:
|
||||
"""根据主题背景色亮度判断是否深色主题。"""
|
||||
bg = palette.get("bg", "#FFFFFF").lstrip("#")
|
||||
try:
|
||||
r = int(bg[0:2], 16)
|
||||
g = int(bg[2:4], 16)
|
||||
b = int(bg[4:6], 16)
|
||||
except Exception:
|
||||
return False
|
||||
return (r * 299 + g * 587 + b * 114) / 1000 < 128
|
||||
|
||||
|
||||
|
||||
def plot_gamma(self: "PQAutomationApp", L_bar, results_with_gamma_list, target_gamma, test_type):
|
||||
"""绘制Gamma曲线 + 数据表格(包含实测亮度)"""
|
||||
palette = get_theme_palette()
|
||||
dark_mode = _is_dark_palette(palette)
|
||||
line_actual = "#3FA7FF" if dark_mode else "#0A4BFF"
|
||||
line_ideal = "#FF6B6B" if dark_mode else "#D62828"
|
||||
grid_color = "#566070" if dark_mode else "#B8BDC3"
|
||||
legend_bg = "#131821" if dark_mode else "#FFFFFF"
|
||||
legend_edge = "#A4B2C6" if dark_mode else palette["border"]
|
||||
table_edge = "#738196" if dark_mode else palette["border"]
|
||||
table_body_fg = "#EEF3FA" if dark_mode else palette["fg"]
|
||||
|
||||
# ========== 1. 清空并重置左侧曲线 ==========
|
||||
self.gamma_ax.clear()
|
||||
self.gamma_fig.patch.set_facecolor(palette["bg"])
|
||||
self.gamma_ax.set_facecolor(palette["card_bg"])
|
||||
self.gamma_ax.set_xlim(0, 105)
|
||||
self.gamma_ax.set_ylim(0, 1.1)
|
||||
self.gamma_ax.set_xlabel("灰阶 (%)", fontsize=10)
|
||||
self.gamma_ax.set_ylabel("L_bar", fontsize=10)
|
||||
self.gamma_ax.grid(True, linestyle="--", alpha=0.3)
|
||||
self.gamma_ax.set_xlabel("灰阶 (%)", fontsize=10, color=palette["fg"])
|
||||
self.gamma_ax.set_ylabel("L_bar", fontsize=10, color=palette["fg"])
|
||||
self.gamma_ax.grid(True, linestyle="--", alpha=0.45 if dark_mode else 0.3, color=grid_color)
|
||||
self.gamma_ax.tick_params(labelsize=9)
|
||||
self.gamma_ax.tick_params(colors=palette["fg"])
|
||||
for spine in self.gamma_ax.spines.values():
|
||||
spine.set_color(palette["border"])
|
||||
|
||||
# 生成横坐标(灰阶百分比)
|
||||
x_values = np.linspace(0, 100, len(L_bar))
|
||||
@@ -46,7 +73,8 @@ def plot_gamma(self: "PQAutomationApp", L_bar, results_with_gamma_list, target_g
|
||||
self.gamma_ax.plot(
|
||||
x_values,
|
||||
L_bar,
|
||||
"b-o",
|
||||
color=line_actual,
|
||||
marker="o",
|
||||
label=f"实测 (平均γ={avg_gamma:.2f})",
|
||||
linewidth=2,
|
||||
markersize=4,
|
||||
@@ -58,15 +86,24 @@ def plot_gamma(self: "PQAutomationApp", L_bar, results_with_gamma_list, target_g
|
||||
self.gamma_ax.plot(
|
||||
x_values,
|
||||
ideal_L_bar,
|
||||
"r--",
|
||||
color=line_ideal,
|
||||
linestyle="--",
|
||||
label=f"理想 (γ={target_gamma})",
|
||||
linewidth=2,
|
||||
alpha=0.7,
|
||||
alpha=0.9 if dark_mode else 0.7,
|
||||
zorder=3,
|
||||
)
|
||||
|
||||
# 图例
|
||||
self.gamma_ax.legend(fontsize=9, loc="upper left", framealpha=0.95)
|
||||
legend = self.gamma_ax.legend(
|
||||
fontsize=9,
|
||||
loc="upper left",
|
||||
framealpha=0.9 if dark_mode else 0.95,
|
||||
facecolor=legend_bg,
|
||||
edgecolor=legend_edge,
|
||||
)
|
||||
for text in legend.get_texts():
|
||||
text.set_color(palette["fg"])
|
||||
|
||||
# ========== 2. 清空并绘制右侧表格 ==========
|
||||
self.gamma_table_ax.clear()
|
||||
@@ -120,17 +157,22 @@ def plot_gamma(self: "PQAutomationApp", L_bar, results_with_gamma_list, target_g
|
||||
# 表头样式
|
||||
for i in range(4):
|
||||
cell = table[(0, i)]
|
||||
cell.set_facecolor("#4472C4")
|
||||
cell.set_text_props(weight="bold", color="white")
|
||||
cell.set_facecolor(palette["primary"])
|
||||
cell.set_text_props(weight="bold", color=palette["select_fg"])
|
||||
cell.set_edgecolor(table_edge)
|
||||
cell.set_linewidth(0.8)
|
||||
|
||||
# 数据行交替颜色
|
||||
for i in range(1, len(table_data)):
|
||||
for j in range(4):
|
||||
cell = table[(i, j)]
|
||||
if i % 2 == 0:
|
||||
cell.set_facecolor("#E7E6E6")
|
||||
cell.set_facecolor(palette["surface_alt_bg"])
|
||||
else:
|
||||
cell.set_facecolor("#FFFFFF")
|
||||
cell.set_facecolor(palette["card_bg"])
|
||||
cell.set_text_props(color=table_body_fg)
|
||||
cell.set_edgecolor(table_edge)
|
||||
cell.set_linewidth(0.6)
|
||||
|
||||
# ========== 3. 总标题 ==========
|
||||
test_type_name = self.get_test_type_name(test_type)
|
||||
@@ -139,6 +181,7 @@ def plot_gamma(self: "PQAutomationApp", L_bar, results_with_gamma_list, target_g
|
||||
fontsize=12,
|
||||
y=0.98,
|
||||
fontweight="bold",
|
||||
color=palette["fg"],
|
||||
)
|
||||
|
||||
# ========== 4. 绘制到画布 ==========
|
||||
|
||||
Reference in New Issue
Block a user