[feat](trx-frontend-http): vchan freq display sync, BW accent, scheduler multi-channel

Virtual channel display: - vchan.js: wrap refreshFreqDisplay() so the main freq field always shows the active virtual channel's frequency instead of channel 0's; expose vchanSyncAccentUI() to add vchan-ch-active CSS class (colored border) to #freq and #spectrum-bw-input when on a non-primary channel - style.css: --vchan-color (#38bdf8 sky-blue), .vchan-ch-active box-shadow, vchan-picker active button left-border accent Scheduler multi-channel slots: - scheduler.rs: add center_hz (Option<u64>) and bookmark_ids (Vec<String>) to ScheduleEntry; SchedulerStatus gains last_center_hz and last_bookmark_ids; background task sends SetCenterFreq before SetFreq when center_hz is set and records extra bookmark_ids in status - scheduler.js: center-freq input and extra-channel bookmark picker (tag list with + / × buttons) in the add-entry form; extra channels shown in the entries table - index.html: center freq field + extra bookmark picker widgets; table gains Center freq and Extra channels columns Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Stan Grams <sjg@haxx.space>
2026-03-11 07:22:36 +01:00
parent cef1741e40
commit af45c32222
5 changed files with 209 additions and 16 deletions
@@ -279,10 +279,17 @@
      const tr = document.createElement("tr");
      const il = entry.interleave_min ? String(entry.interleave_min) + " min" : "—";
      const allDay = entry.start_min === entry.end_min;
+      const centerCell = entry.center_hz ? formatFreq(entry.center_hz) : "—";
+      const extraIds = Array.isArray(entry.bookmark_ids) ? entry.bookmark_ids : [];
+      const extraCell = extraIds.length
+        ? extraIds.map(function (id) { return escHtml(bmName(id)); }).join(", ")
+        : "—";
      tr.innerHTML =
        '<td>' + (allDay ? "All day" : minToHHMM(entry.start_min)) + '</td>' +
        '<td>' + (allDay ? "—" : minToHHMM(entry.end_min)) + '</td>' +
+        '<td>' + centerCell + '</td>' +
        '<td>' + bmName(entry.bookmark_id) + '</td>' +
+        '<td>' + extraCell + '</td>' +
        '<td>' + escHtml(entry.label || "") + '</td>' +
        '<td>' + il + '</td>' +
        '<td><button class="sch-write sch-remove-btn" data-idx="' + idx + '" type="button">Remove</button></td>';
@@ -334,6 +341,7 @@
    const bmEl = document.getElementById("scheduler-ts-bookmark");
    const labelEl = document.getElementById("scheduler-ts-label");
    const ilEl = document.getElementById("scheduler-ts-entry-interleave");
+    const centerHzEl = document.getElementById("scheduler-ts-center-hz");
    if (!startEl || !endEl || !bmEl) return;

    const startMin = hhmmToMin(startEl.value);
@@ -342,9 +350,12 @@
    const label = labelEl ? labelEl.value.trim() : "";
    const ilVal = ilEl ? parseInt(ilEl.value, 10) : NaN;
    const entryInterleave = !isNaN(ilVal) && ilVal > 0 ? ilVal : null;
+    const centerHzRaw = centerHzEl ? parseInt(centerHzEl.value, 10) : NaN;
+    const centerHz = !isNaN(centerHzRaw) && centerHzRaw > 0 ? centerHzRaw : null;
+    const extraBmIds = pendingExtraBmIds.slice();

    if (!bmId) {
-      alert("Please select a bookmark.");
+      alert("Please select a primary bookmark.");
      return;
    }

@@ -361,6 +372,8 @@
      bookmark_id: bmId,
      label: label || null,
      interleave_min: entryInterleave,
+      center_hz: centerHz,
+      bookmark_ids: extraBmIds,
    });

    startEl.value = "";
@@ -368,6 +381,9 @@
    bmEl.value = "";
    if (labelEl) labelEl.value = "";
    if (ilEl) ilEl.value = "";
+    if (centerHzEl) centerHzEl.value = "";
+    pendingExtraBmIds = [];
+    renderExtraBmList();

    renderTimespanEntries();
  }
@@ -497,21 +513,64 @@
    const addBtn = document.getElementById("scheduler-ts-add-btn");
    if (addBtn) addBtn.addEventListener("click", addEntry);

+    wireExtraBmAdd();
  }

  function populateTsBookmarkSelect() {
    const sel = document.getElementById("scheduler-ts-bookmark");
-    if (!sel) return;
-    const prev = sel.value;
-    sel.innerHTML = '<option value="">— select bookmark —</option>';
-    bookmarkList.forEach(function (bm) {
-      const opt = document.createElement("option");
-      opt.value = bm.id;
-      opt.textContent = bm.name + " (" + formatFreq(bm.freq_hz) + " " + bm.mode + ")";
-      sel.appendChild(opt);
+    const extraSel = document.getElementById("scheduler-ts-extra-bm-pick");
+    [sel, extraSel].forEach(function (el) {
+      if (!el) return;
+      const prev = el.value;
+      el.innerHTML = '<option value="">— select bookmark —</option>';
+      bookmarkList.forEach(function (bm) {
+        const opt = document.createElement("option");
+        opt.value = bm.id;
+        opt.textContent = bm.name + " (" + formatFreq(bm.freq_hz) + " " + bm.mode + ")";
+        el.appendChild(opt);
+      });
+      if (prev) el.value = prev;
+    });
+  }
+
+  // Pending extra bookmark IDs for the entry being composed in the add form.
+  let pendingExtraBmIds = [];
+
+  function renderExtraBmList() {
+    const container = document.getElementById("scheduler-ts-extra-bm-list");
+    if (!container) return;
+    container.innerHTML = "";
+    pendingExtraBmIds.forEach(function (id, idx) {
+      const bm = bookmarkList.find(function (b) { return b.id === id; });
+      const tag = document.createElement("span");
+      tag.className = "sch-extra-bm-tag";
+      tag.textContent = bm ? bm.name : id;
+      const rm = document.createElement("span");
+      rm.className = "sch-extra-bm-rm";
+      rm.textContent = "×";
+      rm.title = "Remove";
+      rm.addEventListener("click", function () {
+        pendingExtraBmIds.splice(idx, 1);
+        renderExtraBmList();
+      });
+      tag.appendChild(rm);
+      container.appendChild(tag);
+    });
+  }
+
+  function wireExtraBmAdd() {
+    const addBtn = document.getElementById("scheduler-ts-extra-bm-add");
+    if (!addBtn || addBtn._wired) return;
+    addBtn._wired = true;
+    addBtn.addEventListener("click", function () {
+      const pick = document.getElementById("scheduler-ts-extra-bm-pick");
+      if (!pick || !pick.value) return;
+      if (!pendingExtraBmIds.includes(pick.value)) {
+        pendingExtraBmIds.push(pick.value);
+        renderExtraBmList();
+      }
+      pick.value = "";
    });
-    // Restore previous selection if still valid.
-    if (prev) sel.value = prev;
  }

  // -------------------------------------------------------------------------
@@ -90,6 +90,8 @@ function vchanRender() {
  addBtn.title = "Allocate new virtual channel at current frequency";
  addBtn.addEventListener("click", vchanAllocate);
  picker.appendChild(addBtn);
+
+  vchanSyncAccentUI();
 }

 async function vchanAllocate() {
@@ -170,7 +172,7 @@ function vchanApplyCapabilities(caps) {
 }

 // ---------------------------------------------------------------------------
-// Freq / mode interception
+// Freq / mode interception + UI accent
 // ---------------------------------------------------------------------------

 // Returns true when the active channel is a non-primary (virtual) channel.
@@ -179,6 +181,40 @@ function vchanIsOnVirtual() {
  return vchanActiveId !== vchanChannels[0].id;
 }

+function vchanActiveChannel() {
+  return vchanChannels.find(c => c.id === vchanActiveId) || null;
+}
+
+// Update the main freq input to show the virtual channel's frequency.
+function vchanUpdateFreqDisplay() {
+  const ch = vchanActiveChannel();
+  if (!ch) return;
+  const el = document.getElementById("freq");
+  if (!el) return;
+  if (typeof formatFreqForStep === "function" && typeof jogUnit !== "undefined") {
+    el.value = formatFreqForStep(ch.freq_hz, jogUnit);
+  } else {
+    el.value = (ch.freq_hz / 1e6).toFixed(6).replace(/\.?0+$/, "");
+  }
+}
+
+// Add / remove the vchan accent class from the freq and BW inputs.
+function vchanSyncAccentUI() {
+  const onVirtual = vchanIsOnVirtual();
+  const freqEl = document.getElementById("freq");
+  const bwEl   = document.getElementById("spectrum-bw-input");
+  if (freqEl) freqEl.classList.toggle("vchan-ch-active", onVirtual);
+  if (bwEl)   bwEl.classList.toggle("vchan-ch-active", onVirtual);
+  if (onVirtual) {
+    vchanUpdateFreqDisplay();
+  } else if (typeof _origRefreshFreqDisplay === "function") {
+    _origRefreshFreqDisplay();
+  }
+}
+
+// Saved reference to the original refreshFreqDisplay from app.js.
+let _origRefreshFreqDisplay = null;
+
 async function vchanSetChannelFreq(freqHz) {
  if (!vchanRigId || !vchanActiveId) return;
  try {
@@ -235,3 +271,17 @@ window.vchanInterceptMode = async function(mode) {
    if (typeof _orig === "function") return _orig(freqHz);
  };
 })();
+
+// Wrap refreshFreqDisplay so the main freq field stays in sync with the
+// active virtual channel's frequency (SSE rig-state updates would otherwise
+// constantly overwrite it with channel 0's freq).
+(function() {
+  _origRefreshFreqDisplay = window.refreshFreqDisplay;
+  window.refreshFreqDisplay = function() {
+    if (vchanIsOnVirtual()) {
+      vchanUpdateFreqDisplay();
+      return;
+    }
+    if (typeof _origRefreshFreqDisplay === "function") _origRefreshFreqDisplay();
+  };
+})();