feat(theme): apply dark mode to graphs

Add _styleAxes() for matplotlib dark/light mode styling.

Apply Colors to graph canvas, control panel, vector picker.

Update style pickers and line style icons for theme awareness.

Author: nicklafleur

graphs/gui/canvasPanel.py

@@ -31,6 +31,8 @@
 
 
 from graphs.style import BASE_COLORS, LIGHTNESSES, STYLES, hsl_to_hsv
+from gui.utils.colors import Colors
+from gui.utils.dark import isDark
 from gui.utils.numberFormatter import roundToPrec
 
 
@@ -84,7 +86,7 @@ def __init__(self, graphFrame, parent):
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         self.figure = Figure(figsize=(5, 3), tight_layout={'pad': 1.08})
-        rgbtuple = wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE).Get()
+        rgbtuple = Colors.buttonFace().Get()
         clr = [c / 255. for c in rgbtuple]
         self.figure.set_facecolor(clr)
         self.figure.set_edgecolor(clr)
@@ -93,6 +95,10 @@ def __init__(self, graphFrame, parent):
         self.canvas.mpl_connect('button_press_event', self.OnMplCanvasClick)
         self.subplot = self.figure.add_subplot(111)
         self.subplot.grid(True)
+        
+        # Style axes for dark mode
+        self._styleAxes()
+        
         mainSizer.Add(self.canvas, 1, wx.EXPAND | wx.ALL, 0)
 
         self.SetSizer(mainSizer)
@@ -104,6 +110,7 @@ def __init__(self, graphFrame, parent):
     def draw(self, accurateMarks=True):
         self.subplot.clear()
         self.subplot.grid(True)
+        self._styleAxes()  # Re-apply styling after clear
         allXs = set()
         allYs = set()
         plotData = {}
@@ -294,6 +301,32 @@ def unmarkX(self):
         self.xMark = None
         self.draw()
 
+    def _styleAxes(self):
+        """Style the matplotlib axes for dark/light mode."""
+        if isDark():
+            textColor = '#DCDCDC'  # Light gray text for dark mode
+            axisColor = '#888888'  # Gray for axis lines
+        else:
+            textColor = '#000000'  # Black text for light mode
+            axisColor = '#000000'  # Black for axis lines
+        
+        # Set background color for the plot area
+        bgColor = Colors.windowBackground().Get()
+        bgColorNorm = [c / 255. for c in bgColor]
+        self.subplot.set_facecolor(bgColorNorm)
+        
+        # Style axis spines (the lines around the plot)
+        for spine in self.subplot.spines.values():
+            spine.set_color(axisColor)
+        
+        # Style tick labels and axis labels
+        self.subplot.tick_params(colors=textColor, labelcolor=textColor)
+        self.subplot.xaxis.label.set_color(textColor)
+        self.subplot.yaxis.label.set_color(textColor)
+        
+        # Style grid
+        self.subplot.grid(True, color=axisColor, alpha=0.3)
+
     @staticmethod
     def _getLimits(vals, minExtra=0, maxExtra=0):
         minVal = min(vals, default=0)

graphs/gui/ctrlPanel.py

@@ -25,6 +25,7 @@
 
 from gui.bitmap_loader import BitmapLoader
 from gui.contextMenu import ContextMenu
+from gui.utils.colors import ThemedPanel, Colors
 from gui.utils.inputs import FloatBox, FloatRangeBox
 from service.const import GraphCacheCleanupReason
 from service.fit import Fit
@@ -37,7 +38,7 @@
 _t = wx.GetTranslation
 
 
-class GraphControlPanel(wx.Panel):
+class GraphControlPanel(ThemedPanel):
 
     def __init__(self, graphFrame, parent):
         super().__init__(parent)
@@ -56,6 +57,7 @@ def __init__(self, graphFrame, parent):
         yText = wx.StaticText(self, wx.ID_ANY, _t('Axis Y:'))
         ySubSelectionSizer.Add(yText, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 5)
         self.ySubSelection = wx.Choice(self, wx.ID_ANY)
+        Colors.styleInput(self.ySubSelection)
         self.ySubSelection.Bind(wx.EVT_CHOICE, self.OnYTypeUpdate)
         ySubSelectionSizer.Add(self.ySubSelection, 1, wx.EXPAND | wx.ALL, 0)
         commonOptsSizer.Add(ySubSelectionSizer, 0, wx.EXPAND | wx.ALL, 0)
@@ -64,6 +66,7 @@ def __init__(self, graphFrame, parent):
         xText = wx.StaticText(self, wx.ID_ANY, _t('Axis X:'))
         xSubSelectionSizer.Add(xText, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 5)
         self.xSubSelection = wx.Choice(self, wx.ID_ANY)
+        Colors.styleInput(self.xSubSelection)
         self.xSubSelection.Bind(wx.EVT_CHOICE, self.OnXTypeUpdate)
         xSubSelectionSizer.Add(self.xSubSelection, 1, wx.EXPAND | wx.ALL, 0)
         commonOptsSizer.Add(xSubSelectionSizer, 0, wx.EXPAND | wx.TOP, 5)

graphs/gui/frame.py

@@ -29,6 +29,7 @@
 from graphs.events import RESIST_MODE_CHANGED
 from gui.auxWindow import AuxiliaryFrame
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from service.const import GraphCacheCleanupReason
 from service.settings import GraphSettings
 from . import canvasPanel
@@ -58,6 +59,7 @@ def __init__(self, parent, includeHidden=False):
 
         # Layout - graph selector
         self.graphSelection = wx.Choice(self, wx.ID_ANY, style=0)
+        Colors.styleInput(self.graphSelection)
         self.graphSelection.Bind(wx.EVT_CHOICE, self.OnGraphSwitched)
         mainSizer.Add(self.graphSelection, 0, wx.EXPAND)
 

graphs/gui/stylePickers.py

@@ -23,6 +23,7 @@
 
 from graphs.style import BASE_COLORS, LIGHTNESSES, STYLES
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from service.const import GraphLightness
 
 
@@ -32,7 +33,7 @@ def __init__(self, parent, wrapper):
         super().__init__(parent, flags=wx.BORDER_SIMPLE)
         self.wrapper = wrapper
 
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
+        self.SetBackgroundColour(Colors.windowBackground())
         sizer = wx.BoxSizer(wx.VERTICAL)
 
         grid = wx.GridSizer(self.nrows, self.ncols, 0, 0)

graphs/gui/vector.py

@@ -24,6 +24,7 @@
 import wx
 
 from eos.utils.float import floatUnerr
+from gui.utils.colors import Colors
 
 
 class VectorPicker(wx.Window):
@@ -114,13 +115,13 @@ def Draw(self, dc):
         width, height = self.GetScaledClientSize()
         if not width or not height:
             return
-        dc.SetBackground(wx.Brush(self.GetBackgroundColour(), wx.BRUSHSTYLE_SOLID))
+        dc.SetBackground(wx.Brush(Colors.buttonFace(), wx.BRUSHSTYLE_SOLID))
         dc.Clear()
-        dc.SetTextForeground(wx.Colour(0))
+        dc.SetTextForeground(Colors.text())
         dc.SetFont(self._font)
 
         radius = min(width, height) / 2 - 2
-        dc.SetBrush(wx.WHITE_BRUSH)
+        dc.SetBrush(wx.Brush(Colors.windowBackground()))
         dc.DrawCircle(round(radius + 2), round(radius + 2), round(radius))
         a = math.radians(self._angle + self._offset)
         x = math.cos(a) * radius

graphs/style.py

@@ -23,6 +23,7 @@
 # noinspection PyPackageRequirements
 import wx
 
+from gui.utils.colors import Colors
 from service.const import GraphColor, GraphLightness, GraphLineStyle
 
 ColorData = namedtuple('ColorData', ('hsl', 'name', 'iconName'))
@@ -41,7 +42,7 @@ def __init__(self, name, iconNamePrefix, mplSpec):
     def iconName(self):
         # Get lightness out of RGB color, see following link for math:
         # https://www.niwa.nu/2013/05/math-behind-colorspace-conversions-rgb-hsl/
-        r, g, b, a = (c / 255 for c in wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
+        r, g, b, a = (c / 255 for c in Colors.windowBackground())
         l = (max(r, g, b) + min (r, g, b)) / 2
         suffix = '_black' if l > 0.3 else '_white'
         return '{}{}'.format(self._iconNamePrefix, suffix)