Update D3SpectrumDisplayDiv to better match how the underlying JS and CSS handle color setting.

Made setting the spectrum colors according to the color theme a application wide function (since it used global CSS variables anyway), and changed the color setting functions to be overrides of the color theme.  Movedhandling the global CSS rules to InterSpecApp, since we will probably also use it for other elements in the future.

Author: wcjohns

InterSpec/D3SpectrumDisplayDiv.h

@@ -160,29 +160,32 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
   void scheduleUpdateSecondData();
 
 
-  /** Schedules the foreground peaks to be re-loaded to the client during the
-   next call to #render (which Wt takes care of calling); this function is called by the PeakModel.
-   */
-  void scheduleForegroundPeakRedraw();
-  
-  /** Schedules peak redraw for the given spectrum.
-   
-   TODO: As of 20250802, only foreground spectrum has any effect.
+  /** Schedules the peaks to be re-loaded to the client, for the specified spectrum, during the
+   next call to #render (which Wt takes care of calling).
    */
   void schedulePeakRedraw( const SpecUtils::SpectrumType spectrum_type );
 
-  /** Applies the current color theme.
-   if nullptr, then sets to default colors.
+  /** Applies the color theme globally to all D3SpectrumDisplayDiv instances in the current app.
+      Should be called once when the color theme changes, typically from InterSpec::applyColorTheme().
+      If nullptr, then sets to default colors.
+
+      Uses InterSpecApp::setGlobalD3SpectrumCssRule() to track the global CSS rules per app instance.
    */
-  void applyColorTheme( std::shared_ptr<const ColorTheme> theme );
-  
-  void setForegroundSpectrumColor( const Wt::WColor &color );
-  void setBackgroundSpectrumColor( const Wt::WColor &color );
-  void setSecondarySpectrumColor( const Wt::WColor &color );
-  void setTextColor( const Wt::WColor &color );
-  void setAxisLineColor( const Wt::WColor &color );
-  void setChartMarginColor( const Wt::WColor &color );
-  void setChartBackgroundColor( const Wt::WColor &color );
+  static void applyColorTheme( std::shared_ptr<const ColorTheme> theme );
+
+  /** Updates the default peak color for this specific instance based on the color theme.
+      This is needed because peak color is passed in JSON, not via CSS variables.
+      Also updates peak label size/rotation and log Y-axis min from theme.
+   */
+  void updateDefaultPeakColorForColorTheme( std::shared_ptr<const ColorTheme> theme );
+  
+  void overrideForegroundSpectrumColor( const Wt::WColor &color );
+  void overrideBackgroundSpectrumColor( const Wt::WColor &color );
+  void overrideSecondarySpectrumColor( const Wt::WColor &color );
+  void overrideTextColor( const Wt::WColor &color );
+  void overrideAxisLineColor( const Wt::WColor &color );
+  void overrideChartMarginColor( const Wt::WColor &color );
+  void overrideChartBackgroundColor( const Wt::WColor &color );
   void setDefaultPeakColor( const Wt::WColor &color );
 
   /** Sets the charts font size.
@@ -467,12 +470,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
   /** Sets the highlight regions to client - currently unimplemented. */
   void setHighlightRegionsToClient();
 
-  void setForegroundPeaksToClient();
-  
-  void setSecondaryPeaksToClient();
-  
-  void setBackgroundPeaksToClient();
-  
   void setReferenceLinesToClient();
 
 protected:
@@ -500,7 +497,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
 
     UpdateDynamicRefLines = 0x80,
 
-    // TODO: Currently background and secondary peaks not loaded to client, so these flags have no effect.
     UpdateBackgroundPeaks = 0x0100,
     UpdateSecondaryPeaks  = 0x0200,
     //ToDo: maybe add a few other things to this mechanism.
@@ -694,13 +690,17 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
    */
   int m_comptonPeakAngle;
 
-  Wt::WColor m_foregroundLineColor;
-  Wt::WColor m_backgroundLineColor;
-  Wt::WColor m_secondaryLineColor;
-  Wt::WColor m_textColor;
-  Wt::WColor m_axisColor;
-  Wt::WColor m_chartMarginColor;
-  Wt::WColor m_chartBackgroundColor;
+  // Member variables for instance-specific color overrides
+  // When default (isDefault() == true), the global CSS variable from the theme is used
+  Wt::WColor m_foregroundLineColorOverride;
+  Wt::WColor m_backgroundLineColorOverride;
+  Wt::WColor m_secondaryLineColorOverride;
+  Wt::WColor m_textColorOverride;
+  Wt::WColor m_axisColorOverride;
+  Wt::WColor m_chartMarginColorOverride;
+  Wt::WColor m_chartBackgroundColorOverride;
+
+  // Default peak color - used directly in JSON, not via CSS
   Wt::WColor m_defaultPeakColor;
 
   std::string m_peakLabelFontSize;

InterSpec/InterSpecApp.h

@@ -25,6 +25,7 @@
 
 #include "InterSpec_config.h"
 
+#include <map>
 #include <set>
 #include <mutex>
 #include <chrono>
@@ -43,6 +44,7 @@ namespace Wt
   class WText;
   class WGridLayout;
   class WPushButton;
+  class WCssTextRule;
 }//namespace Wt
 
 class PopupDivMenuItem;
@@ -238,7 +240,27 @@ class InterSpec_API InterSpecApp : public Wt::WApplication
    the list of the capture group.
    */
   static const std::set<std::string> &languagesAvailable();
-  
+
+  /** Sets or replaces a global CSS rule for this app instance.
+      Used by various components to manage global theme colors and styles.
+
+      @param rulename Unique name for the CSS rule
+      @param selector CSS selector (e.g., ":root")
+      @param declarations CSS declarations (e.g., "--d3spec-fore-line-color: rgb(0,0,0);")
+
+      If a rule with the same name already exists, it will be removed before adding the new one.
+   */
+  void setGlobalCssRule( const std::string &rulename,
+                         const std::string &selector,
+                         const std::string &declarations );
+
+  /** Removes a global CSS rule for this app instance.
+
+      @param rulename Name of the CSS rule to remove
+      @returns true if the rule was found and removed, false if it didn't exist
+   */
+  bool removeGlobalCssRule( const std::string &rulename );
+
 protected:
 
   //notify(): over-riding WApplication::notify in order to catch any exceptions
@@ -369,7 +391,12 @@ class InterSpec_API InterSpecApp : public Wt::WApplication
   /** CSS px values for areas on iPhoneX's like the notch or bottom bar. */
   float m_safeAreas[4];
 #endif
-  
+
+  /** Map of global D3 spectrum CSS rules for this app instance.
+      Used to manage global theme colors that apply to all D3SpectrumDisplayDiv instances.
+   */
+  std::map<std::string, Wt::WCssTextRule*> m_globalD3SpectrumCssRules;
+
   friend class InterSpec;
 #if( INCLUDE_ANALYSIS_TEST_SUITE )
   friend class SpectrumViewerTester;