three-slicer-viewer 0.3.1 → 0.3.2

package/VIEWER.md

@@ -95,7 +95,8 @@ Every panel can be switched off, and the values the component owns can be seeded
   resin masks on a filament bed. The one number it cannot supply is the display's PHYSICAL size: millimetres
   appear nowhere in an SL1, so the preview is scaled by the printer set in the viewer and the import notice says
   so. Export hands an imported archive back byte-identical rather than re-rasterizing empty geometry.
-- **`gcode`** — G-code text drawn on the selected plate instead of a slice result. `parseGcode` recovers roles from
+- **`gcode`** — G-code text drawn on the selected plate instead of a slice result, or a `{ plateIndex: text }` map
+  drawn plate by plate (what an opened `.gcode.3mf` becomes; the viewer is preview-only while one is shown). `parseGcode` recovers roles from
   `;TYPE:` (OrcaSlicer/PrusaSlicer/Cura), from `;_EXTRUSION_ROLE:` tags and from this kernel's own feature comments;
   bead width comes from `;WIDTH:` or, absent that, from E. What the file never states cannot be recovered: an
   unmarked run reads as wall, and there is no print-time estimate (that needs the machine's acceleration limits).

package/dist/gcode_parse.js

@@ -1,6 +1,32 @@
-import { D as at, a as rt } from "./viewer_defaults-B7UUZ582.js";
-import { R as t, e as B } from "./toolpath_encoding-BuYs95qZ.js";
-const F = 1e-6, lt = {
+import { D as Lt, a as Nt } from "./viewer_defaults-B7UUZ582.js";
+import { R as t, e as Z } from "./toolpath_encoding-BuYs95qZ.js";
+import { T as ft } from "./toolpath_palette-B8xEl-qa.js";
+const F = 1e-6, Rt = 254, It = /^(filament|extruder)_colour\s*=\s*(.*)$/i, ut = (i) => i.split(/[;,]/).map((r) => {
+  const s = /^"?#?([0-9a-f]{6})(?:[0-9a-f]{2})?"?$/i.exec(r.trim());
+  return s ? "#" + s[1].toUpperCase() : null;
+}), At = (i) => "#" + ft[i % ft.length].map((r) => Math.round(r * 255).toString(16).padStart(2, "0")).join("");
+function gt(i, r) {
+  let s = [];
+  Array.isArray(i?.colors) && (s = i.colors);
+  const g = r ?? [], u = Math.max(s.length, g.length, i?.filament_mm_by_tool?.length ?? 0);
+  return Array.from({ length: u }, (m, c) => s[c] || g[c] || At(c));
+}
+function wt(i, r) {
+  return dt(i.gcode, gt(i.stats, r));
+}
+function dt(i, r) {
+  const s = String(i ?? ""), g = [r].flat().filter(Boolean);
+  if (!g.length || /^;\s*filament_colour\s*=/mi.test(s)) return s;
+  const u = "; filament_colour = " + g.join(";") + `
+`, m = s.lastIndexOf(`
+; CONFIG_BLOCK_END`);
+  if (m >= 0) return s.slice(0, m + 1) + u + s.slice(m + 1);
+  let c = `
+`;
+  return (!s || s.endsWith(`
+`)) && (c = ""), s + c + u;
+}
+const St = {
   // OrcaSlicer / PrusaSlicer ;TYPE: names
   "outer wall": t.WALL,
   "external perimeter": t.WALL,
@@ -43,7 +69,7 @@ const F = 1e-6, lt = {
   skin: t.SOLID,
   "support-interface": t.SUPPORT,
   "prime-tower": t.PRIME
-}, ot = [
+}, Pt = [
   ["skirt/brim", t.SKIRT],
   ["skirt", t.SKIRT],
   ["walls", t.WALL],
@@ -54,7 +80,7 @@ const F = 1e-6, lt = {
   ["support", t.SUPPORT],
   ["prime tower", t.PRIME],
   ["wipe_tower_real", t.PRIME]
-], ct = (I, f) => I === f || f.length < I.length && " (:/".includes(I[f.length]) && I.startsWith(f), ft = {
+], Et = (i, r) => i === r || r.length < i.length && " (:/".includes(i[r.length]) && i.startsWith(r), Ot = {
   1: t.WALL,
   2: t.WALL,
   3: t.WALL,
@@ -73,120 +99,136 @@ const F = 1e-6, lt = {
   16: t.SUPPORT,
   17: t.PRIME
 };
-function Lt(I, f = {}) {
-  const it = Math.PI / 4 * (f.filamentDiameter > 0 ? f.filamentDiameter : at) ** 2, nt = f.defaultLayerHeight > 0 ? f.defaultLayerHeight : rt;
-  let p = 0, u = 0, h = 0, G = 0, d = !0, O = !0, w = 0, T = t.WALL, W = 0, L = null;
-  const P = [];
-  let b = !1, D = !0, K = NaN, z = 0, H = 0, k = 0;
-  const Y = /* @__PURE__ */ new Set([0]), y = (a) => {
-    L = { z: a, p: [], w: [] }, P.push(L), D = !1, K = NaN, T = t.WALL, W = 0;
-  }, st = () => P.length > 1 ? P[P.length - 2].z : 0, Z = (a, c, R, A, m, i, e) => {
-    const r = Math.hypot(A - a, m - c, i - R);
-    if (!(r < F))
+function Gt(i, r = {}) {
+  const s = Math.PI / 4 * (r.filamentDiameter > 0 ? r.filamentDiameter : Lt) ** 2, g = r.defaultLayerHeight > 0 ? r.defaultLayerHeight : Nt;
+  let u = 0, m = 0, c = 0, b = 0, _ = !0, W = !0, d = 0, w = t.WALL, y = 0, R = null;
+  const E = [];
+  let D = !1, x = !0, K = NaN, q = 0, X = 0, $ = 0;
+  const v = /* @__PURE__ */ new Set([0]), H = [];
+  let z = [], k = [], j = !1;
+  const V = () => {
+    w = t.WALL, y = 0;
+  }, U = (o, a = !1) => {
+    R = { z: o, p: [], w: [] }, E.push(R), x = !1, K = NaN, (a || !j) && V();
+  }, mt = () => E.length > 1 ? E[E.length - 2].z : 0, J = (o, a, S, P, A, n, e) => {
+    const p = Math.hypot(P - o, A - a, n - S);
+    if (!(p < F))
       if (e > F) {
-        k += e, D ? y(Number.isNaN(K) ? i : K) : !b && i > L.z + 1e-3 && y(i);
-        const l = B(T, w);
-        L.p.push(a, c, R, l, A, m, i, l);
-        const n = Math.max(0.02, L.z - st() || nt), _ = W > 0 ? W : e * it / (r * n) + n * (1 - Math.PI / 4);
-        L.w.push(Math.min(3, Math.max(0.05, _))), z++;
-      } else L && (L.p.push(a, c, R, B(t.TRAVEL, w), A, m, i, B(t.TRAVEL, w)), L.w.push(0), H++);
+        $ += e, H[d] = (H[d] ?? 0) + e, x ? U(Number.isNaN(K) ? n : K) : !D && n > R.z + 1e-3 && U(n);
+        const h = Z(w, d);
+        R.p.push(o, a, S, h, P, A, n, h);
+        const f = Math.max(0.02, R.z - mt() || g), L = y > 0 ? y : e * s / (p * f) + f * (1 - Math.PI / 4);
+        R.w.push(Math.min(3, Math.max(0.05, L))), q++;
+      } else R && (R.p.push(o, a, S, Z(t.TRAVEL, d), P, A, n, Z(t.TRAVEL, d)), R.w.push(0), X++);
   };
-  for (const a of I.split(`
+  for (const o of i.split(`
 `)) {
-    const c = a.indexOf(";"), R = (c < 0 ? a : a.slice(0, c)).trim(), A = c < 0 ? "" : a.slice(c + 1).trim();
-    if (A && !R) {
-      const e = A.toLowerCase();
+    const a = o.indexOf(";"), S = (a < 0 ? o : o.slice(0, a)).trim(), P = a < 0 ? "" : o.slice(a + 1).trim();
+    if (P && !S) {
+      const e = P.toLowerCase(), p = It.exec(P);
+      if (p) {
+        p[1].toLowerCase() === "filament" ? z = ut(p[2]) : k = ut(p[2]);
+        continue;
+      }
       if (e.startsWith("type:")) {
-        T = lt[e.slice(5).trim()] ?? t.WALL;
+        w = St[e.slice(5).trim()] ?? t.WALL, j = !0;
         continue;
       }
       if (e.startsWith("_extrusion_role:")) {
-        T = ft[parseInt(e.slice(16), 10)] ?? t.WALL;
+        w = Ot[parseInt(e.slice(16), 10)] ?? t.WALL, j = !0;
         continue;
       }
       if (e.startsWith("width:")) {
-        const n = parseFloat(e.slice(6));
-        W = n > 0 ? n : 0;
+        const L = parseFloat(e.slice(6));
+        y = L > 0 ? L : 0;
         continue;
       }
       if (e.startsWith("layer_change") || e.startsWith("layer:")) {
-        b = !0, D = !0;
+        D = !0, x = !0, V();
         continue;
       }
       if (e.startsWith("z:")) {
-        const n = parseFloat(e.slice(2));
-        D && n > 0 && (b = !0, y(n));
+        const L = parseFloat(e.slice(2));
+        x && L > 0 && (D = !0, U(L));
         continue;
       }
-      const r = /^layer \d+ z([-\d.]+)/.exec(e);
-      if (r) {
-        b = !0, y(parseFloat(r[1]));
+      const h = /^layer \d+ z([-\d.]+)/.exec(e);
+      if (h) {
+        D = !0, U(parseFloat(h[1]), !0);
         continue;
       }
-      const l = ot.find(([n]) => ct(e, n));
-      l && (T = l[1]);
+      const f = Pt.find(([L]) => Et(e, L));
+      f && (w = f[1]);
       continue;
     }
-    if (!R) continue;
-    const m = R.split(/\s+/), i = m[0].toUpperCase();
-    if (i === "G90") {
-      d = !0;
+    if (!S) continue;
+    const A = S.split(/\s+/), n = A[0].toUpperCase();
+    if (n === "G90") {
+      _ = !0;
       continue;
     }
-    if (i === "G91") {
-      d = !1;
+    if (n === "G91") {
+      _ = !1;
       continue;
     }
-    if (i === "M82") {
-      O = !0;
+    if (n === "M82") {
+      W = !0;
       continue;
     }
-    if (i === "M83") {
-      O = !1;
+    if (n === "M83") {
+      W = !1;
       continue;
     }
-    if (/^T\d+$/.test(i)) {
-      w = parseInt(i.slice(1), 10), Y.add(w);
+    if (/^T\d+$/.test(n)) {
+      const e = parseInt(n.slice(1), 10);
+      e <= Rt && (d = e, v.add(d));
       continue;
     }
-    if (i === "G92" || i === "G0" || i === "G1" || i === "G2" || i === "G3") {
-      let e = NaN, r = NaN, l = NaN, n = NaN, _ = 0, q = 0;
-      for (let N = 1; N < m.length; N++) {
-        const s = m[N][0], o = parseFloat(m[N].slice(1));
-        Number.isNaN(o) || (s === "X" || s === "x" ? e = o : s === "Y" || s === "y" ? r = o : s === "Z" || s === "z" ? l = o : s === "E" || s === "e" ? n = o : s === "I" || s === "i" ? _ = o : (s === "J" || s === "j") && (q = o));
+    if (n === "G92" || n === "G0" || n === "G1" || n === "G2" || n === "G3") {
+      let e = NaN, p = NaN, h = NaN, f = NaN, L = 0, tt = 0;
+      for (let I = 1; I < A.length; I++) {
+        const l = A[I][0], N = parseFloat(A[I].slice(1));
+        Number.isNaN(N) || (l === "X" || l === "x" ? e = N : l === "Y" || l === "y" ? p = N : l === "Z" || l === "z" ? h = N : l === "E" || l === "e" ? f = N : l === "I" || l === "i" ? L = N : (l === "J" || l === "j") && (tt = N));
       }
-      if (i === "G92") {
-        Number.isNaN(e) || (p = e), Number.isNaN(r) || (u = r), Number.isNaN(l) || (h = l), Number.isNaN(n) || (G = n);
+      if (n === "G92") {
+        Number.isNaN(e) || (u = e), Number.isNaN(p) || (m = p), Number.isNaN(h) || (c = h), Number.isNaN(f) || (b = f);
         continue;
       }
-      const U = Number.isNaN(e) ? p : d ? e : p + e, x = Number.isNaN(r) ? u : d ? r : u + r, v = Number.isNaN(l) ? h : d ? l : h + l, j = Number.isNaN(n) ? 0 : O ? n - G : n;
-      if (i === "G2" || i === "G3") {
-        const N = p + _, s = u + q, o = Math.hypot(p - N, u - s), g = Math.atan2(u - s, p - N);
-        let S = Math.atan2(x - s, U - N);
-        const C = i === "G3";
-        C && S <= g + F && (S += 2 * Math.PI), !C && S >= g - F && (S -= 2 * Math.PI);
-        const E = Math.max(1, Math.min(360, Math.ceil(Math.abs(S - g) * o / 0.3)));
-        let V = p, X = u, J = h;
-        for (let M = 1; M <= E; M++) {
-          const $ = g + (S - g) * M / E, Q = M === E ? U : N + o * Math.cos($), tt = M === E ? x : s + o * Math.sin($), et = h + (v - h) * M / E;
-          Z(V, X, J, Q, tt, et, j / E), V = Q, X = tt, J = et;
+      const C = Number.isNaN(e) ? u : _ ? e : u + e, B = Number.isNaN(p) ? m : _ ? p : m + p, Y = Number.isNaN(h) ? c : _ ? h : c + h, et = Number.isNaN(f) ? 0 : W ? f - b : f;
+      if (n === "G2" || n === "G3") {
+        const I = u + L, l = m + tt, N = Math.hypot(u - I, m - l), G = Math.atan2(m - l, u - I);
+        let O = Math.atan2(B - l, C - I);
+        const nt = n === "G3";
+        nt && O <= G + F && (O += 2 * Math.PI), !nt && O >= G - F && (O -= 2 * Math.PI);
+        const M = Math.max(1, Math.min(360, Math.ceil(Math.abs(O - G) * N / 0.3)));
+        let it = u, rt = m, ot = c;
+        for (let T = 1; T <= M; T++) {
+          const st = G + (O - G) * T / M, at = T === M ? C : I + N * Math.cos(st), lt = T === M ? B : l + N * Math.sin(st), ct = c + (Y - c) * T / M;
+          J(it, rt, ot, at, lt, ct, et / M), it = at, rt = lt, ot = ct;
         }
       } else
-        Z(p, u, h, U, x, v, j);
-      p = U, u = x, h = v, Number.isNaN(n) || (G = O ? n : G + n);
+        J(u, m, c, C, B, Y, et);
+      u = C, m = B, c = Y, Number.isNaN(f) || (b = W ? f : b + f);
     }
   }
+  const pt = Math.max(z.length, k.length), Q = Array.from({ length: pt }, (o, a) => k[a] || z[a] || null), ht = Array.from({ length: Math.max(...v) + 1 }, (o, a) => H[a] || 0);
   return {
-    layers: P.map((a) => ({ z: a.z, paths: Float32Array.from(a.p), widths: Float32Array.from(a.w) })),
+    layers: E.map((o) => ({ z: o.z, paths: Float32Array.from(o.p), widths: Float32Array.from(o.w) })),
     stats: {
-      layers: P.length,
-      path_segments: z,
-      travel_segments: H,
-      filament_mm: k,
-      tools: [...Y].sort((a, c) => a - c)
+      layers: E.length,
+      path_segments: q,
+      travel_segments: X,
+      filament_mm: $,
+      tools: [...v].sort((o, a) => o - a),
+      // The kernel's own stat name, so the Filament-view switch and the stats card's per-tool split work unchanged.
+      filament_mm_by_tool: ht,
+      ...Q.some(Boolean) && { colors: Q }
     }
   };
 }
 export {
-  Lt as parseGcode
+  wt as exportedGcode,
+  Gt as parseGcode,
+  gt as resultToolColors,
+  dt as withFilamentColours
 };