Fix Isotopics by peaks HTML export not showing some axis lines, as well as now using proper path to html template file, and allowing user to select location to save to (on Windows)

Author: wcjohns

InterSpec_resources/static_text/manual_rel_act_report.tmplt.html

@@ -82,13 +82,13 @@
         fill: white;
       }
 
-      .SpecChart .xaxistitle, .SpecChart .yaxistitle, .SpecChart .yaxis, .SpecChart .xaxis{
-        /* stroke: black; */
+      .xaxistitle, .yaxistitle, .yaxis, .yaxislabel, .xaxis, .xaxis > .tick > text, .yaxis > .tick > text {
+        fill: black;
       }
 
 
-      .xaxis > .domain, .yaxis > .domain, .xaxis > .tick > line, .yaxis > .tick, .yaxistick {
-        /* stroke: black; */
+      .xaxis > .domain, .yaxis > .domain, .xaxis > .tick > line, .yaxis > .tick > line, .yaxistick {
+        stroke: black;
       }
 
       .xgrid > .tick, .ygrid > .tick{

src/RelActCalcManual.cpp

@@ -1721,10 +1721,10 @@ void RelEffSolution::print_html_report( ostream &output_html_file,
 
 
   auto load_file_contents = []( string filename ) -> string {
-    //Wt::WApplication *app = Wt::WApplication::instance();
-    //string filepath = app ? app->docRoot() : "InterSpec_resources";
-    string filepath = "InterSpec_resources";
-    filepath = SpecUtils::append_path(filepath, filename );
+    Wt::WApplication *app = Wt::WApplication::instance();
+    string filepath = app ? app->docRoot() : string("");
+    filepath = SpecUtils::append_path( filepath, "InterSpec_resources" );
+    filepath = SpecUtils::append_path( filepath, filename );
 
     vector<char> file_data;
     try

src/RelActManualGui.cpp

@@ -105,6 +105,7 @@ class RelActManualReportResource : public Wt::WResource
     assert( m_app );
     assert( m_tool );
     assert( m_interspec );
+    setTakesUpdateLock( true );
   }
 
   virtual ~RelActManualReportResource()
@@ -197,11 +198,11 @@ class RelActManualReportResource : public Wt::WResource
     {
       cerr << "Error handling request for RelActManualReportResource: " << e.what() << endl;
       log("error") << "Error handling request for RelActManualReportResource: " << e.what();
-      response.out() << "Error creating HTML                           file: " << e.what()
+      response.out() << "Error creating HTML file: " << e.what()
       << "\n\nPlease report to InterSpec@sandia.gov.";
 
-      //passMessage( "Error getting spectrum file currently being shown",
-      //              "", WarningWidget::WarningMsgHigh );
+      passMessage( "Error getting spectrum file currently being shown: " + string(e.what()),
+                   WarningWidget::WarningMsgHigh );
 
       response.setStatus(500);
       assert( 0 );
@@ -672,23 +673,23 @@ void RelActManualGui::init()
   m_downloadHtmlReport = new WAnchor( WLink(m_htmlResource), btndiv );
   m_downloadHtmlReport->setTarget( AnchorTarget::TargetNewWindow );
   m_downloadHtmlReport->setStyleClass( "LinkBtn DownloadLink CALp" );
-  m_downloadHtmlReport->setText( "HTML Report" );
 #else
-  m_downloadHtmlReport = new WPushButton( "HTML Report", btndiv );
+  m_downloadHtmlReport = new WPushButton( btndiv );
   m_downloadHtmlReport->setIcon( "InterSpec_resources/images/download_small.svg" );
+  m_downloadHtmlReport->setLink( WLink( m_htmlResource ) );
   m_downloadHtmlReport->setLinkTarget( Wt::TargetNewWindow );
   m_downloadHtmlReport->setStyleClass( "LinkBtn DownloadBtn CALp" );
-  m_downloadHtmlReport->setLink( WLink(m_htmlResource) );
-  
+ 
 #if( ANDROID )
   // Using hacked saving to temporary file in Android, instead of via network download of file.
   m_downloadHtmlReport->clicked().connect( std::bind([this](){
     android_download_workaround( m_calpResource, "rel_eff.html");
   }) );
 #endif //ANDROID
-  
 #endif
 
+  m_downloadHtmlReport->setText( "HTML Report" );
+
   WContainerWidget *nucCol = new WContainerWidget();
   nucCol->addStyleClass( "ToolTabTitledColumn RelActNucCol" );