From 7494c36ec7ad8407645cac3778008f91fe98d3ae Mon Sep 17 00:00:00 2001 From: douboer Date: Mon, 12 Oct 2026 17:19:48 +0800 Subject: [PATCH] update at 2026-10-12 17:19:48 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GUI修复:状态栏精简不撑宽+原始采样图恢复显示;deploy排除gui.py --- README.md | 1 + deploy.sh | 2 +- .../__pycache__/gui.cpython-312.pyc | Bin 42751 -> 43416 bytes fiber_delay_sim/gui.py | 13 ++++++++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index aae211d..8135a30 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ python -m fiber_delay_sim.gui --selftest - **[docs/项目说明.md](docs/项目说明.md)** —— 任务书阶段一成果。原项目是什么、为什么做:问题背景、"光学游标卡尺"核心原理(1 m 光纤 ≈ 4.90 ns 延时)、原系统全貌与简化框图、关键参数速查表(软件默认值来源)、原材料内部不一致辨析与科研诚信红线。面向第一次接触本项目的同学,读完可不依赖原文讲清实验链路。 - **[docs/实现方案.md](docs/实现方案.md)** —— 任务书阶段二/三成果。新项目怎么做:交付物清单、统一教学命题与实验六步流程、三组核心对比设计、软件总体架构与六类可调参数、实验记录包与可复现性规范、M0–M5 里程碑验收标准、硬件补充与论文映射。 +- **[docs/论文初稿大纲.md](docs/论文初稿大纲.md)** —— 交付物 7 论文初稿章节骨架:八部分结构(教学问题/原理/设计/软件/结果/虚实结合/教学实施/局限性)、每章要点与图表清单(映射 exp01–06 记录包)、关键数据与诚信注意,正文写作时直接按此填充。 ### 原始材料(resources/ 与任务书) diff --git a/deploy.sh b/deploy.sh index 9d07c97..ee2301c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -11,7 +11,7 @@ DOMAIN="chenxy.biboer.cn" echo "[1/3] 同步算法核心 fiber_delay_sim -> web/py/" rsync -a --delete --exclude '__pycache__' --exclude 'tests' \ - --exclude 'experiments' --exclude 'export' --exclude 'cli.py' \ + --exclude 'experiments' --exclude 'export' --exclude 'cli.py' --exclude 'gui.py' \ fiber_delay_sim/ web/py/fiber_delay_sim/ if [ "${1:-}" = "local" ]; then diff --git a/fiber_delay_sim/__pycache__/gui.cpython-312.pyc b/fiber_delay_sim/__pycache__/gui.cpython-312.pyc index 1097f3a66accae7b67f7e1474883712088821386..80ce0ed35349a7e8710c309cd6c3e08f7c1be9e8 100644 GIT binary patch delta 2914 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 diff --git a/fiber_delay_sim/gui.py b/fiber_delay_sim/gui.py index d55d6d0..1b50bec 100644 --- a/fiber_delay_sim/gui.py +++ b/fiber_delay_sim/gui.py @@ -242,7 +242,7 @@ class GuiApp: self.lbl_fwd.grid(row=2, column=0, columnspan=6, sticky="w") self.fig_p1, self.ax_p1, self.canvas_p1 = self._canvas(self.p1) - btn = ttk.Button(self.p1, text="运行 · 参数方案", + btn = ttk.Button(self.p1, text="运行", command=self._run_p1) btn.pack(pady=4) @@ -256,7 +256,10 @@ class GuiApp: }) self.results["page1"] = res self._draw_phase(None, res["forward"]) - self._msg("参数方案已运行:均匀性 " + str(res["forward"].get("uniformity"))) + u = res["forward"].get("uniformity", {}) + grid = " / ".join(f"{x:.2f}" for x in res["forward"].get("sorted_phases_ns", [])) + gap = u.get("max_gap_dev_ns", 0) + self._msg(f"等效网格 {grid} ns,最大间隔偏差 {gap:.3g} ns") except Exception: self._msg("失败:" + traceback.format_exc(limit=2)) @@ -274,7 +277,8 @@ class GuiApp: self.lbl_p2 = ttk.Label(fr, text="", foreground="#234") self.lbl_p2.grid(row=1, column=0, columnspan=5, sticky="w") self.fig_p2, self.ax_p2, self.canvas_p2 = self._canvas(self.p2) - self.canvas_p2.get_tk_widget().pack_forget() # 需要时再显示 + # 初始隐藏,运行后再显示(避免空图占据空间) + self.canvas_p2.get_tk_widget().pack_forget() def _run_p2(self): try: @@ -283,6 +287,9 @@ class GuiApp: p["bits"] = int(self.v_bits.get()) res = run_page2(p, self.seed) self.results["page2"] = res + # 恢复显示(首次运行前被 pack_forget 隐藏) + if not self.canvas_p2.get_tk_widget().winfo_manager(): + self.canvas_p2.get_tk_widget().pack(fill="both", expand=True) self.ax_p2.clear() self.ax_p2.plot(res["t"], res["y"], "-", lw=1, label="理想") self.ax_p2.plot(res["single"]["t"], res["single"]["y"], "o", ms=3, label="单通道")