重构UCD模块

app/device/connection.py

@@ -65,7 +65,7 @@ class ConnectionController:
     def list_ucd_devices(self) -> list[str]:
         """返回 SDK 给出的设备显示字符串列表。"""
         try:
-            return self._device.raw_controller.search_device() or []
+            return self._device.search_devices()
         except Exception as exc:  # noqa: BLE001
             self._log(f"枚举 UCD 设备失败: {exc}", level="error")
             return []
@@ -103,11 +103,6 @@ class ConnectionController:
             self._device.close()
         except Exception:  # noqa: BLE001
             pass
-        # 旧 controller.status 也要清零，兼容仍读取它的代码
-        try:
-            self._app.ucd.status = False
-        except Exception:  # noqa: BLE001
-            pass
         self._log("UCD连接已断开", level="info")
 
     # -- CA 连接 -------------------------------------------------
@@ -347,7 +342,7 @@ def update_connection_indicator(self: "PQAutomationApp", indicator, connected):
 def refresh_connection_indicators(self: "PQAutomationApp"):
     """根据当前设备状态重画 UCD / CA 指示灯。"""
     if hasattr(self, "ucd_status_indicator"):
-        ucd_connected = bool(getattr(self.ucd, "status", False))
+        ucd_connected = self.signal_service.is_connected
         _draw_connection_indicator(
             self.ucd_status_indicator,
             "green" if ucd_connected else "gray",

app/runner/test_runner.py

@@ -330,9 +330,7 @@ def send_fix_pattern(self: "PQAutomationApp", mode):
         if mode == "screen_module":
             format_changed = True
         else:
-            format_changed = bool(
-                getattr(getattr(self, "ucd", None), "format_changed", True)
-            )
+            format_changed = bool(self.signal_service.format_changed)
 
         # 预热提交：prepare_session 仅 stage 了新的 color/timing/pattern，
         # 真正的 ``pg.apply()`` 要到第一次发图时才发生。提前发送首个 pattern，

app/services/pattern_service.py

@@ -24,14 +24,9 @@ class PatternService:
     def _build_apply_config_error(self, test_type):
         timing = self.app.config.current_test_types.get(test_type, {}).get("timing", "-")
         detail = ""
-        try:
-            ctrl = getattr(self.app.signal_service.device, "raw_controller", None)
-            if ctrl is not None:
-                d = getattr(ctrl, "last_error", None)
-                if d:
-                    detail = f", detail={d}"
-        except Exception:
-            pass
+        err = self.app.signal_service.last_error
+        if err:
+            detail = f", detail={err}"
         return f"UCD profile apply_config failed for {test_type}, timing={timing}{detail}"
 
     def prepare_session(self, mode, *, test_type=None, log_details=False):

app/services/ucd_service.py

@@ -8,14 +8,13 @@
 
 本层不直接 import UniTAP，也不读取 :mod:`tkinter` 变量；
 所有输入都是显式参数，便于单测。
+
+线程安全由 :class:`UCD323Device` 的设备锁统一保证，本层不再重复加锁。
 """
 
 from __future__ import annotations
 
-from contextlib import contextmanager
 import logging
-import sys
-import threading
 
 from app.ucd_domain import (
     Colorimetry,
@@ -26,6 +25,7 @@ from app.ucd_domain import (
     SignalFormat,
     TimingSpec,
     UcdError,
+    UcdState,
     bit_depth_str_to_bpc,
     color_space_to_colorimetry,
     data_range_to_dynamic_range,
@@ -36,10 +36,6 @@ from drivers.ucd_driver import IUcdDevice
 
 log = logging.getLogger(__name__)
 
-_LOCK_TIMEOUT_SECONDS = 8.0
-_DEBUG_LOCK_TIMEOUT_SECONDS = 0.3
-_PATTERN_LOCK_TIMEOUT_SECONDS = 0.8
-
 
 # ─── 视图字符串 → 值对象 转换工具 ────────────────────────────────
 
@@ -63,6 +59,23 @@ def build_signal_format(
     )
 
 
+def build_signal_format_from_profile(
+    *,
+    color_space: str,
+    color_format: str,
+    bpc: int,
+    data_range: str = "Full",
+) -> SignalFormat:
+    """从 PQConfig test_type 条目组装 :class:`SignalFormat`。"""
+    bit_depth = f"{int(bpc)}bit"
+    return build_signal_format(
+        color_space=color_space,
+        output_format=color_format,
+        bit_depth=bit_depth,
+        data_range=data_range,
+    )
+
+
 def build_timing(timing_str: str) -> TimingSpec:
     """``"DMT 3840x2160@60Hz"`` → :class:`TimingSpec`。"""
     return parse_timing_str(timing_str)
@@ -81,63 +94,11 @@ def image_pattern(path: str) -> PatternSpec:
 
 
 class SignalService:
-    """协调 SignalFormat / Timing / Pattern 的写入与提交。
-
-    使用线程锁串行化所有对外的 ``apply_*`` 调用，避免多个测试线程
-    同时操作 UCD 造成 SDK 状态错乱。
-    """
+    """协调 SignalFormat / Timing / Pattern 的写入与提交。"""
 
     def __init__(self, device: IUcdDevice, bus: EventBus):
         self._dev = device
         self._bus = bus
-        self._lock = threading.RLock()
-        self._lock_owner_tid: int | None = None
-        self._lock_owner_name: str | None = None
-
-    def _effective_lock_timeout(self, timeout_override: float | None = None) -> float:
-        """调试模式下缩短锁等待，避免单步时表现为 UI 长时间无响应。"""
-        if timeout_override is not None:
-            return timeout_override
-        if sys.gettrace() is not None:
-            return _DEBUG_LOCK_TIMEOUT_SECONDS
-        return _LOCK_TIMEOUT_SECONDS
-
-    @contextmanager
-    def _acquire_service_lock(self, op_name: str, timeout_override: float | None = None):
-        timeout = self._effective_lock_timeout(timeout_override)
-        current = threading.current_thread()
-        log.info(
-            "SignalService.%s acquiring lock timeout=%.1fs tid=%s thread=%s owner_tid=%s owner_thread=%s",
-            op_name,
-            timeout,
-            threading.get_ident(),
-            current.name,
-            self._lock_owner_tid,
-            self._lock_owner_name,
-        )
-        acquired = self._lock.acquire(timeout=timeout)
-        if not acquired:
-            raise UcdError(
-                "UCD busy: lock timeout in "
-                f"SignalService.{op_name} ({timeout:.1f}s), "
-                f"owner_tid={self._lock_owner_tid}, owner_thread={self._lock_owner_name}"
-            )
-        prev_owner_tid = self._lock_owner_tid
-        prev_owner_name = self._lock_owner_name
-        self._lock_owner_tid = threading.get_ident()
-        self._lock_owner_name = current.name
-        log.info(
-            "SignalService.%s lock acquired tid=%s thread=%s",
-            op_name,
-            self._lock_owner_tid,
-            self._lock_owner_name,
-        )
-        try:
-            yield
-        finally:
-            self._lock_owner_tid = prev_owner_tid
-            self._lock_owner_name = prev_owner_name
-            self._lock.release()
 
     # -- 高层接口 ------------------------------------------------
 
@@ -153,24 +114,22 @@ class SignalService:
         Returns:
             ``format_changed``——本次相对上一次 :meth:`apply` 是否变化。
         """
-        with self._acquire_service_lock("apply"):
-            log.info(
-                "SignalService.apply signal=%s timing=%s pattern=%s",
-                signal,
-                timing,
-                pattern.kind.value,
-            )
-            changed = self._dev.configure(signal, timing)
-            self._dev.set_pattern(pattern)
-            self._dev.apply()
-            return changed
+        log.info(
+            "SignalService.apply signal=%s timing=%s pattern=%s",
+            signal,
+            timing,
+            pattern.kind.value,
+        )
+        changed = self._dev.configure(signal, timing)
+        self._dev.set_pattern(pattern)
+        self._dev.apply()
+        return changed
 
     def send_pattern(self, pattern: PatternSpec) -> None:
         """在已 configure 的信号上仅更新图案后 apply。"""
-        with self._acquire_service_lock("send_pattern", _PATTERN_LOCK_TIMEOUT_SECONDS):
-            log.info("SignalService.send_pattern pattern=%s", pattern.kind.value)
-            self._dev.set_pattern(pattern)
-            self._dev.apply()
+        log.info("SignalService.send_pattern pattern=%s", pattern.kind.value)
+        self._dev.set_pattern(pattern)
+        self._dev.apply()
 
     def send_solid_rgb(self, rgb: tuple[int, int, int] | list[int]) -> None:
         self.send_pattern(solid_rgb_pattern(rgb))
@@ -178,12 +137,6 @@ class SignalService:
     def send_image(self, path: str) -> None:
         self.send_pattern(image_pattern(path))
 
-    # -- 过渡期 API（Phase 2）-----------------------------------
-    # 现有 GUI 回调以"仅更新信号格式、不切换图案"的方式调用
-    # ``ucd.apply_signal_format(color_space=..., color_format=..., bit_depth=...)``。
-    # 新代码统一通过本方法走 SignalService；内部仍委托给底层
-    # controller 的同名旧接口，迁移完成后将替换为纯净实现。
-
     def update_signal_format(
         self,
         *,
@@ -194,31 +147,24 @@ class SignalService:
         max_cll: int | None = None,
         max_fall: int | None = None,
     ) -> bool:
-        """仅将信号格式 stage 到 SDK（沿用上一次的 timing），不切换图案。
+        """仅将信号格式提交到 SDK（沿用上一次的 timing），不切换图案。
 
         UI 字符串先经域层解析做参数校验；解析失败抛 :class:`UcdConfigError`。
         """
-        # 解析仅做校验；当前实现走 raw controller 的旧 API
         _ = build_signal_format(
             color_space=color_space,
             output_format=output_format,
             bit_depth=bit_depth,
             data_range=data_range,
         )
-        ctrl = getattr(self._dev, "raw_controller", None)
-        if ctrl is None:
-            raise UcdError("update_signal_format 暂仅支持 UCD323Device")
-        with self._acquire_service_lock("update_signal_format"):
-            return bool(
-                ctrl.apply_signal_format(
-                    color_space=color_space,
-                    color_format=output_format,
-                    bit_depth=bit_depth,
-                    data_range=data_range,
-                    max_cll=max_cll,
-                    max_fall=max_fall,
-                )
-            )
+        return self._dev.apply_signal_format(
+            color_space=color_space,
+            color_format=output_format,
+            bit_depth=bit_depth,
+            data_range=data_range,
+            max_cll=max_cll,
+            max_fall=max_fall,
+        )
 
     # -- 透传给上层的查询 ---------------------------------------
 
@@ -232,54 +178,37 @@ class SignalService:
     @property
     def is_connected(self) -> bool:
         """UCD 设备是否已打开。供 GUI 做前置校验。"""
-        ctrl = getattr(self._dev, "raw_controller", None)
-        return bool(ctrl and getattr(ctrl, "status", False))
+        return self._dev.state != UcdState.CLOSED
 
-    # -- 过渡期 API（Phase 5）：config 驱动的写入 -----------------
-    # 现有 GUI / Service 通过 ``PQConfig`` 对象描述当次测试参数，
-    # 由 :class:`UCDController.set_ucd_params` 翻译为色彩/Timing/Pattern。
-    # 在配置层重构落地前，这两个方法作为 SignalService 的统一入口，
-    # 让上层不再直接接触 ``self.app.ucd``。
+    @property
+    def format_changed(self) -> bool:
+        """最近一次视频模式提交是否相对上次发生变化。"""
+        return self._dev.format_changed
+
+    @property
+    def last_error(self) -> str | None:
+        return self._dev.last_error
 
     def apply_config(self, config) -> bool:
         """按 :class:`PQConfig` 写入色彩 / Timing / 当前 Pattern（不 apply 输出）。"""
-        ctrl = getattr(self._dev, "raw_controller", None)
-        if ctrl is None:
-            raise UcdError("apply_config 暂仅支持 UCD323Device")
-        with self._acquire_service_lock("apply_config"):
-            return bool(ctrl.set_ucd_params(config))
+        return bool(self._dev.set_ucd_params(config))
 
     def send_pattern_params(self, params) -> bool:
         """以 ``params`` 更新当前 pattern 的参数并 apply。"""
-        ctrl = getattr(self._dev, "raw_controller", None)
-        if ctrl is None:
-            raise UcdError("send_pattern_params 暂仅支持 UCD323Device")
-        with self._acquire_service_lock("send_pattern_params"):
-            return bool(ctrl.send_current_pattern_params(params))
+        return bool(self._dev.send_current_pattern_params(params))
 
     def apply_and_run(self, config, pattern_params) -> bool:
-        """``set_ucd_params`` + ``set_pattern`` + ``run`` 的复合操作。
-
-        服务于 custom_template_panel 单步流程。
-        """
-        ctrl = getattr(self._dev, "raw_controller", None)
-        if ctrl is None:
-            raise UcdError("apply_and_run 暂仅支持 UCD323Device")
-        with self._acquire_service_lock("apply_and_run"):
-            if not ctrl.set_ucd_params(config):
-                return False
-            if not ctrl.set_pattern(ctrl.current_pattern, pattern_params):
-                return False
-            return bool(ctrl.run())
+        """``set_ucd_params`` + ``set_pattern`` + ``run`` 的复合操作。"""
+        return bool(self._dev.apply_config_and_run(config, pattern_params))
 
 
 __all__ = [
     "SignalService",
     "build_signal_format",
+    "build_signal_format_from_profile",
     "build_timing",
     "solid_rgb_pattern",
     "image_pattern",
-    # 重导出常用域类型方便上层 import 一次到位
     "SignalFormat",
     "TimingSpec",
     "PatternSpec",

app/tests/local_dimming.py

@@ -157,9 +157,118 @@ def _ensure_checkerboard_image(width, height, grid_size, center_white):
     _IMAGE_CACHE[key] = path
     return path
 
+
+def _ld_ucd_params_signature(self: "PQAutomationApp") -> tuple:
+    """Local Dimming 发图前 UCD 参数签名，用于跳过未变化的重复配置。"""
+    test_type = getattr(self.config, "current_test_type", "screen_module")
+    cfg = self.config.current_test_types.get(test_type, {})
+    timing = cfg.get("timing", "")
+
+    if test_type == "screen_module":
+        color_space = (
+            self.screen_module_color_space_var.get()
+            if hasattr(self, "screen_module_color_space_var")
+            else cfg.get("colorimetry", "sRGB")
+        )
+        data_range = (
+            self.screen_module_data_range_var.get()
+            if hasattr(self, "screen_module_data_range_var")
+            else cfg.get("data_range", "Full")
+        )
+        bit_depth = (
+            self.screen_module_bit_depth_var.get()
+            if hasattr(self, "screen_module_bit_depth_var")
+            else f"{int(cfg.get('bpc', 8))}bit"
+        )
+        output_format = (
+            self.screen_module_output_format_var.get()
+            if hasattr(self, "screen_module_output_format_var")
+            else cfg.get("color_format", "RGB")
+        )
+    elif test_type == "sdr_movie":
+        color_space = (
+            self.sdr_color_space_var.get()
+            if hasattr(self, "sdr_color_space_var")
+            else cfg.get("colorimetry", "sRGB")
+        )
+        data_range = (
+            self.sdr_data_range_var.get()
+            if hasattr(self, "sdr_data_range_var")
+            else cfg.get("data_range", "Full")
+        )
+        bit_depth = (
+            self.sdr_bit_depth_var.get()
+            if hasattr(self, "sdr_bit_depth_var")
+            else f"{int(cfg.get('bpc', 8))}bit"
+        )
+        output_format = (
+            self.sdr_output_format_var.get()
+            if hasattr(self, "sdr_output_format_var")
+            else cfg.get("color_format", "RGB")
+        )
+    elif test_type == "hdr_movie":
+        color_space = (
+            self.hdr_color_space_var.get()
+            if hasattr(self, "hdr_color_space_var")
+            else cfg.get("colorimetry", "sRGB")
+        )
+        data_range = (
+            self.hdr_data_range_var.get()
+            if hasattr(self, "hdr_data_range_var")
+            else cfg.get("data_range", "Full")
+        )
+        bit_depth = (
+            self.hdr_bit_depth_var.get()
+            if hasattr(self, "hdr_bit_depth_var")
+            else f"{int(cfg.get('bpc', 8))}bit"
+        )
+        output_format = (
+            self.hdr_output_format_var.get()
+            if hasattr(self, "hdr_output_format_var")
+            else cfg.get("color_format", "RGB")
+        )
+        max_cll = self.hdr_maxcll_var.get() if hasattr(self, "hdr_maxcll_var") else None
+        max_fall = self.hdr_maxfall_var.get() if hasattr(self, "hdr_maxfall_var") else None
+        return (test_type, timing, color_space, data_range, bit_depth, output_format, max_cll, max_fall)
+    elif test_type == "local_dimming":
+        color_space = (
+            self.local_dimming_color_space_var.get()
+            if hasattr(self, "local_dimming_color_space_var")
+            else cfg.get("colorimetry", "sRGB")
+        )
+        data_range = (
+            self.local_dimming_data_range_var.get()
+            if hasattr(self, "local_dimming_data_range_var")
+            else cfg.get("data_range", "Full")
+        )
+        bit_depth = (
+            self.local_dimming_bit_depth_var.get()
+            if hasattr(self, "local_dimming_bit_depth_var")
+            else f"{int(cfg.get('bpc', 8))}bit"
+        )
+        output_format = (
+            self.local_dimming_output_format_var.get()
+            if hasattr(self, "local_dimming_output_format_var")
+            else cfg.get("color_format", "RGB")
+        )
+    else:
+        return (test_type,)
+
+    return (test_type, timing, color_space, data_range, bit_depth, output_format)
+
+
+def invalidate_ld_ucd_params_cache(self: "PQAutomationApp") -> None:
+    """信号格式或分辨率变更后，强制下次发图重新写入 UCD 参数。"""
+    self._last_ld_ucd_signature = None
+
+
 def _apply_ld_ucd_params(self: "PQAutomationApp") -> bool:
     """发送 Local Dimming 图案前，按当前测试类型写入 UCD 参数。"""
-    test_type = getattr(self.config, "current_test_type", "screen_module")
+    signature = _ld_ucd_params_signature(self)
+    if getattr(self, "_last_ld_ucd_signature", None) == signature:
+        return True
+
+    test_type = signature[0]
     cfg = self.config.current_test_types.get(test_type, {})
 
     try:
@@ -279,6 +388,7 @@ def _apply_ld_ucd_params(self: "PQAutomationApp") -> bool:
             self._dispatch_ui(self.log_gui.log, "Local Dimming UCD 参数设置失败", "error")
             return False
 
+        self._last_ld_ucd_signature = signature
         return True
     except Exception as e:
         self._dispatch_ui(self.log_gui.log, f"Local Dimming UCD 参数设置异常: {e}", "error")
@@ -914,5 +1024,6 @@ class LocalDimmingMixin:
     clear_ld_records = clear_ld_records
     save_local_dimming_results = save_local_dimming_results
     plot_ld_instant_peak_curve = plot_ld_instant_peak_curve
+    invalidate_ld_ucd_params_cache = invalidate_ld_ucd_params_cache
 
     _insert_ld_tree_item = _insert_ld_tree_item

app/views/panels/custom_template_panel.py

@@ -218,7 +218,7 @@ def show_custom_result_context_menu(self: "PQAutomationApp", event):
     can_single_step = (
         has_selection
         and self.ca is not None
-        and self.ucd is not None
+        and self.signal_service.is_connected
         and not self.testing
     )
     try:
@@ -259,7 +259,7 @@ def start_custom_row_single_step(self: "PQAutomationApp"):
     if not hasattr(self, "custom_result_tree"):
         return
 
-    if self.ca is None or self.ucd is None:
+    if self.ca is None or not self.signal_service.is_connected:
         messagebox.showerror("错误", "请先连接CA410和信号发生器")
         return
 
@@ -570,7 +570,7 @@ def append_custom_template_result(self: "PQAutomationApp", row_no, result_data):
 def start_custom_template_test(self: "PQAutomationApp"):
     """开始客户模板测试（SDR）"""
 
-    if self.ca is None or self.ucd is None:
+    if self.ca is None or not self.signal_service.is_connected:
         messagebox.showerror("错误", "请先连接CA410和信号发生器")
         return
 

app/views/panels/main_layout.py

@@ -1077,7 +1077,7 @@ def on_screen_module_signal_format_changed(self: "PQAutomationApp", event=None):
             self.save_pq_config()
             return
 
-        if getattr(self.ucd, "status", False):
+        if self.signal_service.is_connected:
             ok = self.signal_service.update_signal_format(
                 color_space=color_space,
                 data_range=data_range,
@@ -1121,7 +1121,7 @@ def on_sdr_output_format_changed(self: "PQAutomationApp", event=None):
             self.log_gui.log("警告: 测试进行中，格式更改将在下次测试时生效", level="error")
             return
 
-        if getattr(self.ucd, "status", False):
+        if self.signal_service.is_connected:
             ok = self.signal_service.update_signal_format(
                 color_space=self.sdr_color_space_var.get(),
                 data_range=self.sdr_data_range_var.get(),
@@ -1145,7 +1145,7 @@ def on_hdr_output_format_changed(self: "PQAutomationApp", event=None):
             self.log_gui.log("警告: 测试进行中，格式更改将在下次测试时生效", level="error")
             return
 
-        if getattr(self.ucd, "status", False):
+        if self.signal_service.is_connected:
             ok = self.signal_service.update_signal_format(
                 color_space=self.hdr_color_space_var.get(),
                 data_range=self.hdr_data_range_var.get(),
@@ -1169,6 +1169,9 @@ def on_local_dimming_timing_changed(self: "PQAutomationApp", event=None):
 
         self.config.current_test_types.setdefault("local_dimming", {})["timing"] = selected_timing
 
+        if hasattr(self, "invalidate_ld_ucd_params_cache"):
+            self.invalidate_ld_ucd_params_cache()
+
         if self.testing:
             self.log_gui.log("警告: 测试进行中，分辨率更改将在下次测试时生效", level="error")
 
@@ -1191,6 +1194,9 @@ def on_local_dimming_signal_format_changed(self: "PQAutomationApp", event=None):
         ld_cfg["bpc"] = UCDEnum.SignalFormat.BitDepth.get_bit_value(bit_depth)
         ld_cfg["data_range"] = data_range
 
+        if hasattr(self, "invalidate_ld_ucd_params_cache"):
+            self.invalidate_ld_ucd_params_cache()
+
         self.log_gui.log(
             (
                 "Local Dimming 信号格式已更新: "
@@ -1205,7 +1211,7 @@ def on_local_dimming_signal_format_changed(self: "PQAutomationApp", event=None):
             self.save_pq_config()
             return
 
-        if getattr(self.ucd, "status", False):
+        if self.signal_service.is_connected:
             ok = self.signal_service.update_signal_format(
                 color_space=color_space,
                 data_range=data_range,