Fix message saying there are RIID results not showing up when loading file.

Also slightly improved display of RIID results for one type of detector.
Fixed compilation warning on Windows.

Author: wcjohns

src/InterSpec.cpp

@@ -9392,7 +9392,7 @@ void InterSpec::setSpectrum( std::shared_ptr<SpecMeas> meas,
     switch( spec_type )
     {
       case SpecUtils::SpectrumType::Foreground:
-        worthShowing = ana->is_empty();
+        worthShowing = !ana->is_empty();
         break;
 
       case SpecUtils::SpectrumType::SecondForeground:

src/MakeDrf.cpp

@@ -479,8 +479,10 @@ namespace
       m_useForEffCb->setChecked( use );
       if( m_userBr )
         m_userBr->setHidden( !use || m_isBackground );
-      
+   
+#ifndef _WIN32
 #warning "Use peak model (after modding it) to set whether to use intrinsic eff or not"
+#endif
       //m_peakModel->setUseForDrfIntrinsicEffFit( use );
       //m_peakModel->setData( )
     }
@@ -2629,7 +2631,9 @@ std::shared_ptr<SpecMeas> MakeDrf::assembleCalFile()
         for( auto peak : sample->peaks() )
         {
           shared_ptr<PeakDef> newpeak = make_shared<PeakDef>( *peak->m_peak );
+#ifndef _WIN32
 #warning "newpeak->setUseForDrfIntrinsicEffFit not needed anymore"
+#endif
           newpeak->setUseForDrfIntrinsicEffFit( peak->useForEffFit() );
           //blah blah blah I dont think this will be needed after we add UseForDrfIntrinsicEffFit as a peak model, assuming m_peak is same as the peak model has...
           newpeaks.push_back( newpeak );

src/ShowRiidInstrumentsAna.cpp

@@ -35,6 +35,7 @@
 #include "InterSpec/SpecMeas.h"
 #include "SpecUtils/SpecFile.h"
 #include "InterSpec/InterSpec.h"
+#include "SpecUtils/StringAlgo.h"
 #include "InterSpec/SimpleDialog.h"
 #include "InterSpec/PhysicalUnits.h"
 #include "InterSpec/InterSpecUser.h"
@@ -232,15 +233,36 @@ class AnaResultDisplay : public WContainerWidget
     m_algorithm_result_description->setText( ana->algorithm_result_description_ );
     m_table->rowAt(AlgorithmResultDescription)->setHidden( m_algorithm_result_description->text().empty() );
 
+#if( ENABLE_EDIT_RESULTS )
     string remarktxt;
-    for( const string &r : ana->remarks_ )
+    for( string r : ana->remarks_ )
+    {
+      SpecUtils::ireplace_all( r, "	", "  " );
       remarktxt += (remarktxt.size() ? "\n" : "") + r;
-    
-#if( ENABLE_EDIT_RESULTS )
+    }
     m_algorithm_remarks->setText( remarktxt );
 #else
-    const WString remarks = Wt::Utils::htmlEncode( WString::fromUTF8(remarktxt), Wt::Utils::HtmlEncodingFlag::EncodeNewLines );
-    m_algorithm_remarks->setText( remarks );
+    string remarktxt;
+    for( string r : ana->remarks_ )
+    {
+      if( r.empty() )
+        continue;
+      
+      // Lets make lines line "Top Line 1: Am241	662.45	400.81" semi-reasonable, and have
+      //  displayed all on the same line.
+      //  TODO: there are probably a lot better ways to do this, like first check if there are any
+      //    lines like this, and if so, make a html table.
+      //  TODO: there are probably a lot of other special cases we can handle.
+      SpecUtils::ireplace_all( r, "	", "---mytab---" );
+      r = Wt::Utils::htmlEncode( r, Wt::Utils::HtmlEncodingFlag::EncodeNewLines );
+      SpecUtils::ireplace_all( r, "---mytab---", "   " );
+      SpecUtils::ireplace_all( r, ": ", ": " );
+      SpecUtils::ireplace_all( r, "Top Line ", "Top Line " );
+      
+      remarktxt += "<div>" + r + "</div>";
+    }//for( string r : ana->remarks_ )
+    
+    m_algorithm_remarks->setText( WString::fromUTF8(remarktxt) );
 #endif
 
     m_table->rowAt(AlgorithmRemarks)->setHidden( m_algorithm_remarks->text().empty() );

target/electron/README.md

@@ -41,7 +41,7 @@ ninja -C build_dir install
 # 'app' sub-directory of your build dir
 cmake-js build --out=build_dir --target install
 # Or
-cmake --build build_dir --target install --config Release
+cmake --build build_dir --target install --config Release --clean-first
 # Or
 ninja -C build_dir install
 
@@ -86,5 +86,5 @@ The `InterSpec` module is really a shared library that node.js loads, therefore
 
 ## Future Work
 - In the future the build process may be improved to do the final packaging through CMake.  
-- launch_options.json is intended to allow users to customize behaviours (like allow multiple windows, or not), but is not actually implemented.
+- launch_options.json is intended to allow users to customize behaviors (like allow multiple windows, or not), but is not actually implemented.
 - Need to look into having only a single instance of the application running when user wants multiple windows open.

target/electron/package.json

@@ -12,8 +12,8 @@
     "install": "cmake-js compile",
     "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"
+    "package-win": "electron-packager ./build_win/app InterSpec --overwrite --asar=false --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=false --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"
   },
   "author": {
     "name": "William Johnson",