From 788c1a8ef84c13974951f6b33bb6a2d86a47e235 Mon Sep 17 00:00:00 2001
From: William Johnson <wcjohns@sandia.gov>
Date: Wed, 2 Oct 2024 09:51:52 -0700
Subject: [PATCH] Fix up file export layout for mobile, a little. A few other
 small changes.

---
 InterSpec_resources/ExportSpecFile.css |  46 +++++++++++++++++-------
 InterSpec_resources/favicon.ico        | Bin 0 -> 15406 bytes
 data/config/wt_config_localweb.xml     |   2 +-
 src/ExportSpecFile.cpp                 |  13 ++++---
 src/InterSpec.cpp                      |  48 +++++++++++++++++--------
 src/SpectraFileModel.cpp               |   2 +-
 6 files changed, 78 insertions(+), 33 deletions(-)
 create mode 100644 InterSpec_resources/favicon.ico

diff --git a/InterSpec_resources/ExportSpecFile.css b/InterSpec_resources/ExportSpecFile.css
index 3c8c742f..751df5eb 100644
--- a/InterSpec_resources/ExportSpecFile.css
+++ b/InterSpec_resources/ExportSpecFile.css
@@ -63,9 +63,17 @@
 {
   flex-grow: 2;
   margin-top: 5px;
+  height: 330px;
 }
 
-.ExportSpecFileTool .ExportSpecFileBody .ExportColTitle
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFileTabs > .Wt-stack
+{
+  height: 300px;
+  display: flex;
+  flex-direction: column;
+}
+
+.ExportSpecFileTool .ExportColTitle
 {
   display: block;
   white-space: nowrap;
@@ -92,6 +100,24 @@
   row-gap: 5px;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSelect,
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFormat,
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSamples,
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecOptions
+{
+  border: none;
+  
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 10px;
+}
+
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSelect,
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFormat,
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSamples
+{
+  overflow-y: auto;
+}
 
 .ExportSpecFileTool .ExportSpecSamples
 {
@@ -110,7 +136,7 @@
   margin-right: 5px;
 }
 
-.ExportSpecFileTool .ExportSpecFileBody .ExportSpecSelect .ExportSpecInfo
+.ExportSpecFileTool .ExportSpecSelect .ExportSpecInfo
 {
   display: inline-block;
   overflow-y: auto;
@@ -133,9 +159,7 @@
 
 .ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSelect
 {
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 10px;
+  
 }
 
 .ExportSpecInfo .ExportSpecInfoTable
@@ -175,13 +199,6 @@
   height: 100%;
 }
 
-.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFormat
-{
-  height: 300px;
-  overflow-y: auto;
-}
-
-
 .ExportSpecFileTool .ExportSpecFormat .ExportSpecFormatMenu.SideMenu
 {
   overflow-y: auto;
@@ -230,6 +247,11 @@
   border-bottom: none;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecOptions
+{
+  width: 100%;
+}
+
 .ExportSpecFileTool .ExportSpecFileBody .ExportSpecOptions .ExportColTitle
 {
 }
diff --git a/InterSpec_resources/favicon.ico b/InterSpec_resources/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4999cb53b5bfb0a7b7b2f4fdad07c1b57433aec7
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001

diff --git a/data/config/wt_config_localweb.xml b/data/config/wt_config_localweb.xml
index d4acddfc..f902695d 100644
--- a/data/config/wt_config_localweb.xml
+++ b/data/config/wt_config_localweb.xml
@@ -594,7 +594,7 @@
 	       by setting this property, or for an individual application
 	       entry point by passing a location to WServer::addEntryPoint().
 	      -->
-	    <!-- <property name="favicon">images/favicon.ico</property> -->
+	    <property name="favicon">InterSpec_resources/favicon.ico</property>
 	</properties>
 
     </application-settings>
diff --git a/src/ExportSpecFile.cpp b/src/ExportSpecFile.cpp
index 28629813..0ad0807f 100644
--- a/src/ExportSpecFile.cpp
+++ b/src/ExportSpecFile.cpp
@@ -125,6 +125,8 @@ const std::vector<std::pair<SpecUtils::SaveSpectrumAsType,std::string>> sm_file_
 #if( USE_QR_CODES )
 namespace
 {
+  const int ns_min_screen_width_for_wide_layout = 750;
+  
 std::string clean_uuid( string uuid )
 {
   SpecUtils::trim(uuid);
@@ -741,18 +743,19 @@ void ExportSpecFileTool::init()
   const bool showToolTips = InterSpecUser::preferenceValue<bool>( "ShowTooltips", m_interspec );
   const bool isMobile = m_interspec && m_interspec->isMobile();
 
-  const int screenWidth = m_interspec->renderedWidth();
-  const bool isPhone = (screenWidth > 100) ? (screenWidth < 640) : m_interspec->isPhone();
-  
   if( isMobile )
     addStyleClass( "ExportSpecFileToolMobile" );
   
+  const int screenWidth = m_interspec->renderedWidth();
+  const bool isPhone = (screenWidth > 100) ? (screenWidth < ns_min_screen_width_for_wide_layout) : m_interspec->isPhone();
+  
   WTabWidget *mobileTabs = nullptr;
   WContainerWidget *body = nullptr;
 
   if( isPhone )
   {
     addStyleClass( "ExportSpecFileToolPhone" );
+
     mobileTabs = new WTabWidget( this );
     mobileTabs->addStyleClass( "ExportSpecFileTabs" );
   }else
@@ -3619,7 +3622,7 @@ ExportSpecFileWindow::ExportSpecFileWindow( InterSpec *viewer )
   addStyleClass( "export-spec-file" );
   
   const int w = viewer->renderedWidth();
-  const bool isPhone = (w > 100) ? (w < 640) : (viewer && viewer->isPhone());
+  const bool isPhone = (w > 100) ? (w < ns_min_screen_width_for_wide_layout) : (viewer && viewer->isPhone());
 
   if( isPhone )
   {
@@ -3627,7 +3630,7 @@ ExportSpecFileWindow::ExportSpecFileWindow( InterSpec *viewer )
   }else 
   {
     //setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 800.0) : 800.0 ,WLength::Pixel), WLength::Auto );
-    setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 600.0) : 600.0 ,WLength::Pixel), WLength::Auto );
+    setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 650.0) : 650.0, WLength::Pixel), WLength::Auto );
   }
   m_tool = new ExportSpecFileTool( viewer, contents() );
   m_tool->done().connect( boost::bind(&ExportSpecFileWindow::accept, this) );
diff --git a/src/InterSpec.cpp b/src/InterSpec.cpp
index 549607a7..9f3ea20f 100644
--- a/src/InterSpec.cpp
+++ b/src/InterSpec.cpp
@@ -11039,24 +11039,44 @@ void InterSpec::setSpectrum( std::shared_ptr<SpecMeas> meas,
 
   if( (spec_type == SpecUtils::SpectrumType::Foreground) && previous && (previous != meas) )
   {
-    closeShieldingSourceFit();
+    saveShieldingSourceModelToForegroundSpecMeas();
+#if( USE_REL_ACT_TOOL )
+    saveRelActManualStateToForegroundSpecMeas();
+    saveRelActAutoStateToForegroundSpecMeas();
+#endif
     
 #if( USE_DB_TO_STORE_SPECTRA )
-    //if( m_user->preferenceValue<bool>( "AutoSaveSpectraToDb" ) )
-    //{
-    //  //We also need to do this in the InterSpec destructor as well.
-    //  //   Also maybe change size limitations to only apply to auto saving
-    //  if( current_state_index >= 0 )
-    //  {
-    //    //Save to (HEAD) of current state
-    //  }else
-    //  {
-    //    //Create a state
-    //    //Handle case where file is to large to be saved
-    //  }
-    //}
+    /*
+    if( previous && m_user->preferenceValue<bool>( "AutoSaveSpectraToDb" ) )
+    {
+      //We also need to do this in the InterSpec destructor as well.
+      //   Also maybe change size limitations to only apply to auto saving
+      const long long int current_state_index = currentAppStateDbId();
+      if( current_state_index >= 0 )
+      {
+        startStoreStateInDb( false, false, false, false ); //save snapshot
+      }else
+      {
+        m_fileManager->saveToDatabase( previous );
+      }
+    }//if(
+     */
 #endif //#if( USE_DB_TO_STORE_SPECTRA )
     
+    // Close Shielding/Source fit Window
+    if( m_shieldingSourceFitWindow )
+    {
+      delete m_shieldingSourceFitWindow;
+      m_shieldingSourceFitWindow = nullptr;
+      m_shieldingSourceFit = nullptr;
+    }
+    
+    
+    if( m_relActAutoGui )
+    {
+      // TODO: Should we close this?
+    }
+    
     if( m_riidDisplay )
       programmaticallyCloseRiidResults();
   }//if( (spec_type == SpecUtils::SpectrumType::Foreground) && !!previous && (previous != meas) )
diff --git a/src/SpectraFileModel.cpp b/src/SpectraFileModel.cpp
index c4befd9a..99152efc 100644
--- a/src/SpectraFileModel.cpp
+++ b/src/SpectraFileModel.cpp
@@ -343,7 +343,7 @@ std::shared_ptr<SpecMeas> SpectraFileHeader::resetFromDatabase(
   std::shared_ptr<SpecMeas> memobj = dbdata->decodeSpectrum();
   setMeasurmentInfo( memobj );
   
-  m_displayName = info->filename;
+  m_displayName = SpecUtils::filename( info->filename );
   m_uploadTime = info->uploadTime;
   m_modifiedSinceDecode = info->userHasModified;