FIX: legend sync, theme, and click handling

requirements.txt

@@ -1,5 +1,7 @@
 pydm
+numpy
 pandas
+scipy
 pytest
 pytest-qt
 qtawesome

trace/main.py

@@ -28,6 +28,7 @@
     QAbstractButton,
 )
 from pyqtgraph.exporters import ImageExporter
+from pyqtgraph.graphicsItems.LegendItem import ItemSample
 
 from pydm import Display
 from pydm.widgets import PyDMLabel, PyDMArchiverTimePlot
@@ -41,6 +42,17 @@
 DISABLE_AUTO_SCROLL = -2  # Using -2 as invalid since QButtonGroups use -1 as invalid
 
 
+class _LegendSample(ItemSample):
+    """Legend sample that does not toggle curve visibility on click.
+
+    Trace manages curve visibility through the control panel toggles,
+    so legend clicks should not independently change visibility state.
+    """
+
+    def mouseClickEvent(self, event):
+        event.accept()
+
+
 class TraceDisplay(Display):
     """Main display widget for the Trace application.
 
@@ -183,6 +195,7 @@ def build_plot_side(self, parent: QWidget) -> QWidget:
             cache_data=False,
             show_all=False,
         )
+        self.plot._legend.sampleType = _LegendSample
 
         multi_axis_plot = self.plot.plotItem
         multi_axis_plot.vb.menu = None
@@ -785,10 +798,17 @@ def git_version():
             The output of `git describe --tags`, or an empty string on failure.
         """
         project_directory = __file__.rsplit("/", 1)[0]
-        git_cmd = subprocess.run(
-            f"cd {project_directory} && git describe --tags", text=True, shell=True, capture_output=True
-        )
-        return git_cmd.stdout.strip()
+        try:
+            git_cmd = subprocess.run(
+                f"cd {project_directory} && git describe --tags",
+                text=True,
+                shell=True,
+                capture_output=True,
+                timeout=5,
+            )
+            return git_cmd.stdout.strip()
+        except subprocess.TimeoutExpired:
+            return ""
 
     def parse_cli_args(self, args, macros):
         """Parse CLI-style arguments and macros into startup configuration.

trace/services/theme_manager.py

@@ -9,6 +9,8 @@
 
 from config import dark_stylesheet, light_stylesheet
 
+ASSETS_DIR = str(light_stylesheet.parent.parent / "assets")
+
 type ColorHex = str
 type IconColorDict = dict[str, ColorHex]
 type ButtonIconInfo = tuple[str, QPushButton, str, str]
@@ -192,6 +194,7 @@ def set_theme(self, theme: Theme) -> None:
             self.app.setPalette(self.light_palette)
             stylesheet = light_stylesheet.read_text()
 
+        stylesheet = stylesheet.replace('url("assets/', f'url("{ASSETS_DIR}/')
         self.app.main_window.setStyleSheet(stylesheet)
 
         settings = QSettings()

trace/stylesheets/light_mode.qss

@@ -183,7 +183,7 @@ QCheckBox {
 }
 
 QCheckBox::indicator:unchecked {
-    background-color: #2A2A2A;
+    background-color: #FFFFFF;
 }
 
 QCheckBox::indicator {

trace/widgets/control_panel.py

@@ -1091,6 +1091,23 @@ def show_invalid_icon(self, show=True):
     def set_active(self, state: int | Qt.CheckState):
         checked = Qt.CheckState(state) == Qt.Checked
         self.source.setVisible(checked)
+        self._update_legend(checked)
+
+    def _update_legend(self, visible: bool) -> None:
+        """Update the legend entry for this curve to match its visibility.
+        Uses pyqtgraph's native removeItem/addItem since QGraphicsGridLayout
+        does not collapse hidden items."""
+        legend = self.plot._legend
+        if legend is None:
+            return
+        if not visible:
+            legend.removeItem(self.source)
+        else:
+            # Only re-add if not already in the legend
+            for sample, label in legend.items:
+                if sample.item is self.source:
+                    return
+            legend.addItem(self.source, self.source.name())
 
     def update_live_icon(self, connected: bool) -> None:
         self.live_connection_status.setVisible(not connected)