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

Author: wcjohns

InterSpec/InterSpecServer.h

@@ -284,6 +284,13 @@ namespace InterSpecServer
     /** If true, will open the WebView inspector console on launch. */
     bool m_open_dev_tools;
 
+#if( USE_LEAFLET_MAP )
+    /** The key to use to access the https://arcgis.com server to get map tiles from.
+     This value overides the default one built into InterSpec, if specified.
+     */
+    std::string m_arcgis_key;
+#endif
+    
     /** Returns application config, as determined from defaults and then 
     InterSpec_app_settings.json files.
 

InterSpec/LeafletRadMap.h

@@ -96,12 +96,13 @@ class LeafletRadMap : public Wt::WContainerWidget
 
 #if( BUILD_AS_ELECTRON_APP || IOS || ANDROID || BUILD_AS_OSX_APP || BUILD_AS_LOCAL_SERVER || BUILD_AS_WX_WIDGETS_APP )
   /** Look in the users data directory for a file named "arcgis\_key.txt", whose contents is the arcgis access key.
+   If that file isnt present, will look in `InterSpec_app_settings.json` file for a "ArcGisKey" value to use.
    
    Newlines, whitespaces, and some other invalid characters are discarded.
    
-   If the file does not exist, an empty string is returned.
-   If the file exists, but after removing invalid characters, it is less than 6 characters, then "empty" is returned.
-   If the file exists, and has a somewhat valid seeming contents, will return those.
+   If the file(s) do not exist, an empty string is returned.
+   If a file exists, but after removing invalid characters, it is less than 6 characters, then "empty" is returned.
+   If a file exists, and has a somewhat valid seeming contents, will return those.
    
    \sa InterSpec::writableDataDirectory
    */

data/config/example_InterSpec_app_settings.json

@@ -1,19 +1,22 @@
 {
-  "Usage": "Rename this file to 'InterSpec_app_settings.json' and placed either in the 'data' folder of the InterSpec distribution, or in the user data store (see 'Help' -> 'About InterSpec...' -> 'Data', for example on Windows: 'C:\\Users\\<username>\\AppData\\Roaming\\InterSpec'", 
-  "Purpose": "This file allows you to change settings for how InterSpec is launched; only intended for debugging or advanced usuage.  You must close all InterSpec windows before settings will take effect.", 
+  "Usage": "Rename this file to 'InterSpec_app_settings.json' and placed either in the 'data' folder of the InterSpec distribution, or in the user data store (see 'Help' -> 'About InterSpec...' -> 'Data', for example on Windows: 'C:\\Users\\<username>\\AppData\\Roaming\\InterSpec'.  All settings in this file are optional, so you can remove any settings you dont want to change/specify, and the default values will be used for that setting.", 
+  "Purpose": "This file allows you to change settings for how InterSpec is launched; only intended for debugging or advanced usage.  You must close all InterSpec windows before settings will take effect.", 
 
   "ProxySetting": "",
-  "ProxySetting_Documentation": "Only applicable to Windows and Linux builds. Valid values are: empty (default), 'direct', 'auto_detect', 'system'; any other string will be interpreted as the 'proxyRules' setting documented at https://www.electronjs.org/docs/latest/api/session#sessetproxyconfig (an value might be 'http=proxy.somecompany.com:80,direct://'). This setting is only applicable if you use the map tool (the only part of InterSpec to use the internet); if map tiles wont load, and you are behind a proxy, you may need to set this setting; usually a value of 'system' will work.  If you set this settting, and you are not behind a proxy, InterSpec startup time may hang for ~30 seconds, usually with a white screen, while a proxy request times out.",
+  "ProxySetting_Documentation": "Only applicable to Windows and Linux builds. Valid values are: empty (default), 'direct', 'auto_detect', 'system'; any other string will be interpreted as the 'proxyRules' setting documented at https://www.electronjs.org/docs/latest/api/session#sessetproxyconfig (an value might be 'http=proxy.somecompany.com:80,direct://'). This setting is only applicable if you use the map tool (the only part of InterSpec to use the internet); if map tiles wont load, and you are behind a proxy, you may need to set this setting; usually a value of 'system' will work.  If you set this setting, and you are not behind a proxy, InterSpec startup time may hang for ~30 seconds, usually with a white screen, while a proxy request times out.",
 
   "HttpPortToServeOn": 0,
-  "HttpPortToServeOn_Documentation": "The HTTP port to serve the application on; if zero (recomended!), will choose random port on startup.  Otherwise choose a port larger than 1024 (e.x., 8080) since ports below this may require admin privledges (never run InterSpec as admin!).",
+  "HttpPortToServeOn_Documentation": "The HTTP port to serve the application on; if zero (recommended!), will choose random high-numbered port on startup.  Otherwise you can choose a port larger than 1024 (e.x., 8080) since ports below this may require admin privileges (never run InterSpec as admin!).  If you specify a non-zero value, then only one session of InterSpec can run on your computer at a time (although that one session may have multiple windows open).",
 
   "RestorePreviousSession": true,
   "RestorePreviousSession_Documentation": "When true (default), InterSpec may attempt to restore your previous session in InterSpec.",
 
   "AllowTokenFreeSessions": false,
-  "AllowTokenFreeSessions_Documentation": "Normally external sessions (i.e. 'View' -> 'Use in external browser') get assigned a one-time-use token that is required to load InterSpec into the browser.  Without a valid token, you cant load a session in the browser.  If you allow external sessions without tokens, then the token wont be needed - and any application that can access your localhost network can create a session and potentually access your data.  It is not recomended to to enable this setting.",
+  "AllowTokenFreeSessions_Documentation": "Normally external sessions (i.e. 'View' -> 'Use in external browser') get assigned a one-time-use token that is required to load InterSpec into the browser.  Without a valid token, you cant load a session in the browser.  If you allow external sessions without tokens, then the token wont be needed - and any application that can access your localhost network (i.e., your computers internal network that is only accessible on your computer) can create a session and potentially access your data.  It is not recommended to to enable this setting.",
 
   "OpenDevTools": false,
-  "OpenDevTools_Documentation": "Enables right-clicking on an element to open the WebView Dev Tools to allow debugging JavaScript errors you may run into (please report to InterSpec@sandia.gov if you find any)" 
+  "OpenDevTools_Documentation": "Enables right-clicking on an element to open the WebView Dev Tools to allow debugging JavaScript errors you may run into (please report to InterSpec@sandia.gov if you find any).  On macOS you will still need to select 'Edit' -> 'Enable Web Inspector'.",
+
+  "ArcGisKey": "",
+  "ArcGisKey_Documentation": "If specified (i.e., non-empty string), this key will be used to use to access the https://arcgis.com server to get map tiles from, when you invoke invoke the map tool."
 }

src/ColorThemeWidget.cpp

@@ -77,6 +77,7 @@ ColorThemeWidget::ColorThemeWidget(WContainerWidget *parent)
 	cell = table->elementAt(row, 1);
 	cell->setColumnSpan(2);
 	m_themeTitle = new WLineEdit("Title not assigned", cell);
+  m_themeTitle->setAttributeValue( "ondragstart", "return false" );
 	label->setBuddy(m_themeTitle);
 	m_themeTitle->setWidth(WLength(95, WLength::Percentage));
 
@@ -85,7 +86,8 @@ ColorThemeWidget::ColorThemeWidget(WContainerWidget *parent)
 	label = new WLabel("Description",cell);
 	cell = table->elementAt(row, 1);
 	cell->setColumnSpan(2);
-    m_themeDescription = new WLineEdit("Desc not assigned", cell);
+  m_themeDescription = new WLineEdit("Desc not assigned", cell);
+  m_themeDescription->setAttributeValue( "ondragstart", "return false" );
 	label->setBuddy(m_themeDescription);
 	m_themeDescription->setWidth(WLength(95, WLength::Percentage));
 
@@ -456,6 +458,7 @@ ColorThemeWidget::ColorThemeWidget(WContainerWidget *parent)
   {
     cell = table->elementAt(i,0);
     m_specificRefLineName[i] = new WLineEdit( cell );
+    m_specificRefLineName[i]->setAttributeValue( "ondragstart", "return false" );
     nuclideSuggest->forEdit( m_specificRefLineName[i], WSuggestionPopup::Editing );
     m_specificRefLineName[i]->changed().connect( boost::bind( &ColorThemeWidget::specificRefLineSourceChangedCallback, this, i ) );
     m_specificRefLineName[i]->enterPressed().connect( boost::bind( &ColorThemeWidget::specificRefLineSourceChangedCallback, this, i ) );

src/CompactFileManager.cpp

@@ -190,6 +190,7 @@ CompactFileManager::CompactFileManager( SpecMeasManager *fileManager,
 
     m_displayedPreTexts[typeindex] = new WText( m_sampleDivs[typeindex] );
     WLineEdit *edit = new WLineEdit( m_sampleDivs[typeindex] );
+    edit->setAttributeValue( "ondragstart", "return false" );
     edit->addStyleClass( "SampleNumInput" );
     edit->setValidator( validator );
     edit->setAutoComplete( false );

src/DbFileBrowser.cpp

@@ -881,6 +881,7 @@ void SnapshotBrowser::startEditSelected()
 
   WLabel *label = new WLabel( "Name" );
   WLineEdit *nameEdit = new WLineEdit();
+  nameEdit->setAttributeValue( "ondragstart", "return false" );
   nameEdit->setEmptyText( "(Name to store under)" );
   nameEdit->setText( state->name );
   layout->addWidget( label, 0, 0 );

src/DecayActivityDiv.cpp

@@ -532,6 +532,8 @@ class DateLengthCalculator : public WContainerWidget
     m_layout->addWidget( label, 2, 0, AlignMiddle );
 
     m_duration = new WLineEdit();
+    
+    m_duration->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
     m_duration->setAttributeValue( "autocorrect", "off" );
     m_duration->setAttributeValue( "spellcheck", "off" );
@@ -875,6 +877,7 @@ class DateLengthCalculator : public WContainerWidget
 
       cell = nuctbl->elementAt(1 + rowOffset, 1);
       WLineEdit *activityEdit = new WLineEdit(cell);
+      activityEdit->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
       activityEdit->setAttributeValue( "autocorrect", "off" );
       activityEdit->setAttributeValue( "spellcheck", "off" );
@@ -944,6 +947,7 @@ class DateLengthCalculator : public WContainerWidget
 
       cell = nuctbl->elementAt(2 + rowOffset, 1);
       WLineEdit *ageEdit = new WLineEdit(cell);
+      ageEdit->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
       ageEdit->setAttributeValue( "autocorrect", "off" );
       ageEdit->setAttributeValue( "spellcheck", "off" );
@@ -1508,6 +1512,7 @@ class CsvDownloadGui : public AuxWindow
 
     el = table->elementAt(0,1);
     m_ageEdit = new WLineEdit( timeSpanStr, el );
+    m_ageEdit->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
     m_ageEdit->setAttributeValue( "autocorrect", "off" );
     m_ageEdit->setAttributeValue( "spellcheck", "off" );
@@ -1716,6 +1721,7 @@ void DecayActivityDiv::init()
   //Initialize all member widgets; will assign parentage later on
 //  m_nuclides( 0 ),
   m_displayTimeLength      = new WLineEdit( "" );
+  m_displayTimeLength->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
   m_displayTimeLength->setAttributeValue( "autocorrect", "off" );
   m_displayTimeLength->setAttributeValue( "spellcheck", "off" );

src/DecayChainChart.cpp

@@ -367,6 +367,9 @@ pair<AuxWindow *, DecayChainChart *>
       (Wt::WFlags<AuxWindowProperties>( AuxWindowProperties::DisableCollapse ) 
          | AuxWindowProperties::EnableResize) );
 
+  WPushButton *close = window->addCloseButtonToFooter();
+  close->clicked().connect( boost::bind( &AuxWindow::hide, window ) );
+    
   WGridLayout *layout = window->stretcher();
   layout->addWidget( chart, 0, 0 );
   layout->setContentsMargins( 0, 0, 0, 0 );

src/DecaySelectNuclideDiv.cpp

@@ -226,6 +226,9 @@ void DecaySelectNuclide::init()
                                           Wt::XHTMLUnsafeText );
   m_isotopeSearch            = new WLineEdit();
 
+  m_nuclideActivityEdit->setAttributeValue( "ondragstart", "return false" );
+  m_nuclideAgeEdit->setAttributeValue( "ondragstart", "return false" );
+  m_isotopeSearch->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
   m_nuclideActivityEdit->setAttributeValue( "autocorrect", "off" );
   m_nuclideActivityEdit->setAttributeValue( "spellcheck", "off" );

src/DoseCalcWidget.cpp

@@ -251,6 +251,7 @@ class GammaSourceEnter : public Wt::WContainerWidget
     label->addStyleClass( "DoseFieldLabel" );
     m_nuclideEdit = new WLineEdit();
     m_nuclideEdit->setAutoComplete( false );
+    m_nuclideEdit->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
     m_nuclideEdit->setAttributeValue( "autocorrect", "off" );
     m_nuclideEdit->setAttributeValue( "spellcheck", "off" );
@@ -264,7 +265,9 @@ class GammaSourceEnter : public Wt::WContainerWidget
     layout->addWidget( label, 1, 0, AlignMiddle );
     label->addStyleClass( "DoseFieldLabel" );
     m_nuclideAgeEdit = new WLineEdit();
+    
     m_nuclideAgeEdit->setAutoComplete( false );
+    m_nuclideAgeEdit->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
     m_nuclideAgeEdit->setAttributeValue( "autocorrect", "off" );
     m_nuclideAgeEdit->setAttributeValue( "spellcheck", "off" );
@@ -971,7 +974,9 @@ void DoseCalcWidget::init()
 
 
         m_doseEnter = new WLineEdit( m_enterWidgets[i] );
+        
         m_doseEnter->setAutoComplete( false );
+        m_doseEnter->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
         m_doseEnter->setAttributeValue( "autocorrect", "off" );
         m_doseEnter->setAttributeValue( "spellcheck", "off" );
@@ -1022,7 +1027,9 @@ void DoseCalcWidget::init()
 
         m_activityEnter = new WLineEdit( m_enterWidgets[i] );
         m_activityEnter->addStyleClass( "DoseEnterTxt" );
+        
         m_activityEnter->setAutoComplete( false );
+        m_activityEnter->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
         m_activityEnter->setAttributeValue( "autocorrect", "off" );
         m_activityEnter->setAttributeValue( "spellcheck", "off" );
@@ -1096,7 +1103,9 @@ void DoseCalcWidget::init()
 
 
         m_distanceEnter = new WLineEdit( "100 cm" );
+        
         m_distanceEnter->setAutoComplete( false );
+        m_distanceEnter->setAttributeValue( "ondragstart", "return false" );
 #if( BUILD_AS_OSX_APP || IOS )
         m_distanceEnter->setAttributeValue( "autocorrect", "off" );
         m_distanceEnter->setAttributeValue( "spellcheck", "off" );