Dashboard: resize modules by mouse, overlays, link groups and colours in levels; read-only switch on phones
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2ea9fa32bc
commit
b82a6b90c6
8 files changed
+183
-60
No files matched your search
+87
-33
@@ -3,7 +3,7 @@
|
||||
// Dashboard: an overview page built from modules, stored by the server as `dashboard` in config.json.
|
||||
// Every module only looks: nothing here changes a DSP. Browsing (channel, EQ band) stays in this session.
|
||||
|
||||
const DASH_WIDTHS = [3, 4, 6, 8, 12];
|
||||
const DASH_ROW = 40; // grid row + gap in px, see .dash
|
||||
const DASH_DEFAULT = () => [
|
||||
{ type: "status", w: 4 }, { type: "meters", w: 8 },
|
||||
{ type: "curve", w: 8 }, { type: "mixer", w: 4 },
|
||||
@@ -57,7 +57,7 @@ function dashChannelNav(m, d, s) {
|
||||
|
||||
const DASH_MODULES = {
|
||||
status: {
|
||||
title: () => t("DSP overview"), w: 4, global: true,
|
||||
title: () => t("DSP overview"), w: 4, min: [3, 3], max: [12, 14], h: () => 2 + Math.ceil(dashDevs().length * 1.2), global: true,
|
||||
icon: '<rect x="3" y="4" width="18" height="6" rx="1.5"/><rect x="3" y="14" width="18" height="6" rx="1.5"/><path d="M7 7h.01M7 17h.01"/>',
|
||||
body() {
|
||||
const list = dashDevs();
|
||||
@@ -70,17 +70,18 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
meters: {
|
||||
title: () => t("Levels"), w: 8,
|
||||
title: () => t("Levels"), w: 8, min: [3, 5], max: [12, 14], h: 7,
|
||||
icon: '<path d="M5 20V10M10 20V4M15 20v-7M20 20V8"/>',
|
||||
body(m, d) {
|
||||
const col = (k, i) => h("div", { class: "dm" + (chans(d, k)[i].mute ? " muted" : ""), title: chTitle(d, k, i) },
|
||||
const col = (k, i) => h("div", { class: "dm" + (chans(d, k)[i].mute ? " muted" : ""), title: chTitle(d, k, i), style: `${ccStyle(d, k, i)};grid-column:${i + 1}` },
|
||||
ledMeter(d.id, k, i), k === "out" ? limLed(d.id, i) : h("span", { class: "limled ph", "aria-hidden": "true" }), h("small", {}, chLabel(k, i).replace("Out ", "").replace("In ", "")));
|
||||
const group = (k, label) => h("div", { class: "dmgroup", style: `flex-grow:${chans(d, k).length}` }, h("div", { class: "sub" }, label), h("div", { class: "dms" }, chans(d, k).map((_, i) => col(k, i))));
|
||||
return h("div", { class: "dmeters" }, group("in", t("Inputs")), group("out", t("Outputs")));
|
||||
const group = (k, label) => h("div", { class: "dmgroup", style: `flex-grow:${chans(d, k).length}` }, h("div", { class: "sub" }, label), h("div", { class: "dms", style: `--n:${chans(d, k).length}` }, linkBands(d, k), chans(d, k).map((_, i) => col(k, i))));
|
||||
const bands = linkedGroups(d, "in").length + linkedGroups(d, "out").length > 0;
|
||||
return h("div", { class: "dmeters" + (bands ? " hasbands" : "") }, group("in", t("Inputs")), group("out", t("Outputs")));
|
||||
},
|
||||
},
|
||||
mixer: {
|
||||
title: () => t("Faders"), w: 4,
|
||||
title: () => t("Faders"), w: 4, min: [3, 4], max: [8, 14], h: d => (d && d.state ? 2 + Math.ceil(dashChannels(d).length * 0.8) : 5),
|
||||
icon: '<path d="M6 3v18M12 3v18M18 3v18"/><rect x="3.5" y="13" width="5" height="3" rx="1"/><rect x="9.5" y="7" width="5" height="3" rx="1"/><rect x="15.5" y="10" width="5" height="3" rx="1"/>',
|
||||
body(m, d) {
|
||||
const row = (k, i) => {
|
||||
@@ -88,29 +89,33 @@ const DASH_MODULES = {
|
||||
return h("div", { class: "drow dgain" + (ch.mute ? " muted" : ""), style: ccStyle(d, k, i) },
|
||||
h("span", { class: "dlab" }, chLabel(k, i)),
|
||||
h("span", { class: "dbar" }, h("i", { style: `width:${ch.gain / 4}%` }), h("u")),
|
||||
h("span", { class: "dval" }, ch.mute ? "MUTE" : `${sign(gainDb(ch.gain))}`));
|
||||
h("span", { class: "dval" }, ch.mute ? "MUTE" : `${sign(gainDb(ch.gain))} dB`));
|
||||
};
|
||||
return h("div", { class: "dlist" }, chans(d, "in").map((_, i) => row("in", i)), h("hr"), chans(d, "out").map((_, i) => row("out", i)));
|
||||
},
|
||||
},
|
||||
curve: {
|
||||
title: () => t("Frequency response"), w: 8,
|
||||
title: () => t("Frequency response"), w: 8, min: [4, 7], max: [12, 16], h: 9,
|
||||
icon: '<path d="M2 14c3 0 3-7 6-7s3 10 6 10 3-6 6-6h2"/>',
|
||||
body(m, d) {
|
||||
const s = dashSel(m, d), ch = chans(d, s.kind)[s.idx];
|
||||
if (s.band >= ch.peq.length) s.band = 0;
|
||||
const canvas = h("canvas", { class: "dcurve" });
|
||||
const draw = () => drawCurve(canvas, ch, s.band, { mode: "mag", overlays: [] });
|
||||
requestAnimationFrame(draw);
|
||||
const shown = (m.cfg.overlays || []).map(key => {
|
||||
const k = key.startsWith("in") ? "in" : "out", i = +key.replace(/\D/g, "");
|
||||
return i < chans(d, k).length && !(k === s.kind && i === s.idx) ? { k, i, ch: chans(d, k)[i], color: chColor(d, k, i) } : null;
|
||||
}).filter(Boolean);
|
||||
requestAnimationFrame(() => drawCurve(canvas, ch, s.band, { mode: "mag", overlays: shown }));
|
||||
const b = ch.peq[s.band];
|
||||
return [dashChannelNav(m, d, s), canvas,
|
||||
shown.length ? h("div", { class: "dlegend" }, shown.map(o => h("span", {}, h("i", { style: `background:${o.color}` }), chLabel(o.k, o.i)))) : null,
|
||||
h("div", { class: "dbands" }, ch.peq.map((bb, i) => h("button", { class: "dband" + (i === s.band ? " on" : "") + (bb.bypass ? " off" : "") + (bb.gain !== 120 ? " act" : ""), "data-view-ok": "",
|
||||
onclick: () => { s.band = i; render(); } }, h("b", {}, i + 1), h("small", {}, fmtHzShort(freqHz(bb.freq)))))),
|
||||
h("p", { class: "info dbandinfo" }, `${PEQ_TYPES[b.type]} · ${SPEC.freq.fmt(b.freq)} · ${sign((b.gain - 120) / 10)} dB · Q ${Q_TABLE[b.q]}${b.bypass ? " · Bypass" : ""}`)];
|
||||
},
|
||||
},
|
||||
channel: {
|
||||
title: () => t("Channel"), w: 4,
|
||||
title: () => t("Channel"), w: 4, min: [3, 6], max: [8, 12], h: 9,
|
||||
icon: '<circle cx="12" cy="12" r="8"/><path d="M12 8v4l3 2"/>',
|
||||
body(m, d) {
|
||||
const s = dashSel(m, d), ch = chans(d, s.kind)[s.idx];
|
||||
@@ -129,7 +134,7 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
limiter: {
|
||||
title: () => "Limiter", w: 4,
|
||||
title: () => "Limiter", w: 4, min: [3, 3], max: [8, 12], h: d => (d && d.state ? 2 + Math.ceil(chans(d, "out").length * 0.8) : 5),
|
||||
icon: '<path d="M2 7h20" stroke-dasharray="2.5 2.5"/><path d="M2 14c2 0 3-7 5-7h3c2 0 3 11 6 11s3-5 6-5"/>',
|
||||
body(m, d) {
|
||||
return h("div", { class: "dlist" }, chans(d, "out").map((ch, o) => {
|
||||
@@ -141,7 +146,7 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
routing: {
|
||||
title: () => "Routing", w: 4,
|
||||
title: () => "Routing", w: 4, min: [3, 3], max: [8, 12], h: d => (d && d.state ? 2 + Math.ceil((chans(d, "out").length + 1) * 0.5) : 5),
|
||||
icon: '<path d="M4 6h16M4 12h16M4 18h16M8 3v18M16 3v18"/>',
|
||||
body(m, d) {
|
||||
const ins = chans(d, "in");
|
||||
@@ -152,7 +157,7 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
delays: {
|
||||
title: () => "Delay", w: 4,
|
||||
title: () => "Delay", w: 4, min: [3, 3], max: [8, 14], h: d => (d && d.state ? 2 + Math.ceil(dashChannels(d).length * 0.8) : 5),
|
||||
icon: '<circle cx="12" cy="13" r="8"/><path d="M12 9v4l2 2M9 2h6"/>',
|
||||
body(m, d) {
|
||||
const row = (k, i) => {
|
||||
@@ -163,7 +168,7 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
fir: {
|
||||
title: () => t("FIR filters"), w: 4, only: () => dashDevs().some(d => d.fir),
|
||||
title: () => t("FIR filters"), w: 4, min: [3, 3], max: [8, 12], h: 5, only: () => dashDevs().some(d => d.fir),
|
||||
icon: '<path d="M2 12h3l2-7 3 14 3-11 2 6 2-3 1 1h4"/>',
|
||||
body(m, d) {
|
||||
if (!d.fir) return h("p", { class: "info dempty" }, t("{name} has no FIR filters.", { name: d.name }));
|
||||
@@ -179,7 +184,7 @@ const DASH_MODULES = {
|
||||
},
|
||||
},
|
||||
notes: {
|
||||
title: () => t("Notes"), w: 4, global: true,
|
||||
title: () => t("Notes"), w: 4, min: [2, 2], max: [12, 14], h: 4, global: true,
|
||||
icon: '<path d="M5 3h14v18H5zM9 8h6M9 12h6M9 16h3"/>',
|
||||
body(m) { return m.cfg.text ? h("p", { class: "dnote" }, m.cfg.text) : h("p", { class: "info dempty" }, t("Empty – add text in the module settings.")); },
|
||||
},
|
||||
@@ -202,14 +207,28 @@ async function dashSettings(m) {
|
||||
const title = h("input", { type: "text", maxlength: 40, value: m.cfg.title || "", placeholder: def.title() });
|
||||
const dev_ = def.global ? null : h("select", {}, dashDevs().map(x => h("option", { value: x.id, selected: x === d }, x.name)));
|
||||
const text = m.type === "notes" ? h("textarea", { rows: 6, maxlength: 2000 }, m.cfg.text || "") : null;
|
||||
// channels drawn over the curve: fixed per module, whichever channel is being looked at
|
||||
const overlays = new Set(m.cfg.overlays || []);
|
||||
const overlayBox = m.type === "curve" ? h("div", { class: "doverlays" }) : null;
|
||||
const fillOverlays = () => {
|
||||
const x = S.devices[dev_.value];
|
||||
if (!x || !x.state) return overlayBox.replaceChildren(h("p", { class: "info" }, t("{name} is not connected.", { name: x ? x.name : "DSP" })));
|
||||
overlayBox.replaceChildren(...dashChannels(x).map(([k, i]) => {
|
||||
const key = k + i, box = h("input", { type: "checkbox", checked: overlays.has(key), onchange: () => (box.checked ? overlays.add(key) : overlays.delete(key)) });
|
||||
return h("label", { class: "chk", style: `--c:${chColor(x, k, i)}` }, box, h("i"), chLabel(k, i));
|
||||
}));
|
||||
};
|
||||
if (overlayBox) { fillOverlays(); dev_.addEventListener("change", fillOverlays); }
|
||||
const res = await modal({ title: def.title(),
|
||||
body: h("div", { class: "form dform" }, h("label", { class: "full" }, t("Title"), title),
|
||||
dev_ ? h("label", { class: "full" }, "DSP", dev_) : null, text ? h("label", { class: "full" }, t("Text"), text) : null),
|
||||
dev_ ? h("label", { class: "full" }, "DSP", dev_) : null, text ? h("label", { class: "full" }, t("Text"), text) : null,
|
||||
overlayBox ? h("div", { class: "full" }, h("div", { class: "sub" }, t("Show on top of the curve")), overlayBox) : null),
|
||||
actions: [{ label: t("Cancel") }, { label: t("Save"), primary: true, value: () => true }] });
|
||||
if (!res) return;
|
||||
m.cfg = { ...m.cfg, title: title.value.trim() };
|
||||
if (dev_) m.cfg.device = dev_.value;
|
||||
if (text) m.cfg.text = text.value;
|
||||
if (overlayBox) m.cfg.overlays = [...overlays];
|
||||
dashBrowse.delete(m.id);
|
||||
dashSave(); render();
|
||||
}
|
||||
@@ -222,8 +241,8 @@ function dashDrag(ev, source, el) {
|
||||
const start = () => {
|
||||
S.busy = true;
|
||||
grid = $("#main .dash");
|
||||
const w = source.mod ? source.mod.w : DASH_MODULES[source.type].w;
|
||||
ph = h("div", { class: `dmod dph w${w}` });
|
||||
const size = source.mod || { type: source.type, w: DASH_MODULES[source.type].w, cfg: {} };
|
||||
ph = h("div", { class: "dmod dph", style: dashSizeStyle(size.w, dashHeight(size, source.mod ? dashDev(size) : dashDevs()[0])) });
|
||||
const r = el.getBoundingClientRect();
|
||||
ghost = (source.mod ? el.closest(".dmod") : el).cloneNode(true);
|
||||
ghost.classList.add("dghost");
|
||||
@@ -275,6 +294,36 @@ function dashPalette() {
|
||||
|
||||
// ------------------------------------------------------------------ page
|
||||
|
||||
const dashSizeStyle = (w, rows) => `--w:${w};--wt:${w < 6 ? 6 : 12};--h:${rows}`;
|
||||
const dashLimit = (m, axis, v) => clamp(v, DASH_MODULES[m.type].min[axis], DASH_MODULES[m.type].max[axis]);
|
||||
// rows: chosen by the user, or what the module needs on this DSP
|
||||
function dashHeight(m, d) {
|
||||
const def = DASH_MODULES[m.type];
|
||||
return dashLimit(m, 1, m.h || (typeof def.h === "function" ? def.h(d) : def.h));
|
||||
}
|
||||
|
||||
function dashResizeStart(ev, m, el, axes) {
|
||||
ev.preventDefault(); ev.stopPropagation();
|
||||
const grid = $("#main .dash"), col = (grid.clientWidth + 10) / 12, sx = ev.clientX, sy = ev.clientY;
|
||||
const w0 = m.w, h0 = dashHeight(m, dashDev(m));
|
||||
let w = w0, rows = h0;
|
||||
S.busy = true;
|
||||
document.body.classList.add("dresizing");
|
||||
const move = e => {
|
||||
if (axes.includes("w")) w = dashLimit(m, 0, w0 + Math.round((e.clientX - sx) / col));
|
||||
if (axes.includes("h")) rows = dashLimit(m, 1, h0 + Math.round((e.clientY - sy) / DASH_ROW));
|
||||
el.setAttribute("style", dashSizeStyle(w, rows));
|
||||
};
|
||||
const end = () => {
|
||||
window.removeEventListener("pointermove", move); window.removeEventListener("pointerup", end); window.removeEventListener("pointercancel", end);
|
||||
document.body.classList.remove("dresizing");
|
||||
S.busy = false;
|
||||
if (w !== w0 || rows !== h0) { m.w = w; m.h = rows; dashSave(); }
|
||||
render();
|
||||
};
|
||||
window.addEventListener("pointermove", move); window.addEventListener("pointerup", end); window.addEventListener("pointercancel", end);
|
||||
}
|
||||
|
||||
function dashModule(m) {
|
||||
const def = DASH_MODULES[m.type];
|
||||
if (!def) return null;
|
||||
@@ -287,32 +336,37 @@ function dashModule(m) {
|
||||
body = h("p", { class: "info dempty" }, t("This module can't show this DSP."));
|
||||
}
|
||||
const controls = dashEdit ? (() => {
|
||||
const steps = DASH_WIDTHS, at = Math.max(0, steps.indexOf(m.w));
|
||||
const size = dir => { m.w = steps[clamp(at + dir, 0, steps.length - 1)]; dashSave(); render(); };
|
||||
const grip = h("button", { class: "small dgrip", title: t("Drag to move"), "aria-label": t("Drag to move") }, "⠿");
|
||||
grip.addEventListener("pointerdown", e => dashDrag(e, { mod: m }, grip));
|
||||
return h("div", { class: "dctl" }, grip,
|
||||
h("button", { class: "small", disabled: at === 0, "aria-label": t("Narrower"), title: t("Narrower"), onclick: () => size(-1) }, "−"),
|
||||
h("button", { class: "small", disabled: at === steps.length - 1, "aria-label": t("Wider"), title: t("Wider"), onclick: () => size(1) }, "+"),
|
||||
return h("div", { class: "dctl" },
|
||||
h("button", { class: "small", "aria-label": t("Module settings"), title: t("Module settings"), onclick: () => dashSettings(m) }, "⚙"),
|
||||
h("button", { class: "small danger", "aria-label": t("Remove"), title: t("Remove"), onclick: () => {
|
||||
dashMods().splice(dashMods().indexOf(m), 1); dashSave(); render();
|
||||
} }, "×"));
|
||||
})() : null;
|
||||
return h("section", { class: `card dmod w${m.w} dt-${m.type}` },
|
||||
h("h3", {}, svgIcon(def.icon), h("span", { class: "grow dtitle" }, m.cfg.title || def.title()),
|
||||
d && dashDevs().length > 1 ? h("small", { class: "ddev" }, d.name) : null, controls),
|
||||
body);
|
||||
const head = h("h3", { title: dashEdit ? t("Drag to move") : null }, svgIcon(def.icon), h("span", { class: "grow dtitle" }, m.cfg.title || def.title()),
|
||||
d && dashDevs().length > 1 ? h("small", { class: "ddev" }, d.name) : null, controls);
|
||||
const el = h("section", { class: `card dmod dt-${m.type}`, style: dashSizeStyle(m.w, dashHeight(m, d)) },
|
||||
head, h("div", { class: "dbody" }, body));
|
||||
if (dashEdit) {
|
||||
head.addEventListener("pointerdown", e => { if (!e.target.closest("button")) dashDrag(e, { mod: m }, head); });
|
||||
const handle = (axes, cls, arrow, label) => {
|
||||
const g = h("span", { class: "dgrab " + cls, title: label }, arrow);
|
||||
g.addEventListener("pointerdown", e => dashResizeStart(e, m, el, axes));
|
||||
return g;
|
||||
};
|
||||
el.append(handle("w", "de", "↔", t("Drag to resize")), handle("h", "ds", "↕", t("Drag to resize")), handle("wh", "dse", "↘", t("Drag to resize")));
|
||||
}
|
||||
return el;
|
||||
}
|
||||
|
||||
function viewDash() {
|
||||
if (viewOnly()) dashEdit = false;
|
||||
const mods = dashMods();
|
||||
return [
|
||||
h("div", { class: "dhead" }, h("h2", {}, "Dashboard"),
|
||||
S.locked ? null : h("button", { class: dashEdit ? "on" : "", onclick: () => { dashEdit = !dashEdit; render(); } }, dashEdit ? t("Done") : t("Customise"))),
|
||||
viewOnly() ? null : h("button", { class: dashEdit ? "on" : "", onclick: () => { dashEdit = !dashEdit; render(); } }, dashEdit ? t("Done") : t("Customise"))),
|
||||
dashEdit ? dashPalette() : null,
|
||||
mods.length ? h("div", { class: "dash" + (dashEdit ? " editing" : "") }, mods.map(dashModule))
|
||||
: h("div", { class: "dash" + (dashEdit ? " editing" : "") }, h("div", { class: "dmod w12 dblank" }, t("Nothing here yet – press “Customise” and add modules."))),
|
||||
: h("div", { class: "dash" + (dashEdit ? " editing" : "") }, h("div", { class: "dmod dblank", style: dashSizeStyle(12, 4) }, t("Nothing here yet – press “Customise” and add modules."))),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user