Merge branch 'master' of github.com:sandialabs/InterSpec

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/InterSpec.h

@@ -383,7 +383,10 @@ class InterSpec : public Wt::WContainerWidget
                           const SpecUtils::SpectrumType spec_type,
                           const std::string &ref_line_name = "" );
 
-  /** Sets the peaks for the given spectrum.  If foreground, you should consider instead to use the PeakModel.
+  /** Sets the peaks for the given spectrum - taking care of adding a undo/redo step.
+   
+   If you do not wish to add a undo/redo step, you can call `PeakModel::setPeaks(peaks,SpectrumType).`
+   (the undo/redo is the only differnce between calling this function and the PeakModel function directly).
    
    @param spectrum Which spectrum to set the peaks for.
    @param peaks The peaks to set.  Must not be nullptr, or the currently set deque of peaks.

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;

InterSpec/PeakModel.h

@@ -40,7 +40,11 @@
 
 class SpecMeas;
 
-namespace SpecUtils{ class Measurement; }
+namespace SpecUtils
+{
+  class Measurement;
+  enum class SpectrumType : int;
+}
 
 namespace SandiaDecay
 {
@@ -60,6 +64,9 @@ class PeakModel: public Wt::WAbstractItemModel
    That is, the row specifies the peak, and the column represents
    various peak values, as specified by the 'Columns' enum.
    
+   All functions refer to the foreground, except `peaks(SpectrumType)` and `measurement(SpectrumType)` - which just returns what
+   `setPeakFromSpecMeas(...)` was last called for the type (currently only the main InterSpec class do anything other than for foreground).
+   
    Incomplete TODO list:
    - add a `replacePeaks(orig,newer)` function to allow updating peak quanitites in one step
    - Or allow setting kLowerX/kUpperX columns in setData(...) function
@@ -98,7 +105,8 @@ class PeakModel: public Wt::WAbstractItemModel
   //  or the displayed sample numbers), then this function should be called to
   //  update the m_peaks pointer to be from the appropriate SpecMeas object.
   void setPeakFromSpecMeas( std::shared_ptr<SpecMeas> meas,
-                            const std::set<int> &samplenums );
+                            const std::set<int> &samplenums,
+                            const SpecUtils::SpectrumType specType );
 
   /** Normally we keep the peaks added/removed up to date with the #SpecMeas passed into
    #setPeakFromSpecMeas (i.e., the #SpecMeas "owns" the peaks), but if you dont want to do
@@ -141,6 +149,26 @@ class PeakModel: public Wt::WAbstractItemModel
 
   const std::deque<std::shared_ptr<const PeakDef>> &sortedPeaks() const;
 
+  /** Get the currently set peaks - this requires that `setPeakFromSpecMeas(spec, samples, type)`
+   has been called to set these - currently the only place that does this for anything besides the foreground is the main InterSpec class.
+   
+   All other functions in this class refer to foreground peaks, except `peaks(SpectrumType)` and `measurement(SpectrumType)`.
+   */
+  std::shared_ptr<const std::deque<std::shared_ptr<const PeakDef>>> peaks( const SpecUtils::SpectrumType type ) const;
+  
+  std::weak_ptr<SpecMeas> measurement( const SpecUtils::SpectrumType type );
+  
+  Wt::Signal<> &backgroundPeaksChanged();
+  Wt::Signal<> &secondaryPeaksChanged();
+  
+  
+  /** Get the currently set secondary peaks - this requires that `setPeakFromSpecMeas(back, backSamples, SpectrumType::SecondaryForeground)`
+   has been called to set these - currently the only place that does this is the main InterSpec class.
+   
+   All other functions in this class refer to foregorund peaks, except `backgroundPeaks()` and `secondaryPeaks()`.
+   */
+  std::shared_ptr<const std::deque<std::shared_ptr<const PeakDef>>> secondaryPeaks() const;
+  
   //definePeakXRangeAndChi2(...): Inorder to save cpu (and mostly memorry access
   //  time) later on, this function will define the lower and upper energy range
   //  of peaks that have a polynomial continum defined, and have not already had
@@ -176,6 +204,9 @@ class PeakModel: public Wt::WAbstractItemModel
    */
   void setPeaks( std::vector<std::shared_ptr<const PeakDef>> peaks );
 
+  
+  void setPeaks( const std::deque<std::shared_ptr<const PeakDef>> &peakdeque, const SpecUtils::SpectrumType type );
+  
   //removePeak( size_t ):  removes the specified `peakn`, where the peakn refers
   //  to the peak at position `peakn` when sorted by peak means (similar
   //  behavior as all other functions which refer to peaks by index).
@@ -439,8 +470,16 @@ class PeakModel: public Wt::WAbstractItemModel
 
   //Peaks are stored sorted according to peak.mean, since some of the algorithms
   //  that work on the peaks need them to be sorted by mean
-  std::shared_ptr< std::deque< PeakShrdPtr > > m_peaks;
-  std::weak_ptr<SpecMeas> m_measurment;
+  std::shared_ptr< std::deque< std::shared_ptr<const PeakDef> > > m_peaks;
+  std::weak_ptr<SpecMeas> m_measurment; //Foreground
+  
+  std::shared_ptr<std::deque<std::shared_ptr<const PeakDef>>> m_background_peaks;
+  std::weak_ptr<SpecMeas> m_background;
+  Wt::Signal<> m_backgroundPeaksChanged;
+  
+  std::shared_ptr<std::deque<std::shared_ptr<const PeakDef>>> m_secondary_peaks;
+  std::weak_ptr<SpecMeas> m_secondary;
+  Wt::Signal<> m_secondaryPeaksChanged;
 
   Columns m_sortColumn;
   Wt::SortOrder m_sortOrder;

InterSpec_resources/DecayChainChart.css

@@ -104,6 +104,16 @@ rect.DecayChartNuc.MousedOver
   cursor: pointer;
 }
 
+.ShowDecayProductsTxt
+{
+  cursor: pointer;
+}
+
+.ShowDecayProductsRect
+{
+  cursor: pointer;
+}
+
 .DecayChainDnldBtn
 {
   position: absolute;