Merge branch 'master' of https://github.com/sandialabs/InterSpec

Author: wcjohns

InterSpec_resources/D3TimeChart.js

@@ -509,6 +509,11 @@ D3TimeChart.prototype.handleResize = function () {
     this.state.height = this.chart.clientHeight;
     this.state.width = this.chart.clientWidth;
 
+    // TODO: switch to getting dimensions via the following; seems to work better
+    //const parentRect = this.chart.getBoundingClientRect();
+    //this.state.height = parentRect.width;
+    //this.state.width = parentRect.height;
+
     this.reinitializeChart();
   } catch (err) {
     if (err instanceof ValidationError) {

data/config/wt_config_osx.xml

@@ -424,7 +424,7 @@
 					 originates, and once after going back to C++) - but when
 					 WebSockets is false, the JS will only be emitted once.
 	  -->
-	<web-sockets>false</web-sockets>
+	<web-sockets>true</web-sockets>
 
 	<!-- Enables the detection of webgl-capabilites.
 

src/InterSpecServer.cpp

@@ -964,7 +964,7 @@ std::string file_to_open_on_load( const std::string &session_token )
         const Wt::Json::Value &val = base.get( "ProxySetting" );
         if( val.type() != Wt::Json::Type::StringType )
           throw runtime_error( "ProxySetting must be a string value" );
-        config.m_proxy = val.toString();
+        config.m_proxy = val.orIfNull("");
       }
 #endif
 

target/electron/CMakeLists.txt

@@ -47,7 +47,6 @@ set( ELECTRON_SUPPORT_FILES
   app/loading.html
   README.md
   package.json
-  app/launch_options.json
 )
 
 add_custom_target( electron_resources SOURCES ${ELECTRON_SUPPORT_FILES} )
@@ -69,7 +68,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibInterSpec/InterSpec_resources/d3.v
 install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../example_spectra DESTINATION ${PROJECT_BINARY_DIR}/app/ )
 install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/app/loading.html
         ${CMAKE_CURRENT_SOURCE_DIR}/app/main.js
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/launch_options.json
         DESTINATION ${PROJECT_BINARY_DIR}/app/ 
 )
 

target/electron/app/launch_options.json

@@ -70,7 +70,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.9.0</string>
+	<string>10.11.0</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>NSMainNibFile</key>

target/electron/macOS/Info.plist

@@ -26,7 +26,7 @@
     "cmake-js": "^6.1.0"
   },
   "devDependencies": {
-    "electron": "^21.4.3",
+    "electron": "^21.4.4",
     "electron-packager": "^17.1.1",
     "node-addon-api": "^6.0.0"
   }

target/electron/package.json

@@ -20,7 +20,7 @@ SET(MACOSX_BUNDLE_BUNDLE_VERSION "0" )
 SET(MACOSX_BUNDLE_COPYRIGHT "Sandia National Labs, Will Johnson" )
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER "gov.sandia.macOS.InterSpec" )
 #set MACOS_BUNDLE_VERSION_NUMBER for Info.plist.template to populate corresponding value in Xcode
-set(MACOS_BUNDLE_VERSION_NUMBER 30)
+set(MACOS_BUNDLE_VERSION_NUMBER 35)
 
 
 SET( ${PRODUCT_NAME} "InterSpec" )