From 21580720a8c76939353f710c679579ee2e75679e Mon Sep 17 00:00:00 2001 From: wangdequan Date: Sat, 29 Aug 2026 09:11:23 +0800 Subject: [PATCH] Highlight completed and active G-code lines --- coverage/xyzac-trt-tool-preview.report.json | 6 +++--- .../xyzac-trt-wasm-authority-audit.report.json | 6 +++--- .../xyzac-trt-wasm-only-release-gate.report.json | 4 ++-- coverage/xyzac-trt-web-wasm-parity.report.json | 6 +++--- web/react/src/App.tsx | 12 ++++++++---- web/react/src/store.ts | 3 ++- web/react/src/styles.css | 15 ++++++++++++--- 7 files changed, 33 insertions(+), 19 deletions(-) diff --git a/coverage/xyzac-trt-tool-preview.report.json b/coverage/xyzac-trt-tool-preview.report.json index b98851f..4553f24 100644 --- a/coverage/xyzac-trt-tool-preview.report.json +++ b/coverage/xyzac-trt-tool-preview.report.json @@ -102,11 +102,11 @@ }, { "path": "web/react/src/App.tsx", - "sha256": "e8d8beee65031cdcb70e8c5ab5b59db90e6b93ee2ac229fc4894d6da07caaeed" + "sha256": "154f6d2cbe9003a6d217e4d77089a739b275767c66e36839b6b6ae64ed11cbbd" }, { "path": "web/react/src/styles.css", - "sha256": "0c523d532688228e29bcad6b828733a2f6b542cdb544584264c2f8d20ac9fad4" + "sha256": "1b0ee61a798338b6de901e60e17f71a7569eb04abda49f7eaa4a679cb22e6d2a" }, { "path": "wasm-core/src/sim_task.c", @@ -383,7 +383,7 @@ } }, "release_status": "STOP_RELEASE", - "report_sha256": "8fceb9e6f6af1089b405fd7b57aec455fc11b34ae5dc81b59448ae1469472a73", + "report_sha256": "54c3d3f24b7cd7ef58f7b6a480a8ba91b6d9309962368c85571711053eb85abc", "schema": "xyzac-trt-tool-preview-report.v1", "status": "verified", "task_id": "RTCP-10-TOOL-PREVIEW", diff --git a/coverage/xyzac-trt-wasm-authority-audit.report.json b/coverage/xyzac-trt-wasm-authority-audit.report.json index 22f9268..a8fdf10 100644 --- a/coverage/xyzac-trt-wasm-authority-audit.report.json +++ b/coverage/xyzac-trt-wasm-authority-audit.report.json @@ -205,7 +205,7 @@ "recovery": "Chromium SIGKILL/profile-reopen, corruption detection and Firefox OPFS round-trip are verified" }, "release_status": "STOP_RELEASE", - "report_sha256": "960537fe609868696cecacac63eb693adf11cc37406c7b098e653a914d0f5365", + "report_sha256": "24d166bbe8bf6ceac45c6f7c67cc2b9fccbc61c28f5412540193d955efe2d851", "scans": { "js_gcode_matches": [ { @@ -1496,7 +1496,7 @@ "files": [ { "path": "web/react/src/App.tsx", - "sha256": "e8d8beee65031cdcb70e8c5ab5b59db90e6b93ee2ac229fc4894d6da07caaeed" + "sha256": "154f6d2cbe9003a6d217e4d77089a739b275767c66e36839b6b6ae64ed11cbbd" }, { "path": "web/react/src/ThreeMachineView.tsx", @@ -1548,7 +1548,7 @@ }, { "path": "web/react/src/store.ts", - "sha256": "98a2634b0658d55bd1874c13196b7ac4ffffcdc9ff4246882b81147dad65523d" + "sha256": "2f415556da16d1ea4541d24e4a41fecfef316c7d45e5838f2cdf5d04ffa4d94e" }, { "path": "web/react/src/test_xyzac_threejs.mjs", diff --git a/coverage/xyzac-trt-wasm-only-release-gate.report.json b/coverage/xyzac-trt-wasm-only-release-gate.report.json index 3afe725..711477e 100644 --- a/coverage/xyzac-trt-wasm-only-release-gate.report.json +++ b/coverage/xyzac-trt-wasm-only-release-gate.report.json @@ -96,7 +96,7 @@ "failure_samples": [], "input": { "path": "coverage/xyzac-trt-web-wasm-parity.report.json", - "sha256": "f1664a422345d7974476a233de23bbebe784ef48d78422e66b3e44103295b47b" + "sha256": "090610e8912ff5e8e5537021674e4b6a8c043a148e1da1f9b44cebb42c2b468b" }, "known_blockers": [ "STOP_RELEASE is intentional until an owner authorizes scope expansion" @@ -104,7 +104,7 @@ "outputs": [], "release_decision": "selected_case_verified_but_release_stopped_by_scope_exclusions", "release_status": "STOP_RELEASE", - "report_sha256": "70ce954815cc9b7874bd7be3e0ed373fd9ad6ce9fb3b1af68ff9f70907c39b5a", + "report_sha256": "686b29b3118c1b9c60aceb2ea5d76fe83688fbad6b273ae270aa5114237d4e8e", "schema": "xyzac-trt-wasm-only-release-gate.v1", "status": "verified", "task_id": "RELEASE-00" diff --git a/coverage/xyzac-trt-web-wasm-parity.report.json b/coverage/xyzac-trt-web-wasm-parity.report.json index de9a476..6960bf4 100644 --- a/coverage/xyzac-trt-web-wasm-parity.report.json +++ b/coverage/xyzac-trt-web-wasm-parity.report.json @@ -101,12 +101,12 @@ "coverage/xyzac-trt-source-slice-inventory.report.json": "bf5f3fd36e1943e0dc42bafb2ed195fad147bcb3e56a8d208d7f01a3641829de", "coverage/xyzac-trt-startup.report.json": "56e040b645bcefc3d6c57244cb2d3aba16f421ff5137089d9c3336970dfd968b", "coverage/xyzac-trt-threejs.report.json": "5172d7118c555fca5f92bcb443b9c259ea0225346482558d4c33ef8a4f8da5cb", - "coverage/xyzac-trt-tool-preview.report.json": "1980f3dfad0471bdef5025aec230af5c5ba477ebd5ecccb9ada732d435465efd", + "coverage/xyzac-trt-tool-preview.report.json": "40d6d38a55a8d9b86601a0dc80a3edbbcdfd371207c058f944e64e979cce8c43", "coverage/xyzac-trt-trace-parity.report.json": "6c6b3500bc1189ff68513b74f0e5144879c3af7641349cb61737191303b76950", - "coverage/xyzac-trt-wasm-authority-audit.report.json": "57af1a779dc5d48b40b4a8576b7949aecaab2fd2eeaae7dfbbab35c06a254102", + "coverage/xyzac-trt-wasm-authority-audit.report.json": "3640d6d96e8152c70fde190491bc30586ef27498dbd5079278e402ee4fb0bfc4", "coverage/xyzac-trt-workflow.report.json": "9d0ed087b17ec14c906f4268d2d616dbc3800da03f731376b2ef9ae44ca5c6e7" }, - "report_sha256": "03d305c986a03aaaf6e04833b8e0d4095d840f89741582cd50be307f1aeed73c", + "report_sha256": "d940a5cda017837ea4c71885c698327115d8404e77bfbebb828079b805e80f66", "schema": "xyzac-trt-web-wasm-parity-report.v1", "source_coverage": { "axis_keyboard": 10, diff --git a/web/react/src/App.tsx b/web/react/src/App.tsx index 8ad9608..71ef5ea 100644 --- a/web/react/src/App.tsx +++ b/web/react/src/App.tsx @@ -87,15 +87,19 @@ function DroView({ axes, state, coordType, displayType, metric, setCoordType, se return
Position
DisplayedActualRelative
{labels.map((label, index) => { const actual = Number(axes[index] ?? 0); const target = Number(commanded[index] ?? actual); const relativeValue = Number(relative[index] ?? actual); const displayed = displayType === "commanded" ? target : actual; return
{label}{format(coordType === "relative" ? relativeValue : displayed, index)}{format(actual, index)}{format(relativeValue, index)}
; })}
Units: {metric ? "mm" : "inch"} / deg{coordType} / {displayType}Tick: {state.tick}Hash: {state.snapshot?.state_hash?.slice(0, 12) || "-"}
; } -function ProgramPane({ text, setText, activeGcodes, executionTrace, onLoad, onRun, onStep, onOpenFile, canLoad, canRun, canStep, currentLine, executionLine, executionLineText, diagnostic }: { text: string; setText: (text: string) => void; activeGcodes: string; executionTrace: Array<{ line: number; text: string; program_status?: string | null }>; onLoad: () => void; onRun: () => void; onStep: () => void; onOpenFile: () => void; canLoad: boolean; canRun: boolean; canStep: boolean; currentLine: number | null; executionLine: number | null; executionLineText: string; diagnostic: string | null }) { +function ProgramPane({ text, setText, activeGcodes, executionTrace, programStatus, onLoad, onRun, onStep, onOpenFile, canLoad, canRun, canStep, currentLine, executionLine, executionLineText, diagnostic }: { text: string; setText: (text: string) => void; activeGcodes: string; executionTrace: Array<{ line: number; text: string; program_status?: string | null }>; programStatus: string; onLoad: () => void; onRun: () => void; onStep: () => void; onOpenFile: () => void; canLoad: boolean; canRun: boolean; canStep: boolean; currentLine: number | null; executionLine: number | null; executionLineText: string; diagnostic: string | null }) { const lines = text.split("\n"); - const mainLine = currentLine && currentLine > 0 && currentLine <= lines.length ? currentLine : null; + const executing = ["running", "paused"].includes(programStatus.toLowerCase()); + const mainLine = executing && currentLine && currentLine > 0 && currentLine <= lines.length ? currentLine : null; + const executedLines = new Set(executionTrace.map((entry) => entry.line)); + const editorRef = useRef(null); + const highlightsRef = useRef(null); const traceRef = useRef(null); useEffect(() => { const node = traceRef.current; if (node) node.scrollTop = node.scrollHeight; }, [executionTrace]); - return
{lines.map((_, index) => {index + 1})}