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

Author: wcjohns

.gitignore

@@ -14,6 +14,8 @@ target/android/InterSpec/app/universal
 target/android/InterSpec/app/x86*
 target/android/InterSpec/app/
 target/android/InterSpec/app/build
+target/electron/node_modules
+target/electron/release-builds
 
 *OUO*
 .svn
@@ -24,6 +26,7 @@ target/android/InterSpec/app/build
 .project
 .svnignore
 .bin
+.vs
 WtsRsrcs
 XcodeFiles
 build

CMakeLists.txt

@@ -2,7 +2,7 @@
 # excpet iOS, Android, and Electron, InterSpecExe
 
 cmake_policy(SET CMP0048 NEW)
-project(InterSpec VERSION 1.0.6)
+project(InterSpec VERSION 1.0.7)
 
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 set(CMAKE_COLOR_MAKEFILE ON CACHE BOOL "Color" FORCE)
@@ -1112,8 +1112,8 @@ else()
     #set_target_properties( InterSpecExe PROPERTIES SUFFIX "")
     set_target_properties(InterSpecExe PROPERTIES OUTPUT_NAME "InterSpec")
 
-    add_executable(peakFitTimingDev testing/peakFitTimingDev.cpp)
-    target_link_libraries(peakFitTimingDev PUBLIC InterSpecLib)
+#    add_executable(peakFitTimingDev testing/peakFitTimingDev.cpp)
+#    target_link_libraries(peakFitTimingDev PUBLIC InterSpecLib)
 endif(IOS)
 
 set_target_properties(InterSpecLib PROPERTIES PREFIX "")

InterSpec/D3SpectrumDisplayDiv.h

@@ -170,8 +170,6 @@ class D3SpectrumDisplayDiv : public Wt::WContainerWidget
   const std::string yAxisTitle() const;
 
 
-  float xUnitsPerPixel() const;
-  
   void enableLegend( const bool forceMobileStyle );
   void disableLegend();
   bool legendIsEnabled() const;

InterSpec/InterSpec.h

@@ -916,9 +916,6 @@ class InterSpec : public Wt::WContainerWidget
   //  The InterSpec pointer is actually only necessary for the
   //  DetectorPeakResponse.
   void guessIsotopesForPeaks( Wt::WApplication *app );
-
-  //kevPerPixel(): Returns the approximated keV that 1 px covers.
-  float kevPerPixel() const;
 
   bool isSupportFile() const;
 

InterSpec_resources/FeatureMarkerWidget.css

@@ -3,10 +3,18 @@
 }
 
 .FeatureMarkerWidget {
-  width: 9em;
+  width: 9.2em;
   padding-bottom: 6px;
 }
 
+.FeatureMarkerWidget .AngleRow {
+  white-space: nowrap;
+}
+
+.FeatureMarkerWidget .AngleInput {
+  width: 2.1em;
+}
+
 .FeatureMarkerWidget > label {
   padding-top: 6px;
 }

main.cpp

@@ -118,6 +118,8 @@ Wt::WApplication *createApplication( const Wt::WEnvironment &env )
 #include <stdio.h>
 #include <shellapi.h>
 
+#include "SpecUtils/StringAlgo.h"
+
 /** Get command line arguments encoded as UTF-8.
     This function just leaks the memory
  

src/D3SpectrumDisplayDiv.cpp

@@ -1060,12 +1060,6 @@ void D3SpectrumDisplayDiv::setYAxisTitle( const std::string &title )
 }//void setYAxisTitle( const std::string &title )
 
 
-float D3SpectrumDisplayDiv::xUnitsPerPixel() const
-{
-  //Christian: We use 0.001 as a placeholder since we don't have reference to SpectrumChart anymore
-  return 0.001;
-}
-
 
 Wt::Signal<double,double> &D3SpectrumDisplayDiv::xRangeChanged()
 {
@@ -2019,7 +2013,8 @@ void D3SpectrumDisplayDiv::chartFitRoiDragCallback( double lower_energy, double
                   m_peakModel->removePeak( p );
                 }catch(std::exception &e)
                 {
-                  cerr << "Unexpected error removing peaks - must not be a valid peak any more..." << endl;
+                  cerr << "Unexpected error removing peaks - must not be a valid peak any more...: " 
+                       << e.what() << endl;
                 }
               }//for( const auto &p : added_peaks )
 

src/DoseCalcWidget.cpp

@@ -1254,7 +1254,7 @@ void DoseCalcWidget::runtime_sanity_checks()
   expected = 25.19E-6 * PhysicalUnits::rem/PhysicalUnits::hour;  //Other program gives 23.9 uRem/h
   check_nuc( nuclide, age, distance, areal_density, atomic_number, expected );
 
-  areal_density = 50.0f * PhysicalUnits::gram / PhysicalUnits::cm2;
+  areal_density = 50.0f * static_cast<float>(PhysicalUnits::gram / PhysicalUnits::cm2);
   expected = 2.59E-6 * PhysicalUnits::rem/PhysicalUnits::hour;  //Other program gives 0.842 uRem/h
   check_nuc( nuclide, age, distance, areal_density, atomic_number, expected );
 
@@ -1267,7 +1267,7 @@ void DoseCalcWidget::runtime_sanity_checks()
   expected = 1.86E-6 * PhysicalUnits::rem/PhysicalUnits::hour; //Other program gives 1.8 uRem/h
   check_nuc( nuclide, age, distance, areal_density, atomic_number, expected );
 
-  areal_density = 2.0f * PhysicalUnits::gram / PhysicalUnits::cm2;
+  areal_density = 2.0f * static_cast<float>(PhysicalUnits::gram / PhysicalUnits::cm2);
   expected = 2.34E-6 * PhysicalUnits::rem/PhysicalUnits::hour; //Other program gives 0.78 uRem/h
   check_nuc( nuclide, age, distance, areal_density, atomic_number, expected );
 

src/EnergyCalGraphical.cpp

@@ -384,7 +384,7 @@ void EnergyCalGraphicalConfirm::apply()
         assert( 0 );
         break;
     }//switch( energycal->type() )
-  }catch( std::exception &e )
+  }catch( std::exception & )
   {
     string msg;
     msg = "The coeffiecients {";

src/EnergyCalMultiFile.cpp

@@ -881,7 +881,7 @@ void EnergyCalMultiFileModel::refreshData()
       try
       {
         cal = spec->suggested_sum_energy_calibration( samplnums, gammaDetNames );
-      }catch( std::exception &e )
+      }catch( std::exception & )
       {
 #if( PERFORM_DEVELOPER_CHECKS )
         log_developer_error( __func__, "Unexpected failure of suggested_sum_energy_calibration" );