From bb8be051ffffa56a01093c9f3aaa80e84748568f Mon Sep 17 00:00:00 2001 From: Christian Kolset Date: Sun, 20 Sep 2026 11:31:07 -0600 Subject: Fix Signal name reset and orphaned references on device reconfigure Apply & Reconnect rebuilt a device's whole Signal list from hardware defaults on every call, silently discarding user/profile-set names, units, and colors even when pins hadn't changed. Add merge_signal_metadata() and call it from ArduinoDevice.remap_pins() and SerialDevice.reconfigure() to reapply the same fields ProfileManager already treats as user overrides, keyed by signal_id. Also close a related gap: removing a pin that a Channel/Plot/Control still referenced left it silently dangling, and SignalProcessor never pruned its latest-value cache, so a derived Channel kept computing off a permanently frozen stale reading. Add SignalProcessor. on_device_reconfigured() to purge that cache, reference_registry. find_references() for a console breadcrumb, and live "missing source" indicators on Plot traces and Channel blocks reusing ControlWidget's existing stale/QSS pattern. Also fixes ControlWidget._write() still enqueuing writes to a channel that no longer exists. Co-Authored-By: Claude Sonnet 5 --- ui/control_panel.py | 5 ++++- ui/main_window.py | 11 +++++++++++ ui/strip_chart.py | 19 ++++++++++++++++--- ui/windows/channels_window.py | 27 +++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 4 deletions(-) (limited to 'ui') diff --git a/ui/control_panel.py b/ui/control_panel.py index f008853..830b985 100644 --- a/ui/control_panel.py +++ b/ui/control_panel.py @@ -238,7 +238,10 @@ class ControlWidget(QFrame): dev = self.registry.get_instance(self.device_id) if dev: ch = dev.get_signal(self.channel_id) - if ch is not None and not ch.enabled: + if ch is None: + print(f"[Control] write_channel({self.channel_id}, {value}) skipped on " + f"{self.device_id} — channel no longer exists (removed by reconfigure)") + elif not ch.enabled: print(f"[Control] write_channel({self.channel_id}, {value}) skipped on " f"{self.device_id} — channel is disabled") elif dev.status not in (DeviceStatus.CONNECTED, DeviceStatus.SIMULATED): diff --git a/ui/main_window.py b/ui/main_window.py index 0e21b2e..ba93121 100644 --- a/ui/main_window.py +++ b/ui/main_window.py @@ -720,6 +720,17 @@ class MainWindow(QMainWindow): self._status.setText(f"Device '{dev_id}' removed.") def _on_device_reconfigured(self, dev_id: str): + dev = self.registry.get_instance(dev_id) + if dev is not None: + current_ids = {s.signal_id for s in dev.info.signals} + removed_ids = self.processor.on_device_reconfigured(dev_id, current_ids) + if removed_ids: + from core.reference_registry import find_references + for sid in removed_ids: + refs = find_references(self, (dev_id, sid)) + if refs: + print(f"[Device '{dev_id}'] signal '{sid}' removed by reconfigure — " + f"still referenced by: {', '.join(refs)}") self.engine.on_device_reconfigured(dev_id) self._chart.refresh() if self._win_config: diff --git a/ui/strip_chart.py b/ui/strip_chart.py index bdffb91..b295a8c 100644 --- a/ui/strip_chart.py +++ b/ui/strip_chart.py @@ -176,9 +176,13 @@ class StripChartWidget(QWidget): for tr in spec.traces: if not tr.visible: continue - pen = pg.mkPen(color=tr.color, width=tr.width, - style=_STYLES.get(tr.style, Qt.PenStyle.SolidLine)) - curve = plot.plot([], [], pen=pen, name=tr.label or tr.channel_id) + missing = self._signal_missing(tr.device_id, tr.channel_id) + pen = pg.mkPen(color="#6b7280" if missing else tr.color, width=tr.width, + style=Qt.PenStyle.DashLine if missing + else _STYLES.get(tr.style, Qt.PenStyle.SolidLine)) + label = tr.label or tr.channel_id + curve = plot.plot([], [], pen=pen, + name=f"{label} (missing)" if missing else label) key = (tr.device_id, tr.channel_id) self._curves.setdefault(key, []).append( {"curve": curve, "plot": plot, "spec": spec, "pane": spec}) @@ -203,6 +207,15 @@ class StripChartWidget(QWidget): for e in self._curves.get(key, []): e["curve"].setVisible(enabled) + def _signal_missing(self, device_id: str, channel_id: str) -> bool: + """True if this trace's (device_id, channel_id) no longer resolves — + e.g. Apply & Reconnect dropped the pin — so it can be flagged instead + of silently freezing with no explanation.""" + if device_id == "derived": + return not any(dc.channel_id == channel_id for dc in self.processor.get_derived()) + dev = self.registry.get_instance(device_id) + return dev is None or dev.get_signal(channel_id) is None + def _lookup_channel_unit(self, device_id: str, channel_id: str) -> str: if device_id == "derived": for dc in self.processor.get_derived(): diff --git a/ui/windows/channels_window.py b/ui/windows/channels_window.py index f581851..31d1458 100644 --- a/ui/windows/channels_window.py +++ b/ui/windows/channels_window.py @@ -536,6 +536,8 @@ class PipelineTab(QWidget): if block: self._on_remove_block(block) self._refresh_src_cb() + for blk in self._derived_blocks: + blk.refresh_missing_sources() def on_device_reconfigured(self, dev_id: str): dev = self.registry.get_instance(dev_id) @@ -550,6 +552,8 @@ class PipelineTab(QWidget): if block: self._on_remove_block(block) self._refresh_src_cb() + for blk in self._derived_blocks: + blk.refresh_missing_sources() def on_device_added(self): self._refresh_src_cb() @@ -845,6 +849,11 @@ class ChannelBlock(QFrame): rm = QToolButton(); rm.setText("✕"); rm.setObjectName("plotRemoveBtn") rm.setFixedSize(22, 22); rm.clicked.connect(lambda: self.removed.emit(self)) hl.addWidget(rm) + self._missing_lbl = QLabel("⚠") + self._missing_lbl.setObjectName("controlWidgetStale") + self._missing_lbl.setToolTip("A source signal is missing — reconfigured or removed") + self._missing_lbl.setVisible(False) + hl.addWidget(self._missing_lbl) self._toggle_btn = QToolButton(); self._toggle_btn.setText("▶") self._toggle_btn.setObjectName("traceRemoveBtn"); self._toggle_btn.setFixedSize(22, 22) self._toggle_btn.clicked.connect(self._toggle) @@ -1013,6 +1022,24 @@ class ChannelBlock(QFrame): self._body = body self._update_vars_hint() self._update_visibility() + self.refresh_missing_sources() + + def refresh_missing_sources(self): + """Update the header warning icon for a source signal that no longer + resolves (device removed, or Apply & Reconnect dropped that pin). + Called after any device add/remove/reconfigure — see PipelineTab.""" + missing = False + for dev_id, ch_id in self.dc.sources: + if dev_id == "derived": + if ch_id not in self.processor.all_virtual_channel_ids(): + missing = True + break + else: + dev = self.registry.get_instance(dev_id) + if dev is None or dev.get_signal(ch_id) is None: + missing = True + break + self._missing_lbl.setVisible(missing) def _toggle(self): self._expanded = not self._expanded -- cgit v1.2.3