Disable re-binning on load by default; fix spec file query tool + more.

Set SpecUtils_REBIN_FILES_TO_SINGLE_BINNING to OFF by default always.
Fix some small warnings seen on VS2017.
Fix DetectorEdit to not display the same relative efficiency TSV multiple times.
Fix DetectorEdit display on Windows to not have scroll bars and mis-formatting all over.
Remove explicit test if a directory can be written into in spectrum file query tool; on Windows this test was erroneously failing due to the check not being correectly implemented (will now just error out if the database cant be written too, which is fine).
Disable spellcheck by default in Electron builds.
Fix invalid runtime check in DoseCalc tool that was accidentally left in.

Author: wcjohns

CMakeLists.txt

@@ -158,7 +158,7 @@ option(USE_GOOGLE_MAP "Use google maps widget" ON)
 option(
     SpecUtils_REBIN_FILES_TO_SINGLE_BINNING
     "Rebins all spectra in spectrum file to the same energy calibration"
-    ON
+    OFF
 )
 option(
     DECAY_CHART_ADD_IMAGE_DOWNLOAD_LINK

InterSpec_resources/DetectorEdit.css

@@ -4,10 +4,13 @@
   font-style: italic;
 }
 
-
-.FormulaDrfTbl
+.DetEditContent
 {
-  width: 100%;
+    overflow-y: auto;
+}
+
+.FormulaDrfTbl {
+    width: 95%;
 }
 
 .FormulaDrfTbl td

main.cpp

@@ -171,7 +171,7 @@ void processCustomArgs( int argc, char **argv )
           SerialToDetectorModel::set_detector_model_input_csv( serial_db[0] );
           set_serial_num_file = true;
         }
-      }catch( std::exception &e )
+      }catch( std::exception & )
       {
         std::cerr << "Invalid userdatadir ('" << argv[i+1] << "') specified"
                   << std::endl;

src/DetectorEdit.cpp

@@ -29,6 +29,7 @@
 #include <string>
 #include <vector>
 #include <fstream>
+#include <algorithm>
 
 #include <boost/tokenizer.hpp>
 #include <boost/filesystem.hpp>
@@ -684,15 +685,23 @@ void RelEffDetSelect::saveFilePathToUserPreferences()
 
   auto children = m_files->children();
 
-  string concat_path;
+  vector<string> paths;
   for( auto w : children )
   {
     auto child = dynamic_cast<RelEffFile *>( w );
     const string filepath = child ? child->filepath() : string("");
     if( filepath.size() )
-      concat_path += (concat_path.size() ? ";" : "") + filepath;
+      paths.push_back( filepath );
+      //concat_path += (concat_path.size() ? ";" : "") + filepath;
   }//string concat_path;
 
+  //Make sure we only save unique paths
+  paths.erase( std::unique( begin(paths), end(paths) ), end(paths) );
+
+  string concat_path;
+  for( const auto &filepath : paths )
+    concat_path += (concat_path.size() ? ";" : "") + filepath;
+
   try
   {
     InterSpecUser::setPreferenceValue( m_interspec->m_user, "RelativeEffDRFPaths", concat_path, m_interspec );
@@ -797,6 +806,9 @@ void RelEffDetSelect::docreate()
 
   SpecUtils::split( paths, pathstr, "\r\n;" );
 
+  //Eliminate any duplicate entries in paths
+  paths.erase( std::unique( begin(paths), end(paths) ), end(paths) );
+
   if( paths.empty() )
     new RelEffFile( "", this, m_detectorEdit, m_files );
 
@@ -1749,7 +1761,7 @@ DetectorEdit::DetectorEdit( std::shared_ptr<DetectorPeakResponse> currentDet,
   lowerContent->resize( WLength::Auto, WLength(190,WLength::Pixel) );
 
   m_drfTypeStack = new Wt::WStackedWidget();
-  m_drfTypeStack->addStyleClass( "UseInfoStack" );
+  m_drfTypeStack->addStyleClass( "UseInfoStack DetEditContent" );
 
   m_drfTypeMenu = new WMenu( m_drfTypeStack, Wt::Vertical );
   m_drfTypeMenu->addStyleClass( "VerticalMenu SideMenu DetEditMenu" );
@@ -1939,9 +1951,8 @@ DetectorEdit::DetectorEdit( std::shared_ptr<DetectorPeakResponse> currentDet,
   //--- 5)  Recent
   //-------------------------------------
   WContainerWidget *recentDiv = new WContainerWidget( );
-  WGridLayout* recentDivLayout = new WGridLayout();
+  WGridLayout* recentDivLayout = new WGridLayout( recentDiv );
   recentDivLayout->setContentsMargins( 0, 0, 0, 0 );
-  recentDiv->setLayout(recentDivLayout);
 
   Dbo::ptr<InterSpecUser> user = m_interspec->m_user;
 
@@ -2059,9 +2070,9 @@ DetectorEdit::DetectorEdit( std::shared_ptr<DetectorPeakResponse> currentDet,
 
   recentDivLayout->addWidget( filter, 1, 2 );
   recentDivLayout->setRowStretch( 0, 1 );
-  recentDiv->setOverflow(Wt::WContainerWidget::OverflowHidden);
-  recentDiv->setMaximumSize( WLength::Auto, 180 );
-  
+  //recentDiv->setOverflow(Wt::WContainerWidget::OverflowHidden);
+  //recentDiv->setMaximumSize( WLength::Auto, 180 );
+  recentDiv->setHeight( WLength( 100, WLength::Unit::Percentage ) );
   m_DBtable->sortByColumn( 2, Wt::SortOrder::DescendingOrder );
 
   //--------------------------------------------------------------------------------

src/DoseCalcWidget.cpp

@@ -249,6 +249,7 @@ class GammaSourceEnter : public Wt::WContainerWidget
     m_nuclideEdit = new WLineEdit();
     layout->addWidget( m_nuclideEdit, 0, 1 );
     m_nuclideEdit->addStyleClass( "DoseEnterTxt" );
+    m_nuclideEdit->setAttributeValue( "spellcheck", "false" );
     label->setBuddy( m_nuclideEdit );
 
     label = new WLabel( "Age:" );
@@ -1327,7 +1328,7 @@ void DoseCalcWidget::runtime_sanity_checks()
   checkPrintDose( 8.23688E-2, "82.37 msv/hr", true );
   checkPrintDose( 8.23688E2, "823.69 sv/hr", true );
   checkPrintDose( 8.23688E5, "823.69 ksv/hr", true );
-  checkPrintDose( 8.23688E6, "8.24 Msv/hr...", true );
+  checkPrintDose( 8.23688E6, "8.24 Msv/hr", true );
 }//void runtime_sanity_checks()
 
 

src/MakeDrf.cpp

@@ -799,7 +799,7 @@ namespace
                 try
                 {
                   age_at_meas = PhysicalUnits::stringToTimeDurationPossibleHalfLife( mtch[2].str(), (nuc ? nuc->halfLife : -1.0) );
-                }catch( std::exception &e )
+                }catch( std::exception & )
                 {
                   cerr << "Failed to convert '" << mtch[2].str() << "' to an age." << endl;
                 }

src/SpecFileQueryDbCache.cpp

@@ -1151,16 +1151,28 @@ bool SpecFileQueryDbCache::open_db( const std::string &path, const bool create_t
 bool SpecFileQueryDbCache::init_existing_persisted_db()
 {
   if( !SpecUtils::is_directory( m_fs_path ) )
+  {
+    std::cerr << "m_fs_path='" << m_fs_path << "', is not a path" << std::endl;
     return false;
-  
-  if( !SpecUtils::can_rw_in_directory( m_fs_path ) )
-    return false;
-  
+  }
+
+  // The read-only atribute of a Windows directory doesnt mean you cant read/write in that dir
+  //  so we'll just always skip checking if you can RW in a directory, even on POSIX, and 
+  //  instead wait for openeing of the database to fail.
+  //if( !SpecUtils::can_rw_in_directory( m_fs_path ) )
+  //{
+  //  std::cerr << "Can not RW in directory '" << m_fs_path << "'." << std::endl;
+  //  return false;
+  //}
+
   const string persisted_path = construct_persisted_db_filename(m_fs_path);
 
   if( !SpecUtils::is_file( persisted_path ) )
+  {
+    std::cerr << "Persisted db path '" << persisted_path << "' is not a file" << std::endl; 
     return false;
-  
+  }
+
   try
   {
     std::unique_ptr<Wt::Dbo::backend::Sqlite3> db( new Wt::Dbo::backend::Sqlite3(persisted_path) );
@@ -1234,6 +1246,7 @@ bool SpecFileQueryDbCache::init_existing_persisted_db()
     m_db_session.reset();
     m_db.reset();
     //passMessage( "Caught exception initind persisted DB; " + string(e.what()), "", 3 );
+    cerr << "\n\nIn persisting cache, caught: " << e.what() << endl << endl;
   }
   return false;
 }//bool init_existing_persisted_db()
@@ -1547,7 +1560,7 @@ void SpecFileQueryDbCache::set_persist( const bool persist )
         }//
 
         const string oldloc = m_db_location;
-
+        m_db_location = newfilename;
 
         if( init_existing_persisted_db() )
             return;

src/SpecFileQueryWidget.cpp

@@ -2142,9 +2142,9 @@ void SpecFileQueryWidget::updateNumberFiles( const string srcdir,
         nfiles, true, srcdir, recursive, extfilter, querywidget, widgetdeleted ) );
 
 #endif
-  } catch( ... )
+  } catch( std::exception &e )
   {
-    std::cerr << "Error in updateNumberFiles; unexpected exception" << std::endl;
+    std::cerr << "Error in updateNumberFiles; unexpected exception: " << e.what() << std::endl;
 
     if( !(*widgetdeleted) )
       WServer::instance()->post( sessionid, boost::bind( &SpecFileQueryWidget::updateNumberFilesInGui,

target/electron/app/main.js

@@ -282,7 +282,7 @@ function createWindow () {
 
   //To get nodeIntegration to work, there is som JS hacks in
   //  InterSpecApp::setupDomEnvironment()
-  windowPrefs.webPreferences = {nodeIntegration: true, nativeWindowOpen: true, enableRemoteModule: true };
+  windowPrefs.webPreferences = {nodeIntegration: true, nativeWindowOpen: true, enableRemoteModule: true, spellcheck: false };
 
   mainWindow = new BrowserWindow( windowPrefs );
 

target/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "InterSpecAddOn",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Application for interactive gamma spectroscopy",
   "homepage": "https://github.com/sandialabs/InterSpec",
   "main": "main.js",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "install": "cmake-js compile",
-    "start": "electron ./build_vs2017/app/",
+    "start": "electron ./build_win/app/",
     "package-mac": "electron-packager ./build_macos/app --overwrite --platform=darwin --arch=x64 --icon=macOS/InterSpec.icns --prune=true --out=release-builds --binaries=InterSpec.exe --extendInfo=macOS/Info.plist --entitlements=macOS/entitlements.mac.plist --ignore=copy_resources.* --ignore=LICENSE.md --ignore=README.md",
     "package-win": "electron-packager ./build_win/app InterSpec --overwrite --asar=0 --platform=win32 --arch=x64 --icon=windows/icon.ico --prune=true --out=release-builds --version-string.CompanyName=\"Sandia National Laboratories\" --version-string.FileDescription=\"nuclear spectroscopy analysis program\" --version-string.ProductName=\"InterSpec\" --ignore=LICENSE.md --ignore=README.md",
     "package-linux": "electron-packager ./build_linux/app InterSpec --overwrite --asar=0 --platform=linux --arch=x64 --icon=linux/InterSpec_desktop_icon_256x256.png --prune=true --out=release-builds --ignore=copy_resources.* --ignore=LICENSE.md --ignore=README.md"