feat: 加入了一系列调试和分析工具,包括 SCPI REPL、示波器数据查看器、声速检测器等,方便开发和实验调试。
fix: 修复实验页面中实验状态未正确更新的问题,确保实验状态在前端和后端之间保持一致。 docs: 添加了SCPI文档和总程序设计架构
这个提交包含在:
@ -139,3 +139,28 @@ async def clear_all_field_values(x_session_id: str | None = Header(default=None)
|
||||
session_id = resolve_session_id(x_session_id)
|
||||
removed_count = session_store.clear(session_id)
|
||||
return {"message": f"cleared {removed_count} field values", "success": True, "session_id": session_id}
|
||||
|
||||
|
||||
@router.post("/reset")
|
||||
async def reset_experiment(
|
||||
experiment: str = Query(default="cn.edu.muc.lxy.phyexp.voicespeed"),
|
||||
x_session_id: str | None = Header(default=None),
|
||||
):
|
||||
session_id = resolve_session_id(x_session_id)
|
||||
session_store.clear(session_id)
|
||||
reading_guard_manager.reset_session(session_id)
|
||||
all_fields = list_fields(experiment)
|
||||
guard_fields = [
|
||||
f.fieldId for f in all_fields
|
||||
if f.readingGuard is not None and f.readingGuard.enabled
|
||||
]
|
||||
ctrl = _peak_monitor_status_text(session_id)
|
||||
return {
|
||||
"success": True,
|
||||
"message": "experiment state reset",
|
||||
"session_id": session_id,
|
||||
"pending_field": guard_fields[0] if guard_fields else None,
|
||||
"cursor": 0,
|
||||
"total": len(guard_fields),
|
||||
"control_status": ctrl,
|
||||
}
|
||||
|
||||
@ -67,6 +67,10 @@ class ReadingGuardManager:
|
||||
src = state.source.value if isinstance(state.source, ReadingGuardSource) else str(state.source)
|
||||
return (state.pending_field, src, state.tolerance)
|
||||
|
||||
def reset_session(self, session_id: str) -> None:
|
||||
with self._lock:
|
||||
self._sessions.pop(session_id, None)
|
||||
|
||||
def get_cursor(self, session_id: str) -> tuple[int, int]:
|
||||
with self._lock:
|
||||
state = self._sessions.get(session_id)
|
||||
@ -233,8 +237,19 @@ class ReadingGuardManager:
|
||||
state.pending_answer = self._capture_answer(state.source, current_field.fieldId, state)
|
||||
|
||||
if state.pending_answer is None:
|
||||
source_label = "OCR" if state.source == ReadingGuardSource.PEAK_OCR else "standard reading"
|
||||
return {"accept": False, "message": f"{source_label} not yet captured, please wait for peak detection or retry", "severity": "error", "reference": None}
|
||||
if state.source in (ReadingGuardSource.DEVICE_PEAK, ReadingGuardSource.DEVICE_FREQUENCY):
|
||||
state.cursor += 1
|
||||
fields_map = {f.fieldId: f for f in all_fields}
|
||||
self._arm_next(state, fields_map)
|
||||
return {
|
||||
"accept": True,
|
||||
"message": f"设备离线,无法获取参考读数,已直接记录。等待下一个: {state.pending_field or '完成'}",
|
||||
"severity": "warning",
|
||||
"reference": None,
|
||||
}
|
||||
if state.source == ReadingGuardSource.PEAK_OCR:
|
||||
return {"accept": False, "message": "OCR not yet captured, please wait for peak detection or retry", "severity": "error", "reference": None}
|
||||
return {"accept": False, "message": f"manual reference for '{current_field.fieldId}' not yet set", "severity": "error", "reference": None}
|
||||
|
||||
try:
|
||||
student_value = float(current_value)
|
||||
|
||||
在新工单中引用
屏蔽一个用户