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

Author: wcjohns

InterSpec/D3SpectrumDisplayDiv.h

@@ -196,13 +196,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
                                       const float upperx,
                                       const Wt::WColor &color );
 
-  
-  //By default SpectrumDisplayDiv has setLayoutSizeAware(true) set, so if the
-  //  widget is being sized by a Wt layout manager, layoutWidth() and
-  //  layoutHeight() will return this widget width and height respectively
-  int layoutWidth() const;
-  int layoutHeight() const;
-  
   //For the case of auto-ranging x-axis, the below _may_ return 0 when auto
   //  range is set, but chart hasnt been rendered  (although maybe +-DBL_MAX)
   double xAxisMinimum() const;
@@ -298,9 +291,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
 
   void setForegroundPeaksToClient();
 
-  //layoutSizeChanged(...): adjusts display binning if necessary
-  virtual void layoutSizeChanged ( int width, int height );
-  
   virtual void render( Wt::WFlags<Wt::RenderFlag> flags );
 
   /** Flags */
@@ -323,9 +313,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
   SpectrumDataModel *m_model;
   PeakModel *m_peakModel;
 
-  int m_layoutWidth;
-  int m_layoutHeight;
-  
   bool m_compactAxis;
   bool m_legendEnabled;
   bool m_yAxisIsLog;

InterSpec/D3TimeChart.h

@@ -99,11 +99,6 @@ class D3TimeChart : public Wt::WContainerWidget
   /** When the user drags on the chart to change the time range the spectrum is displayed for. */
   Wt::Signal<int/*start sample number*/,int/*end sample number*/,Wt::WFlags<Wt::KeyboardModifier>> &chartDragged();
 
-  /** When the chart is resized; gives new width and height of the chart area (e.g., the area inside
-   the axis lines), in pixels.
-   */
-  Wt::Signal<double/*chart width px*/,double/*chart height px*/> &chartResized();
-  
   /**  Signal emitted when the displayed x-axis range changes via a user action; e.g., when zooming
    into or out of a region of interest.
    */
@@ -138,16 +133,6 @@ class D3TimeChart : public Wt::WContainerWidget
   void setY1AxisTitle( const std::string &title );
   void setY2AxisTitle( const std::string &title );
 
-  
-  //By default SpectrumDisplayDiv has setLayoutSizeAware(true) set, so if the
-  //  widget is being sized by a Wt layout manager, layoutWidth() and
-  //  layoutHeight() will return this widget width and height respectively
-  int layoutWidth() const;
-  int layoutHeight() const;
-  
-  double chartWidthInPixels() const;
-  double chartHeightInPixels() const;
-  
   void setCompactAxis( const bool compact );
   bool isAxisCompacted() const;
 
@@ -182,9 +167,6 @@ class D3TimeChart : public Wt::WContainerWidget
   void setDataToClient();
   void setHighlightRegionsToClient();
 
-  //layoutSizeChanged(...): adjusts display binning if necessary
-  virtual void layoutSizeChanged ( int width, int height );
-  
   /** Shows or hides the user-selectable filters to control what the mouse/touch selects and energy range. */
   void showFilters( const bool show );
 
@@ -255,8 +237,6 @@ class D3TimeChart : public Wt::WContainerWidget
   /** The width of the plotting area in pixels. */
   double m_chartWidthPx;
 
-  /** The height of the plotting area in pixels. */
-  double m_chartHeightPx;
 
   bool m_compactXAxis;
   bool m_showVerticalLines;
@@ -283,20 +263,17 @@ class D3TimeChart : public Wt::WContainerWidget
   // Signals to hook C++ code to, to be notified when a user action happens
   Wt::Signal<int/*sample number*/,Wt::WFlags<Wt::KeyboardModifier>> m_chartClicked;
   Wt::Signal<int/*start sample number*/,int/*end sample number*/,Wt::WFlags<Wt::KeyboardModifier>> m_chartDragged;
-  Wt::Signal<double/*chart width px*/,double/*chart height px*/> m_chartResized;
   Wt::Signal<int/*start sample number*/,int/*end sample number*/,int/*samples per channel*/> m_displayedXRangeChange;
   //Wt::Signal<boost::optional<float> /*lower keV*/,boost::optional<float>/*upper keV*/> m_energyRangeFilterChanged;
 
   // Signals called from JS to propogate infromation to the C++
   std::unique_ptr<Wt::JSignal<int,int>>       m_chartClickedJS;
   std::unique_ptr<Wt::JSignal<int,int,int>>   m_chartDraggedJS;
-  std::unique_ptr<Wt::JSignal<double,double>> m_chartResizedJS;
   std::unique_ptr<Wt::JSignal<int,int,int>>   m_displayedXRangeChangeJS;
 
   // Functions connected to the JSignal's
   void chartClickedCallback( int sample_number, int modifier_keys );
   void chartDraggedCallback( int first_sample_number, int last_sample_number, int modifier_keys );
-  void chartResizedCallback( double chart_width_px, double chart_height_px );
   void displayedXRangeChangeCallback( int first_sample_number, int last_sample_number, int samples_per_channel );
 
   /** The javascript variable name used to refer to the SpecrtumChartD3 object.

InterSpec/DbFileBrowser.h

@@ -64,6 +64,11 @@ class SnapshotBrowser : public Wt::WContainerWidget
 
   int numSnaphots() const;
 
+  /** Returns the number of saved states available. */
+  static size_t num_saved_states( InterSpec *viewer,
+                                 std::shared_ptr<DataBaseUtils::DbSession> session,
+                                 std::shared_ptr<const SpectraFileHeader> header );
+  
 protected:
   void selectionChanged();
   void startDeleteSelected();

InterSpec/InterSpec.h

@@ -497,9 +497,6 @@ class InterSpec : public Wt::WContainerWidget
 
   void toggleToolTip( const bool showToolTips );
 
-  int paintedWidth() const;  //Depreciated
-  int paintedHeight() const; //Depreciated //XXX Not correct due to all padding and stuff, but close
-  
   /** Width of the apps window, in pixels. Will return a value of zero if (not yet) available. */
   int renderedWidth() const;
   /** Height of the apps window, in pixels. Will return a value of zero if (not yet) available. */
@@ -1192,9 +1189,18 @@ class InterSpec : public Wt::WContainerWidget
   SpecMeasManager        *m_fileManager; // The file manager
   Wt::WGridLayout        *m_layout;
 
+// 20210604: started playing around with using FLEX layout for just the charts - its not there yet,
+//           but shows some promise.
+#define USE_FLEX_CHART_LAYOUT 0
+  
   //Note: m_chartsLayout may be eliminated; may even be able to eliminate
   //  m_toolsLayout...
+#if( USE_FLEX_CHART_LAYOUT )
+  Wt::WContainerWidget   *m_chartsDiv;
+#else
   Wt::WGridLayout        *m_chartsLayout;
+#endif
+  
   Wt::WGridLayout        *m_toolsLayout;
   Wt::WContainerWidget   *m_menuDiv; // The top menu bar.
 

InterSpec/PeakDef.h

@@ -224,8 +224,9 @@ struct PeakContinuum
 
   //translate_offset_polynomial: if you want the exact same polynomial
   //  line, but would like it with reference to a different energy,
-  //  use this funtion.
-  //XXX - Currently only supports constant and linear polynomials.
+  //  use this function.
+  //  TODO: Does NOT support Quadratic, Cubic, or External continuum types 
+  //  TODO: Currently untested
   static void translate_offset_polynomial( double *new_coefs,
                                            const double *old_coefs,
                                            OffsetType type,

InterSpec/PopupDiv.h

@@ -195,15 +195,8 @@ class PopupDivMenu : public Wt::WPopupMenu
   //  if the parent has been deleteed, or this widget reomved from it.
   Wt::WMenuItem *parentItem();
 
-  //showFromClick() and showFromMouseOver() are convience functions that call
-  //  doShow(bool).  They are hopefully temprary to work around an issue where
-  //  if this->popup(parent,Vertical) is called, then this menu will actually be
-  //  hidden (probably related to Wt calling this function in JS as well...).
-  void showFromClick();
-  void showFromMouseOver();
-  
   //
-  void doShow( bool clicked );
+  void showMobile();
 
 
   void setupDesktopMenuStuff();

InterSpec/SpecMeasManager.h

@@ -406,8 +406,6 @@ class SpecMeasManager : public Wt::WObject
   Wt::WContainerWidget *createButtonBar();
   void deleteSpectrumManager();
   Wt::WContainerWidget *createTreeViewDiv();
-  void createInfoHandler();
-  void refreshAdditionalInfo( bool clearInfo = false );
 
 
 protected:

InterSpec_resources/D3TimeChart.js

@@ -447,10 +447,10 @@ D3TimeChart.prototype.handleResize = function () {
   // ...
   // Make sure to update the C++ code of the changed plotting size.
   try {
-    // console.log("Resized!");
+    // console.log( "Resized! New size={" + this.chart.clientWidth + "," + this.chart.clientHeight + "}" );
     this.state.height = this.chart.clientHeight;
     this.state.width = this.chart.clientWidth;
-
+    
     this.reinitializeChart();
   } catch (err) {
     if (err instanceof ValidationError) {

src/D3SpectrumDisplayDiv.cpp

@@ -179,8 +179,6 @@ D3SpectrumDisplayDiv::D3SpectrumDisplayDiv( WContainerWidget *parent )
   m_renderFlags( 0 ),
   m_model( new SpectrumDataModel( this ) ),
   m_peakModel( 0 ),
-  m_layoutWidth( 0 ),
-  m_layoutHeight( 0 ),
   m_compactAxis( false ),
   m_legendEnabled( true ),
   m_yAxisIsLog( true ),
@@ -208,7 +206,6 @@ D3SpectrumDisplayDiv::D3SpectrumDisplayDiv( WContainerWidget *parent )
   m_chartBackgroundColor(),
   m_defaultPeakColor( 0, 51, 255, 155 )
 {
-  setLayoutSizeAware( true );
   addStyleClass( "SpectrumDisplayDiv" );
 
   // Cancel right-click events for the div, we handle it all in JS
@@ -301,7 +298,21 @@ void D3SpectrumDisplayDiv::defineJavaScript()
   options += "}";
 
   setJavaScriptMember( "chart", "new SpectrumChartD3(" + jsRef() + "," + options + ");");
+  
+
+#if( USE_FLEX_CHART_LAYOUT )
+  doJavaScript( ""
+    "const resizeObs" + id() + " = new ResizeObserver(entries => {"
+    "for (let entry of entries) {"
+      "if( entry.target && (entry.target.id === '" + id() + "') )"
+        + m_jsgraph + ".handleResize();"
+      "}"
+    "});"
+    "resizeObs" + id() + ".observe(" + jsRef() + ");"
+  );
+#else
   setJavaScriptMember( "wtResize", "function(self, w, h, layout){" + m_jsgraph + ".handleResize();}" );
+#endif
 
 #if( RENDER_REFERENCE_PHOTOPEAKS_SERVERSIDE )
   updateReferncePhotoPeakLines();
@@ -603,13 +614,6 @@ void D3SpectrumDisplayDiv::setShowRefLineInfoForMouseOver( const bool show )
 }//void setShowRefLineInfoForMouseOver( const bool show )
 
 
-void D3SpectrumDisplayDiv::layoutSizeChanged ( int width, int height )
-{
-  m_layoutWidth = width;
-  m_layoutHeight = height;
-}//void layoutSizeChanged ( int width, int height )
-
-
 void D3SpectrumDisplayDiv::render( Wt::WFlags<Wt::RenderFlag> flags )
 {
   const bool renderFull = (flags & Wt::RenderFlag::RenderFull);
@@ -636,18 +640,6 @@ void D3SpectrumDisplayDiv::render( Wt::WFlags<Wt::RenderFlag> flags )
 }
 
 
-int D3SpectrumDisplayDiv::layoutWidth() const
-{
-  return m_layoutWidth;
-}//int layoutWidth() const
-
-
-int D3SpectrumDisplayDiv::layoutHeight() const
-{
-  return m_layoutHeight;
-}//int layoutHeight() const
-
-
 double D3SpectrumDisplayDiv::xAxisMinimum() const
 {
   return m_xAxisMinimum;
@@ -2049,7 +2041,7 @@ void D3SpectrumDisplayDiv::chartFitRoiDragCallback( double lower_energy, double
           if( ismobile )
           {
             menu->addStyleClass( " Wt-popupmenu Wt-outset" );
-            menu->showFromMouseOver();
+            menu->showMobile();
           }else
           {
             menu->addStyleClass( " Wt-popupmenu Wt-outset NumPeakSelect" );