@@ -700,9 +753,11 @@
} from "./simulation-app.js";
const runButton = document.querySelector("[data-run-program]");
+ const runEditorButton = document.querySelector("[data-run-editor-program]");
const programSelector = document.querySelector("[data-program-selector]");
const openProgramButton = document.querySelector("[data-open-program]");
const openProgramFile = document.querySelector("[data-open-program-file]");
+ const programEditor = document.querySelector("[data-program-editor]");
const resetButton = document.querySelector("[data-playback-reset]");
const prevButton = document.querySelector("[data-playback-prev]");
const playButton = document.querySelector("[data-playback-play]");
@@ -711,6 +766,14 @@
const speedSelector = document.querySelector("[data-playback-speed]");
let playbackTimer = null;
let playbackIndex = 0;
+ let programEditorState = {
+ text: "",
+ metadata: {
+ label: "Custom G-code program",
+ source: "editor",
+ sourceLabel: "Editor text",
+ },
+ };
function setAllText(selector, value) {
document.querySelectorAll(selector).forEach((node) => {
@@ -738,6 +801,28 @@
return window.linuxCncRealSimulationState;
}
+ function setProgramEditorText(text, metadata = {}) {
+ programEditorState = {
+ text,
+ metadata: {
+ ...programEditorState.metadata,
+ ...metadata,
+ },
+ };
+ if (programEditor && programEditor.value !== text) {
+ programEditor.value = text;
+ }
+ setAllText("[data-program-editor-status]", programEditorState.metadata.sourceLabel ?? "Editor text");
+ return { ...programEditorState, metadata: { ...programEditorState.metadata } };
+ }
+
+ function getProgramEditorText() {
+ return {
+ text: programEditor?.value ?? programEditorState.text,
+ metadata: { ...programEditorState.metadata },
+ };
+ }
+
function stopPlayback() {
if (playbackTimer) {
clearInterval(playbackTimer);
@@ -809,6 +894,11 @@
try {
const state = await runRealBrowserSimulation({ documentRef: document, programId });
window.linuxCncRealSimulationState = state;
+ setProgramEditorText(state.programText, {
+ label: state.program?.label ?? "Built-in test program",
+ source: "builtin",
+ sourceLabel: state.program?.sourceLabel ?? "Built-in test program",
+ });
renderPlayback(0);
return state;
} finally {
@@ -838,6 +928,7 @@
filename: metadata.filename ?? null,
};
window.linuxCncRealSimulationState = state;
+ setProgramEditorText(programText, state.program);
document.body.dataset.simulationProgramId = "custom";
document.body.dataset.simulationProgramSource = state.program.source;
setAllText("[data-selected-program]", state.program.label);
@@ -860,6 +951,15 @@
});
}
+ async function runEditorProgramText() {
+ const { text, metadata } = getProgramEditorText();
+ return runProgramText(text, {
+ ...metadata,
+ source: "editor",
+ sourceLabel: "Editor text",
+ });
+ }
+
try {
const state = await runSelectedProgram(DEFAULT_SIMULATION_PROGRAM_ID);
window.linuxCncRealSimulationState = state;
@@ -872,6 +972,9 @@
play: startPlayback,
pause: stopPlayback,
finishPlayback: () => renderPlayback(currentState()?.motion.length - 1 ?? 0),
+ getProgramText: getProgramEditorText,
+ setProgramText: setProgramEditorText,
+ runEditorProgramText,
runProgramText,
loadProgramFile,
runProgramById: async (programId) => {
@@ -887,6 +990,24 @@
document.querySelector("[data-canonical-output]").textContent = error?.stack ?? error?.message ?? String(error);
});
});
+ runEditorButton?.addEventListener("click", () => {
+ window.linuxCncRealSimulationApi.runEditorProgramText().catch((error) => {
+ document.body.dataset.simulationReady = "false";
+ setAllText("[data-simulation-status]", "failed");
+ document.querySelector("[data-canonical-output]").textContent = error?.stack ?? error?.message ?? String(error);
+ });
+ });
+ programEditor?.addEventListener("input", () => {
+ programEditorState = {
+ text: programEditor.value,
+ metadata: {
+ ...programEditorState.metadata,
+ source: "editor",
+ sourceLabel: "Editor text",
+ },
+ };
+ setAllText("[data-program-editor-status]", "Editor text");
+ });
openProgramButton?.addEventListener("click", () => openProgramFile?.click());
openProgramFile?.addEventListener("change", () => {
const file = openProgramFile.files?.[0];
diff --git a/wasm-port/tests/browser/real_simulation_page_smoke.html b/wasm-port/tests/browser/real_simulation_page_smoke.html
index 9cec9fb..5ee1bac 100644
--- a/wasm-port/tests/browser/real_simulation_page_smoke.html
+++ b/wasm-port/tests/browser/real_simulation_page_smoke.html
@@ -78,6 +78,7 @@
"preview-dro",
"active-codes",
"gcode-pane",
+ "program-editor",
"machine-state",
"statusbar",
]) {
@@ -133,6 +134,9 @@
if (!api?.runProgramText || !api?.loadProgramFile) {
throw new Error("simulation API missing real G-code loading controls");
}
+ if (!api?.getProgramText || !api?.setProgramText || !api?.runEditorProgramText) {
+ throw new Error("simulation API missing editor text controls");
+ }
if (!api?.resetPlayback || !api?.stepPlayback || !api?.finishPlayback) {
throw new Error("simulation API missing playback controls");
}
@@ -143,6 +147,13 @@
if (!doc.querySelector("[data-open-program]") || !doc.querySelector("[data-open-program-file]")) {
throw new Error("simulation page missing open program controls");
}
+ if (!doc.querySelector("[data-program-editor]") || !doc.querySelector("[data-run-editor-program]")) {
+ throw new Error("simulation page missing editable G-code controls");
+ }
+ const initialEditor = api.getProgramText();
+ if (!initialEditor.text.includes("G1 X1 Y0 Z0 F100")) {
+ throw new Error("simulation editor did not receive initial built-in program text");
+ }
doc.querySelector('[data-axis-tab="mdi"]')?.click();
if (!doc.querySelector('[data-axis-panel="manual"]')?.hidden || doc.querySelector('[data-axis-panel="mdi"]')?.hidden) {
@@ -261,6 +272,9 @@
if (!doc.querySelector('[data-axis-shell="statusbar"]')?.textContent.includes("Operator pasted G-code")) {
throw new Error("custom text program source did not render in statusbar");
}
+ if (!api.getProgramText().text.includes("G1 X2.5 Y0.5 Z0 F75")) {
+ throw new Error("custom text program did not sync into editable G-code pane");
+ }
const fileProgram = new frame.contentWindow.File(
[customProgramText.replace("X2.5", "X3.25")],
@@ -275,6 +289,35 @@
if (!fileState.resultText.includes("canon_event=STRAIGHT_FEED line=2 x=3.25 y=0.5 z=0")) {
throw new Error("loaded file program did not execute changed G-code through LinuxCNC WASM");
}
+ if (!api.getProgramText().metadata.filename || !api.getProgramText().text.includes("G1 X3.25 Y0.5 Z0 F75")) {
+ throw new Error("loaded file program did not sync into editor state");
+ }
+
+ api.setProgramText(
+ [
+ "G90 G17 G0 X0 Y0 Z0",
+ "G1 X4.75 Y2.25 Z0 F95",
+ "M2",
+ "",
+ ].join("\n"),
+ {
+ label: "edited-in-axis-pane.ngc",
+ source: "editor",
+ sourceLabel: "Editor text",
+ },
+ );
+ const editorState = api.getProgramText();
+ if (!editorState.text.includes("X4.75") || editorState.metadata.label !== "edited-in-axis-pane.ngc") {
+ throw new Error("simulation editable G-code state did not accept setProgramText");
+ }
+ const editorRunState = await api.runEditorProgramText();
+ assertRenderedState(doc, editorRunState);
+ if (!editorRunState.resultText.includes("canon_event=STRAIGHT_FEED line=2 x=4.75 y=2.25 z=0")) {
+ throw new Error("editor G-code did not execute changed text through LinuxCNC WASM");
+ }
+ if (!doc.querySelector("[data-program-editor]")?.value.includes("X4.75")) {
+ throw new Error("editor DOM did not retain edited G-code text");
+ }
status.textContent = "browser_real_simulation_page_smoke=ok";
} catch (error) {