将 pattern 切换后的等待时间设置添加到pq_config

This commit is contained in:
xinzhu.yin
2026-06-16 15:56:49 +08:00
parent 3dd383b982
commit 9c15751dd0
5 changed files with 132 additions and 25 deletions

View File

@@ -655,6 +655,12 @@ class PQConfig:
"ca_channel": "0",
}
# ---- 采集节奏settings/pq_config.json → acquisition_timing----
self.acquisition_timing = {
"pattern_settle_time": 0.4,
"pattern_progress_log_step": 5,
}
# ---- 自定义图案(用户可变)----
self.custom_pattern = {
"pattern_mode": "SolidColor",
@@ -710,6 +716,7 @@ class PQConfig:
"test_types": self.current_test_types,
"device_config": self.device_config,
"custom_pattern": self.custom_pattern,
"acquisition_timing": self.acquisition_timing,
}
def from_dict(self, config_dict):
@@ -728,6 +735,17 @@ class PQConfig:
self.device_config = config_dict.get("device_config", self.device_config)
self.custom_pattern = config_dict.get("custom_pattern", self.custom_pattern)
loaded_timing = config_dict.get("acquisition_timing")
if isinstance(loaded_timing, dict):
if "pattern_settle_time" in loaded_timing:
self.acquisition_timing["pattern_settle_time"] = max(
0.2, float(loaded_timing["pattern_settle_time"])
)
if "pattern_progress_log_step" in loaded_timing:
self.acquisition_timing["pattern_progress_log_step"] = max(
1, int(loaded_timing["pattern_progress_log_step"])
)
def save_to_file(self, filename):
"""将配置保存到文件"""
with open(filename, "w", encoding="utf-8") as f: