Update version of Electron to use; some minor formatting updates to More NuclideInfo stuff.

Author: wcjohns

InterSpec/MoreNuclideInfo.h

@@ -130,6 +130,12 @@ namespace MoreNuclideInfo
       Returned pointer will be nullptr if XML file is missing, or invalid.
     */
     static std::shared_ptr<const MoreNucInfoDb> instance();
+    
+    /** For debug purposes, reset the pointer to the global instance of this class; any shared pointers you
+     have will remain valid, but the next call to `MoreNucInfoDb::instance()` will return a different
+     instance.
+     */
+    static void remove_global_instance();
 
     std::map<const SandiaDecay::Nuclide *, NucInfo> m_nuc_infos;
     std::map<std::string, NucInfo> m_other_infos;

InterSpec_resources/MoreNuclideInfoDisplay.css

@@ -11,7 +11,7 @@
 
 .MoreNuclideInfoDisplay a
 {
-  color: blue;
+  /* color: blue; */
   cursor: pointer;
 } 
 
@@ -40,6 +40,7 @@
   margin-bottom: 10px;
 }
 
+
 .MoreNuclideInfoDisplay .MoreNucInfoSection .MoreNucInfoSubTitle
 {
   font-weight: 700;
@@ -84,24 +85,24 @@
 }
 
 /* Render unordered lists as CSV lines - this is for the associated nuclides list */
-.MoreNuclideInfoDisplay ul
+.MoreNuclideInfoDisplay ul.MoreNucInfoRelated
 {
   display: inline;
   list-style: none;
   padding-inline-start: 0px;
 }
 
-.MoreNuclideInfoDisplay ul > li
+.MoreNuclideInfoDisplay ul.MoreNucInfoRelated > li
 {
   display: inline;
 }
 
-.MoreNuclideInfoDisplay ul > li:after
+.MoreNuclideInfoDisplay ul.MoreNucInfoRelated > li:after
 {
   content: ", ";
 }
 
-.MoreNuclideInfoDisplay ul > li:last-child:after
+.MoreNuclideInfoDisplay ul.MoreNucInfoRelated > li:last-child:after
 {
   content: "";
 }
@@ -119,13 +120,36 @@
   margin-block-start: 0px;
 }
 
-.MoreNuclideInfoDisplay button.with-label.Wt-btn.LightButton
+.MoreNuclideInfoDisplay button.with-label.Wt-btn.LightButton,
+.MoreNuclideInfoDisplay a
+{
+  color: rgb(18,101,200);
+}
+
+.MoreNuclideInfoDisplay button.with-label.Wt-btn.LightButton:hover,
+.MoreNuclideInfoDisplay a:hover
 {
-  color: blue;
+  color: rgb(99, 161, 236);
 }
 
+
 .MoreNuclideInfoDisplay button.DecayBtn
 {
   margin-top: 5px;
   margin-left: 15px;
-}
+}
+
+
+/* This is each paragraph within analyst notes; i.e., where there was more than one blank lines
+ between writing in more_nuclide_info.xml
+ */
+.MoreNuclideInfoDisplay .MoreNucInfoSection .MoreNucInfoSubSec
+{
+  margin-top: 5px;
+  margin-bottom: 10px;
+}
+
+.MoreNuclideInfoDisplay .MoreNucInfoSection .MoreNucInfoSubSec > ul
+{
+  margin-block-start: 2px;
+}

src/MoreNuclideInfo.cpp

@@ -146,6 +146,21 @@ namespace MoreNuclideInfo
   }//std::shared_ptr<const MoreNucInfoDb> MoreNucInfoDb::instance()
 
 
+  void MoreNucInfoDb::remove_global_instance()
+  {
+    std::lock_guard<std::mutex> lock( sm_mutex );
+    if( sm_db )
+    {
+      assert( sm_status == MoreNuclideInfo::InfoStatus::Inited );
+      sm_db.reset();
+      sm_status = MoreNuclideInfo::InfoStatus::NotInited;
+    }else
+    {
+      assert( sm_status != MoreNuclideInfo::InfoStatus::Inited );
+    }
+  }//void MoreNucInfoDb::remove_global_instance()
+  
+  
   MoreNucInfoDb::MoreNucInfoDb()
   {
   }

src/MoreNuclideInfoDisplay.cpp

@@ -23,6 +23,7 @@
 
 #include "InterSpec_config.h"
 
+#include <regex>
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -339,9 +340,23 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
       const auto more_info_db = MoreNucInfoDb::instance();
       if( more_info_db )
       {
+#ifndef NDEBUG
+#warning "Reseting MoreNucInfoDb for iterating purposes - remove this!"
+        cerr << "Reseting MoreNucInfoDb for iterating purposes - remove this!" << endl;
+        MoreNucInfoDb::remove_global_instance();
+#endif
+        
         const NucInfo *const more_info = more_info_db->info( nuc );
 
-        if( more_info )
+        if( !more_info )
+        {
+          // We need to fill these conditions out, incase we are setting a nuclide that doesnt have
+          //  them, but the previously displayed nuclide did.
+          tmplt.setCondition( "if-has-more-info", false );
+          tmplt.setCondition( "if-has-related", false );
+          tmplt.bindWidget( "related-nucs", nullptr );
+          tmplt.bindString( "more-info", "", Wt::TextFormat::XHTMLText );
+        }else
         {
           tmplt.setCondition( "if-has-related", !more_info->m_associated.empty() );
           if( !more_info->m_associated.empty() )
@@ -353,9 +368,9 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
             for( size_t i = 0; i < more_info->m_associated.size(); ++i )
             {
               const SandiaDecay::Nuclide *associated = db->nuclide( more_info->m_associated[i] );
+              WContainerWidget *li = new WContainerWidget( associatedList );
               if( associated )
               {
-                WContainerWidget *li = new WContainerWidget( associatedList );
                 WAnchor *anchor = new WAnchor( li );
                 anchor->setText( more_info->m_associated[i] );
                 anchor->clicked().connect( boost::bind( &MoreNuclideInfoDisplay::setNuclide, this, associated, history ) );
@@ -365,8 +380,7 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
                 t->addStyleClass( "HalfLife" );
               }else
               {
-                WText *txtw = new WText( more_info->m_associated[i], associatedList );
-                txtw->setInline( false );
+                new WText( more_info->m_associated[i], li );
               }
             }
 
@@ -380,11 +394,16 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
           SpecUtils::ireplace_all( notes, "\r", "" );
           vector<string> more_info_lines;
 
+          // Replace things like &lt;li&gt;Some List Item&lt;/li&gt;
+          //  to <li>Some List Item</li>
+          std::regex tag_regex( "&lt;([a-zA-Z/ ]{1,4})&gt;" );
+          notes = std::regex_replace( notes, tag_regex,"<$1>");
+          
           boost::algorithm::split( more_info_lines, notes,
             boost::algorithm::is_any_of( "\n" ),
             boost::algorithm::token_compress_off );
-
-          notes = "<p>";
+          
+          notes = "<div class=\"MoreNucInfoSubSec\">";
           for( size_t i = 0; i < more_info_lines.size(); ++i )
           {
             string line = more_info_lines[i];
@@ -394,7 +413,7 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
 
             if( line.empty() )
             {
-              notes += "</p><p>";
+              notes += "</div><div class=\"MoreNucInfoSubSec\">";
 
               // Skip all the next empty lines
               for( ; (i + 1) < more_info_lines.size(); ++i )
@@ -407,7 +426,7 @@ void MoreNuclideInfoDisplay::setNuclide( const SandiaDecay::Nuclide *const nuc,
             }//if( line.empty() )
           }//for( size_t i = 0; i < more_info_lines.size(); ++i )
 
-          notes += "</p>";
+          notes += "</div>";
           tmplt.bindString( "more-info", notes, Wt::TextFormat::XHTMLText );
         }//if( more_info )
       }//if( more_info_db )
@@ -443,4 +462,4 @@ MoreNuclideInfoWindow::MoreNuclideInfoWindow( const SandiaDecay::Nuclide *const
 {
   m_display = new MoreNuclideInfoDisplay( nuc, contents() );
   addButton( "Close" );
-}//MoreNuclideInfoWindow
+}//MoreNuclideInfoWindow

target/electron/package.json

@@ -25,7 +25,7 @@
     "cmake-js": "^6.1.0"
   },
   "devDependencies": {
-    "electron": "^23.1.3",
+    "electron": "^21.4.2",
     "electron-packager": "^17.1.1",
     "node-addon-api": "^6.0.0"
   }