Duct tape over some JS error getting when loading batch GUI under some conditions.

Some how JS loading of spectrum chart was getting out of sync with load thier parent divs - I hypothesize;  added in some delays, and so dont seem to be seeing it any more.
Also, disabled D3SpectrumDisplayDiv from removeing its style rules at destruct, because this was effecting other charts

Author: wcjohns

src/BatchGuiInputFile.cpp

@@ -194,7 +194,7 @@ BatchGuiInputSpectrumFile::BatchGuiInputSpectrumFile( const std::string display_
         *status_ptr = is_csv ? 2 : 3;
       }// if( parsed as spectrum file ) / else
 
-      WServer::instance()->post( sessionid, updateGuiCallback );
+      WServer::instance()->schedule( 250, sessionid, updateGuiCallback );
     } );
 }// BatchGuiInputSpectrumFile constructor
 
@@ -299,7 +299,7 @@ void BatchGuiInputSpectrumFile::set_spectrum( std::shared_ptr<SpecMeas> spec_mea
       spec->resize( WLength( 100, WLength::Percentage ), WLength( 100, WLength::Percentage ) );
 
       // We dont currently need to explicitly set the color theme, as all color theme styling for
-      //   D3SpectrumDisplayDiv is globablly applied...
+      //   D3SpectrumDisplayDiv is globally applied...
       // InterSpec *interspec = InterSpec::instance();
       // spec->applyColorTheme( interspec->getColorTheme() );
       // interspec->colorThemeChanged().connect( boost::bind( &D3SpectrumDisplayDiv::applyColorTheme, spec,

src/BatchGuiWidget.cpp

@@ -28,13 +28,15 @@
 #include <chrono>
 
 #include <Wt/WMenu>
+#include <Wt/WServer>
 #include <Wt/WGroupBox>
 #include <Wt/WGridLayout>
 #include <Wt/WPushButton>
 #include <Wt/WApplication>
 #include <Wt/WStackedWidget>
 #include <Wt/WContainerWidget>
 
+#include "SpecUtils/Filesystem.h"
 
 #include "InterSpec/SpecMeas.h"
 #include "InterSpec/InterSpec.h"
@@ -214,7 +216,35 @@ BatchGuiWidget::BatchGuiWidget( FileDragUploadResource *uploadResource, Wt::WCon
   m_input_status_error->addStyleClass( "ReasonCantAnalyzeMsg" );
   m_input_status_error->hide();
 
-  addInputFiles( m_uploadResource->takeSpooledFiles() );
+  
+  const vector<tuple<string,string,bool>> spooled_files = m_uploadResource->takeSpooledFiles();
+  
+  // We will load the initial spectrum files, after giving the widget a second to fully load.
+  //  I'm not quite sure why, but without doing this, sometimes we can get a JS exception,
+  //  maybe because the JS is somehow getting out of order?
+  //addInputFiles( m_uploadResource->takeSpooledFiles() );
+  
+  boost::function<void()> load_files
+                = wApp->bind( boost::bind( &BatchGuiWidget::addInputFiles, this, spooled_files ) );
+  boost::function<void()> worker = [load_files](){
+    load_files();
+    wApp->triggerUpdate();
+  };
+  
+  // Fallback function to clean the files up, incase this session is no longer alive
+  //  BUT note that there is a path where if this widget is deleted, before the worker is called,
+  //  then the files wont be cleaned up any way.
+  boost::function<void()> fall_back = [spooled_files](){
+    for( const tuple<string, string, bool> &file : spooled_files )
+    {
+      const string &path_to_file = std::get<1>( file );
+      const bool should_delete = std::get<2>( file );
+      if( should_delete )
+        SpecUtils::remove_file( path_to_file );
+    }
+  };//fall_back
+  
+  WServer::instance()->schedule( 500, wApp->sessionId(), worker, fall_back );
 }// BatchGuiWidget constructor
 
 BatchGuiWidget::~BatchGuiWidget()

src/D3SpectrumDisplayDiv.cpp

@@ -2878,8 +2878,9 @@ D3SpectrumDisplayDiv::~D3SpectrumDisplayDiv()
   WCssStyleSheet &style = wApp->styleSheet();
   for( const auto name_rule : m_cssRules )
   {
-    if( !name_rule.first.empty() && style.isDefined(name_rule.first) )
-      style.removeRule( name_rule.second );
+    cout << "Not remove style rule '" << name_rule.first << "' since it messes things up - need to implement applying chart rules globally, instead of for each instance." << endl;
+    //if( !name_rule.first.empty() && style.isDefined(name_rule.first) )
+    //  style.removeRule( name_rule.second );
   }
 }//~D3SpectrumDisplayDiv()
 

target/osx/InterSpec_batch.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+</dict>
+</plist>