Make JS/CSS resource directory a required argument for the functions that use that.

wcjohns · wcjohns · commit 112696c59d8d · 2025-06-04T17:30:44.000-07:00
Not totally done however, the `SpecFile::write(...)` function still defaults to the compiled directory.
There is probably a better mecahanism to be done here (maybe an ugly static variable that can be set?)
diff --git a/SpecUtils/D3SpectrumExport.h b/SpecUtils/D3SpectrumExport.h
@@ -73,13 +73,23 @@ namespace D3SpectrumExport
   //Legacy function for the moment... makes an entire HTML page for the provided Measurement
   bool write_d3_html( std::ostream &ostr,
                       const std::vector< std::pair<const SpecUtils::Measurement *,D3SpectrumOptions> > &measurements,
-                      const D3SpectrumChartOptions &options );
-  
+                      const D3SpectrumChartOptions &options
+#if( !SpecUtils_D3_SUPPORT_FILE_STATIC )
+                     /// @param base_dir The location of where the JS and CSS files are stored.  You may be able to use D3_SCRIPT_RUNTIME_DIR defined in D3SpectrumExportResources.h
+                      , const std::string &base_dir
+#endif
+                     );
+
   /** Writes the HTML page header (</head> is the last thing written), including
       all JSS and CSS necassary for SpectrumChartD3.
    */
+#if( SpecUtils_D3_SUPPORT_FILE_STATIC )
   bool write_html_page_header( std::ostream &ostr, const std::string &page_title );
-  
+#else
+  /// @param base_dir The location of where the JS and CSS files are stored.  You may be able to use D3_SCRIPT_RUNTIME_DIR defined in D3SpectrumExportResources.h
+  bool write_html_page_header( std::ostream &ostr, const std::string &page_title, const std::string &base_dir );
+#endif
+
   
   /** Write the javascript for a SpectrumChartD3 that should be displayed in a 
       <div> with id specified by div_name.
diff --git a/SpecUtils/SpecFile.h b/SpecUtils/SpecFile.h
@@ -2287,7 +2287,12 @@ class SpecFile
   bool write_d3_html( std::ostream &output,
                       const D3SpectrumExport::D3SpectrumChartOptions &options,
                       std::set<int> sample_nums,
-                      std::vector<std::string> det_names ) const;
+                      std::vector<std::string> det_names
+#if( !SpecUtils_D3_SUPPORT_FILE_STATIC )
+                     /// @param base_dir The location of where the JS and CSS files are stored.  You may be able to use D3_SCRIPT_RUNTIME_DIR defined in D3SpectrumExportResources.h
+                      , const std::string &base_dir
+#endif
+                     ) const;
 #endif
   
 #if( SpecUtils_INJA_TEMPLATES )
diff --git a/src/D3SpectrumExport.cpp b/src/D3SpectrumExport.cpp
@@ -395,7 +395,11 @@ D3SpectrumChartOptions::D3SpectrumChartOptions()
 }
 
 
+#if( SpecUtils_D3_SUPPORT_FILE_STATIC )
   bool write_html_page_header( std::ostream &ostr, const std::string &title )
+#else
+  bool write_html_page_header( std::ostream &ostr, const std::string &title, const std::string &basdir )
+#endif
   {
     const char *endline = "\r\n";
     
@@ -423,7 +427,6 @@ D3SpectrumChartOptions::D3SpectrumChartOptions()
     //could also:
     //ostr << "include(\"" << D3_MIN_JS_FILENAME << "\");" << endline;
     using SpecUtils::append_path;
-    const std::string basdir = D3_SCRIPT_RUNTIME_DIR;
     
     ostr << "<script>" << file_to_string( append_path(basdir, D3_MIN_JS_FILENAME) ) << "</script>" << endline;
     
@@ -682,12 +685,20 @@ D3SpectrumChartOptions::D3SpectrumChartOptions()
   
   bool write_d3_html( std::ostream &ostr,
                       const std::vector< std::pair<const SpecUtils::Measurement *,D3SpectrumOptions> > &measurements,
-                      const D3SpectrumChartOptions &options )
+                      const D3SpectrumChartOptions &options
+#if( !SpecUtils_D3_SUPPORT_FILE_STATIC )
+                      , const std::string &base_dir
+#endif
+)
   {
     const char *endline = "\r\n";
-    
+
+#if( SpecUtils_D3_SUPPORT_FILE_STATIC )
     write_html_page_header( ostr, options.m_title );
-    
+#else
+    write_html_page_header( ostr, options.m_title, base_dir );
+#endif
+
     const string div_id = "chart1";
     
     ostr << "<body><div id=\"" << div_id << "\" class=\"chart\" oncontextmenu=\"return false;\"></div>" << endline;  // Adding the main chart div
diff --git a/src/SpecFile.cpp b/src/SpecFile.cpp
@@ -69,6 +69,9 @@
 
 #if( SpecUtils_ENABLE_D3_CHART )
 #include "SpecUtils/D3SpectrumExport.h"
+#if( !SpecUtils_D3_SUPPORT_FILE_STATIC )
+#include "D3SpectrumExportResources.h"
+#endif
 #endif
 
 #if( SpecUtils_ENABLE_URI_SPECTRA )
@@ -7109,7 +7112,11 @@ std::string SpecFile::generate_psuedo_uuid() const
 bool SpecFile::write_d3_html( ostream &ostr,
                               const D3SpectrumExport::D3SpectrumChartOptions &options,
                               std::set<int> sample_nums,
-                              std::vector<std::string> det_names ) const
+                              std::vector<std::string> det_names
+#if( !SpecUtils_D3_SUPPORT_FILE_STATIC )
+                              , const std::string &base_dir
+#endif
+) const
 {
   try
   {
@@ -7130,8 +7137,12 @@ bool SpecFile::write_d3_html( ostream &ostr,
     vector< pair<const Measurement *,D3SpectrumExport::D3SpectrumOptions> > measurements;
     D3SpectrumExport::D3SpectrumOptions spec_options;
     measurements.push_back( pair<const Measurement *,::D3SpectrumExport::D3SpectrumOptions>(summed.get(),spec_options) );
-    
+
+#if( SpecUtils_D3_SUPPORT_FILE_STATIC )
     return D3SpectrumExport::write_d3_html( ostr, measurements, options );
+#else
+    return D3SpectrumExport::write_d3_html( ostr, measurements, options, base_dir );
+#endif
   }catch( std::exception & )
   {
      return false;
@@ -8951,7 +8962,12 @@ void SpecFile::write( std::ostream &strm,
     case SaveSpectrumAsType::HtmlD3:
     {
       D3SpectrumExport::D3SpectrumChartOptions options;
+#if( SpecUtils_D3_SUPPORT_FILE_STATIC )
       success = info.write_d3_html( strm, options, samples, info.detector_names_ );
+#else
+      // TODO: we should probably fix defaulting to `D3_SCRIPT_RUNTIME_DIR` to specify the JS/CSS source dir
+      success = info.write_d3_html( strm, options, samples, info.detector_names_, D3_SCRIPT_RUNTIME_DIR );
+#endif
       break;
     }
 #endif
