修改UI细节错误
This commit is contained in:
@@ -36,7 +36,7 @@ def create_cct_params_frame(self: "PQAutomationApp"):
|
||||
|
||||
# 从配置读取屏模组参数
|
||||
saved_params = self.config.current_test_types.get("screen_module", {}).get(
|
||||
"cct_params", screen_default_cct_params.copy()
|
||||
"cct_params", {}
|
||||
)
|
||||
|
||||
# 色域参考标准
|
||||
@@ -45,15 +45,11 @@ def create_cct_params_frame(self: "PQAutomationApp"):
|
||||
)
|
||||
|
||||
# 创建屏模组变量
|
||||
self.cct_x_ideal_var = tk.StringVar(
|
||||
value=str(saved_params.get("x_ideal", 0.3127))
|
||||
)
|
||||
self.cct_x_ideal_var = tk.StringVar(value="")
|
||||
self.cct_x_tolerance_var = tk.StringVar(
|
||||
value=str(saved_params.get("x_tolerance", 0.003))
|
||||
)
|
||||
self.cct_y_ideal_var = tk.StringVar(
|
||||
value=str(saved_params.get("y_ideal", 0.3290))
|
||||
)
|
||||
self.cct_y_ideal_var = tk.StringVar(value="")
|
||||
self.cct_y_tolerance_var = tk.StringVar(
|
||||
value=str(saved_params.get("y_tolerance", 0.003))
|
||||
)
|
||||
@@ -77,13 +73,13 @@ def create_cct_params_frame(self: "PQAutomationApp"):
|
||||
# 屏模组中心由实测 100% 点自动决定,避免手动误改。
|
||||
if key in ("x_ideal", "y_ideal"):
|
||||
entry.configure(state="readonly")
|
||||
|
||||
# 绑定失去焦点事件
|
||||
default_val = screen_default_cct_params[key]
|
||||
entry.bind(
|
||||
"<FocusOut>",
|
||||
lambda e, v=var, d=default_val: self.on_cct_param_focus_out(v, d),
|
||||
)
|
||||
else:
|
||||
# 绑定失去焦点事件
|
||||
default_val = screen_default_cct_params[key]
|
||||
entry.bind(
|
||||
"<FocusOut>",
|
||||
lambda e, v=var, d=default_val: self.on_cct_param_focus_out(v, d),
|
||||
)
|
||||
|
||||
# 色域参考标准选择(右侧第一行)
|
||||
ttk.Label(self.cct_params_frame, text="色域参考标准:").grid(
|
||||
@@ -669,15 +665,29 @@ def reload_cct_params(self: "PQAutomationApp"):
|
||||
saved_params = self.config.current_test_types.get(current_type, {}).get(
|
||||
"cct_params", None
|
||||
)
|
||||
default_params = self.config.get_default_cct_params(current_type)
|
||||
|
||||
if saved_params is None:
|
||||
saved_params = self.config.get_default_cct_params(current_type)
|
||||
saved_params = {}
|
||||
|
||||
# 更新输入框的值
|
||||
self.cct_x_ideal_var.set(str(saved_params["x_ideal"]))
|
||||
self.cct_x_tolerance_var.set(str(saved_params["x_tolerance"]))
|
||||
self.cct_y_ideal_var.set(str(saved_params["y_ideal"]))
|
||||
self.cct_y_tolerance_var.set(str(saved_params["y_tolerance"]))
|
||||
if current_type == "screen_module":
|
||||
self.cct_x_ideal_var.set(
|
||||
str(saved_params["x_ideal"]) if "x_ideal" in saved_params else ""
|
||||
)
|
||||
self.cct_y_ideal_var.set(
|
||||
str(saved_params["y_ideal"]) if "y_ideal" in saved_params else ""
|
||||
)
|
||||
else:
|
||||
self.cct_x_ideal_var.set(str(saved_params.get("x_ideal", default_params["x_ideal"])) )
|
||||
self.cct_y_ideal_var.set(str(saved_params.get("y_ideal", default_params["y_ideal"])) )
|
||||
|
||||
self.cct_x_tolerance_var.set(
|
||||
str(saved_params.get("x_tolerance", default_params["x_tolerance"]))
|
||||
)
|
||||
self.cct_y_tolerance_var.set(
|
||||
str(saved_params.get("y_tolerance", default_params["y_tolerance"]))
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
if hasattr(self, "log_gui"):
|
||||
|
||||
Reference in New Issue
Block a user