More types and units

BEdit/src/bedit/gui/simulation_window.py

@@ -280,7 +280,20 @@ class SimulationWindow(QMainWindow):
                         items[path] = item
                     parent = item
                 parent.setData(0, Qt.ItemDataRole.UserRole, signal_name)
-                parent.setToolTip(0, signal_name)
+                metadata = self.results.signal_metadata.get(signal_name, {})
+                unit = metadata.get("unit", "")
+                if unit:
+                    parent.setText(0, f"{parts[-1]} [{unit}]")
+                tooltip = signal_name
+                details = [
+                    metadata.get("quantity", ""),
+                    f"Unit: {unit}" if unit else "",
+                    metadata.get("description", ""),
+                ]
+                details = [detail for detail in details if detail]
+                if details:
+                    tooltip += "\n" + "\n".join(details)
+                parent.setToolTip(0, tooltip)
                 parent.setFlags(parent.flags() | Qt.ItemFlag.ItemIsUserCheckable)
                 parent.setCheckState(0, Qt.CheckState.Unchecked)
             tree.expandToDepth(0)
@@ -334,7 +347,14 @@ class SimulationWindow(QMainWindow):
             (trace for trace in graph.traces if trace.name == signal_name), None
         )
         if enabled and existing is None:
-            graph.traces.append(SimulationTrace(name=signal_name))
+            metadata = self.results.signal_metadata.get(signal_name, {})
+            graph.traces.append(
+                SimulationTrace(
+                    name=signal_name,
+                    y_label=metadata.get("quantity", ""),
+                    unit=metadata.get("unit", ""),
+                )
+            )
         elif not enabled and existing is not None:
             graph.traces.remove(existing)
         page = self.ui.graphTabs.currentWidget()
@@ -492,6 +512,7 @@ class SimulationWindow(QMainWindow):
         self.results.status.update(phase="Simulation finished", progress=10000)
         if isinstance(result, SimulationExecutionResult):
             self.results.data = result.data
+            self.results.signal_metadata = result.signal_metadata
             available_signals = set(result.data)
             for graph in self.results.graphs:
                 graph.traces = [
@@ -499,6 +520,10 @@ class SimulationWindow(QMainWindow):
                     for trace in graph.traces
                     if trace.name in available_signals
                 ]
+                for trace in graph.traces:
+                    metadata = result.signal_metadata.get(trace.name, {})
+                    trace.unit = metadata.get("unit", "")
+                    trace.y_label = metadata.get("quantity", "")
                 if graph.x_axis not in available_signals:
                     graph.x_axis = (
                         "time"
@@ -570,14 +595,38 @@ class GraphWorkspacePage(QWidget):
             horizontal = x_values if x_values is not None else range(len(y_values))
             sample_count = min(len(horizontal), len(y_values))
             color = trace.properties.get("color")
+            unit = trace.unit or self.results.signal_metadata.get(
+                trace.name, {}
+            ).get("unit", "")
+            label = f"{trace.name} [{unit}]" if unit else trace.name
             self.axes.plot(
                 list(horizontal)[:sample_count],
                 y_values[:sample_count],
-                label=trace.name,
+                label=label,
                 color=color if isinstance(color, str) and color else None,
             )
         self.axes.set_title(self.graph.title)
-        self.axes.set_xlabel(self.graph.x_axis if x_values is not None else "sample")
+        if x_values is not None:
+            x_unit = self.results.signal_metadata.get(
+                self.graph.x_axis, {}
+            ).get("unit", "")
+            x_label = (
+                f"{self.graph.x_axis} [{x_unit}]"
+                if x_unit
+                else self.graph.x_axis
+            )
+        else:
+            x_label = "sample"
+        self.axes.set_xlabel(x_label)
+        units = {
+            trace.unit
+            or self.results.signal_metadata.get(trace.name, {}).get("unit", "")
+            for trace in self.graph.traces
+            if self.results.data.get(trace.name) is not None
+        }
+        units.discard("")
+        if len(units) == 1:
+            self.axes.set_ylabel(next(iter(units)))
         self.axes.grid(True, alpha=0.25)
         if self.axes.lines:
             self.axes.legend()