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

Author: wcjohns

CMakeLists.txt

@@ -160,6 +160,11 @@ option(
     "Include support for downloading images of the displayed page"
     OFF
 )
+option(
+    USE_CSS_FLEX_LAYOUT
+    "Use CSS Flex/Grid Layout in-place of Wts layouts were possible (work in progress)"
+    OFF
+)
 
 set(MAX_SPECTRUM_MEMMORY_SIZE_MB 256
     CACHE STRING

InterSpec/AuxWindow.h

@@ -144,6 +144,9 @@ class AuxWindow : public Wt::WDialog
   // w->finished( boost::bind( &AuxWindow:::deleteAuxWindow, window ) );
   static void deleteAuxWindow( AuxWindow *window );
 
+  /** A convenience function to call #deleteAuxWindow via binding to a signal. */
+  void deleteSelf();
+  
   //rejectWhenEscapePressed(): sets it up so hitting escape will cause the
   //  finished() signal to be emmitted; also hides the dialog
   virtual void rejectWhenEscapePressed( bool enable = true );

InterSpec/D3SpectrumDisplayDiv.h

@@ -94,22 +94,9 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
 
   void setPeakModel( PeakModel *model );
 
-  /// \TODO: for all setData, setSecondData, and setBackground, get rid of live/real-time arguments
-  ///        and neutron counts.
-  void setData( std::shared_ptr<SpecUtils::Measurement> data_hist,
-               float liveTime,
-               float realTime,
-               float neutronCounts,
-               bool keep_curent_xrange );
-  void setSecondData( std::shared_ptr<SpecUtils::Measurement> hist,
-                     float liveTime,
-                     float realTime,
-                     float neutronCounts,
-                     bool ownAxis );
-  void setBackground( std::shared_ptr<SpecUtils::Measurement> background,
-                     float liveTime,
-                     float realTime,
-                     float neutronCounts );
+  void setData( std::shared_ptr<SpecUtils::Measurement> data_hist, const bool keep_curent_xrange );
+  void setSecondData( std::shared_ptr<SpecUtils::Measurement> hist, const bool ownAxis );
+  void setBackground( std::shared_ptr<SpecUtils::Measurement> background );
 
   void scheduleUpdateForeground();
   void scheduleUpdateBackground();

InterSpec/FluxTool.h

@@ -37,6 +37,7 @@
 #include "InterSpec/AuxWindow.h"
 
 //  ToDo:
+//    - Better and more-consistent printing to appropriate number of significant figures.
 //    - Havent fully tested that copying to clipboard will work everywhere.
 //    - Can maybe improve copying to clipboard using the clipboard API.
 //    - Have some capability to automatically fit for a number of pre-defined
@@ -81,6 +82,26 @@ class FluxToolWindow : public AuxWindow
 
 class FluxToolWidget : public Wt::WContainerWidget
 {
+public:
+  enum class DisplayInfoLevel
+  {
+    /** Only energy, nuclide, and gammas into 4pi are shown.
+     Gammas into 4pi uncertainty gets its own column in CSV, and is given as a percent uncertainty.
+     */
+    Simple,
+    
+    /** Nuclide, IntrinsicEff, GeometricEff, FluxOnDet columns are NOT shown.
+     Uncertainties get own column in CSV, as actual value (e.g., not percent).
+     */
+    Normal,
+    
+    /** All columns are shown.
+     Uncertainties are placed in their own column in CSV, as the actual value (e.g., not percent).
+     */
+    Extended
+  };//enum class DisplayInfoLevel
+  
+  
 public:
   FluxToolWidget( InterSpec *viewer,
                   Wt::WContainerWidget *parent = 0 );
@@ -105,11 +126,16 @@ class FluxToolWidget : public Wt::WContainerWidget
 
   Wt::Signal<> &tableUpdated();
 
+  DisplayInfoLevel displayInfoLevel() const;
+  
 protected:
   void init();
   void setTableNeedsUpdating();
   void refreshPeakTable();
-  void setMinimalColumnsOnly( const bool minonly );
+  
+  
+  void setDisplayInfoLevel( const DisplayInfoLevel disptype );
+  
 #if( FLUX_USE_COPY_TO_CLIPBOARD )
   void tableCopiedToCliboardCallback( const int copied );
 #endif
@@ -132,8 +158,8 @@ class FluxToolWidget : public Wt::WContainerWidget
    */
   bool m_needsTableRefresh;
 
-  /** Whether to show all the columns or not. Default no. */
-  bool m_compactColumns;
+  /** What columns to show. */
+  DisplayInfoLevel m_displayInfoLevel;
 
   Wt::Signal<> m_tableUpdated;
 

InterSpec/InterSpec.h

@@ -1188,18 +1188,15 @@ class InterSpec : public Wt::WContainerWidget
 
   SpecMeasManager        *m_fileManager; // The file manager
 
-  // 20210604: started playing around with using FLEX layout for just the charts - its not there yet,
-  //           but shows some promise.
-#define USE_CSS_FLEX_LAYOUT 1
 
-  //Note: m_chartsLayout may be eliminated; may even be able to eliminate
-  //  m_toolsLayout...
 #if( USE_CSS_FLEX_LAYOUT )
   Wt::WContainerWidget *m_chartResizer;
   Wt::WContainerWidget *m_toolsResizer;
 #else
   Wt::WGridLayout        *m_layout;
-  Wt::WGridLayout        *m_chartsLayout;
+  
+  Wt::WContainerWidget   *m_charts;
+  Wt::WContainerWidget   *m_chartsResize;
   Wt::WGridLayout        *m_toolsLayout;
 #endif
 

InterSpec/InterSpec_config.h.in

@@ -32,6 +32,15 @@
 #cmakedefine01 USE_OSX_NATIVE_MENU
 #cmakedefine01 USE_ELECTRON_NATIVE_MENU
 
+// 20210604: started playing around with using FLEX layout its not there yet, but shows some promise.
+//   Items that need to be worked on:
+//     - [ ] Controlling time chart height properly.
+//     - [ ] When tool tabs are hidden, and one of those tools is selected to show, properly handling that
+//     - [ ] Allowing to resize the tool tabs and time chart.
+//     - [ ] Propagating tool tab size changes to wtResize(...) in JS to allow those tabs layouts
+//           to change - or reimplementing their layouts using CSS grid or flex
+#cmakedefine01 USE_CSS_FLEX_LAYOUT
+
 // Since USE_ELECTRON_NATIVE_MENU can be set to true without BUILD_AS_ELECTRON_APP being true, you
 //  have to test both its an electron app, and the menu type, so we'll create a little bit of a
 //  shortcut

InterSpec/SpecMeasManager.h

@@ -70,6 +70,7 @@ class UserFileInDb;
 class PopupDivMenu;
 class SpectraHeader;
 class InterSpec;
+class SimpleDialog;
 class SpecMeasManager;
 class SpectraFileModel;
 class PopupDivMenuItem;
@@ -369,6 +370,11 @@ class SpecMeasManager : public Wt::WObject
   void handleFileDrop( const std::string &name,
                        const std::string &spoolName,
                        SpecUtils::SpectrumType type );
+  
+  void handleFileDropWorker( const std::string &name,
+                       const std::string &spoolName,
+                       SpecUtils::SpectrumType type,
+                       SimpleDialog *dialog );
 
 protected:
   //Called from inside displayFile(...) to see if there are options for

InterSpec/SpectrumDataModel.h

@@ -80,25 +80,15 @@ class SpectrumDataModel: public Wt::WAbstractItemModel
 
   //setDataHistogram(): also sets m_secondSF and m_backgroundSF to
   //  m_dataLiveTime/m_{Second|Background}LiveTime
-  virtual void setDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist,
-                                 float liveTime,
-                                 float realTime,
-                                 float neutronCounts );
+  virtual void setDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
 
-  //setSecondDataHistogram(): also sets m_secondSF to
-  //  m_dataLiveTime/m_secondDataLiveTime
+  //setSecondDataHistogram(): also sets m_secondSF to m_dataLiveTime/m_secondDataLiveTime
   virtual void setSecondDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist,
-                                       float liveTime,
-                                       float realTime,
-                                       float neutronCounts,
-                                       bool ownAxis );
+                                      const bool ownAxis );
 
   //setBackgroundHistogram(): also sets m_backgroundSF to
   //  m_dataLiveTime/m_backgroundLiveTime
-  virtual void setBackgroundHistogram( std::shared_ptr<SpecUtils::Measurement> hist,
-                                       float liveTime,
-                                       float realTime,
-                                       float neutronCounts );
+  virtual void setBackgroundHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
 
   // Flags for whether the background are getting subtracted.
   void setBackgroundSubtract( const bool subtract = true );

InterSpec/SpectrumDisplayDiv.h

@@ -97,20 +97,9 @@ class SpectrumDisplayDiv : public Wt::WContainerWidget
 
   void setPeakModel( PeakModel *model );
 
-  void setData( std::shared_ptr<SpecUtils::Measurement> data_hist,
-                float liveTime,
-                float realTime,
-                float neutronCounts,
-                bool keep_curent_xrange );
-  void setSecondData( std::shared_ptr<SpecUtils::Measurement> hist,
-                      float liveTime,
-                      float realTime,
-                      float neutronCounts,
-                      bool ownAxis );
-  void setBackground( std::shared_ptr<SpecUtils::Measurement> background,
-                      float liveTime,
-                      float realTime,
-                      float neutronCounts );
+  void setData( std::shared_ptr<SpecUtils::Measurement> data_hist, const bool keep_curent_xrange );
+  void setSecondData( std::shared_ptr<SpecUtils::Measurement> hist, const bool ownAxis );
+  void setBackground( std::shared_ptr<SpecUtils::Measurement> background );
 
 
   // These 8 functions retrieve the corresponding info from the model.

InterSpec_resources/CompactFileManager.css

@@ -11,7 +11,8 @@
 
 .CompactFileManager.LeftToRight{
   display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
+  /* We need to keep too long of file selectors of titles from forcing each display from overgrowing its allotted 1/3 of width. */
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
   grid-column-gap: 5px;
   grid-auto-rows: minmax(100px, auto) 23px;
 }
@@ -68,13 +69,8 @@ div.DispType > div {
 div.DispType .SpecFileSelect{
   padding-left: 5px;
   padding-right: 5px;
-  display: flex;
-  
 }
 
-div.DispType .SpecFileSelect > select{
-  flex-grow: 1;
-}
 
 div.DispType div.SampleSelectRow {
   display: flex;
@@ -107,6 +103,8 @@ div.SampleSelectRow .NextNextSample{
 
 div.DispType .SpecTitle {
   margin-top: 15px;
+  /* white-space: nowrap; */ /* having the title be a single line with ellipses doesnt seem to work quite right */
+  text-overflow: ellipsis;
 }
 
 div.DispType .BottomRow {