Fix compile on windows issues from upgrade to std::chrono; bump app v…

…ersion to 1.0.11
sandialabs · Sep 13, 2022 · ccb1960 · ccb1960
1 parent fd72fb2
commit ccb1960
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1...3.20 FATAL_ERROR)
 
-project(InterSpec VERSION 1.0.10)
+project(InterSpec VERSION 1.0.11)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/src/DrfSelect.cpp b/src/DrfSelect.cpp
@@ -75,22 +75,24 @@
 #include "rapidxml/rapidxml.hpp"
 #include "rapidxml/rapidxml_print.hpp"
 
-#include "SpecUtils/SpecFile.h"
+
 #include "SpecUtils/DateTime.h"
-#include "InterSpec/DrfSelect.h"
-#include "InterSpec/InterSpec.h"
-#include "InterSpec/AuxWindow.h"
+#include "SpecUtils/SpecFile.h"
 #include "SpecUtils/Filesystem.h"
 #include "SpecUtils/ParseUtils.h"
 #include "SpecUtils/StringAlgo.h"
+#include "SpecUtils/SpecUtilsAsync.h"
+
+#include "InterSpec/DrfSelect.h"
+#include "InterSpec/InterSpec.h"
+#include "InterSpec/AuxWindow.h"
 #include "InterSpec/ColorTheme.h"
 #include "InterSpec/HelpSystem.h"
 #include "InterSpec/SimpleDialog.h"
 #include "InterSpec/InterSpecApp.h"
 #include "InterSpec/PhysicalUnits.h"
 #include "InterSpec/DataBaseUtils.h"
 #include "InterSpec/WarningWidget.h"
-#include "SpecUtils/SpecUtilsAsync.h"
 #include "InterSpec/SpecMeasManager.h"
 #include "InterSpec/SpectraFileModel.h"
 #include "InterSpec/RowStretchTreeView.h"
@@ -171,7 +173,7 @@ namespace
           string valstr;
           if( val > 0 )
           {
-            SpecUtils::time_point_t ptt = std::chrono::system_clock::from_time_t( time_t(val) );
+            SpecUtils::time_point_t ptt = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::from_time_t( time_t(val) ) );
             ptt += std::chrono::seconds( 60*m_timeZoneOffset );
             valstr = SpecUtils::to_common_string(ptt, true);
           }
@@ -1051,7 +1053,7 @@ void RelEffFile::handleSaveFileForLater()
       filename = filename.substr( 0, filename.size() - orig_extension.size() );
 
     const int offset = wApp->environment().timeZoneOffset();
-    auto now = std::chrono::system_clock::now();
+    auto now = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
     now += std::chrono::seconds(60*offset);
     string timestr = SpecUtils::to_vax_string(now); //"2014-Sep-19 14:12:01.62"
     const string::size_type pos = timestr.find( ' ' );
@@ -3168,7 +3170,7 @@ void DrfSelect::handleUserChangedUploadedDrfName()
   if( value.empty() )
   {
     const int offset = wApp->environment().timeZoneOffset();
-    auto now = std::chrono::system_clock::now();
+    auto now = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
     now += std::chrono::seconds(60*offset);
     value = SpecUtils::to_vax_string(now);
     m_uploadedDetName->setText( WString::fromUTF8(value) );
@@ -3698,8 +3700,8 @@ void DrfSelect::fileUploadedCallback( const UploadCallbackReason context )
     if( userDrfFilename.size() < 15 )
     {
       const int offset = wApp->environment().timeZoneOffset();
-      auto now = std::chrono::system_clock::now();
-      now += std::chrono::seconds(60*offset);
+      auto now = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
+      now += chrono::seconds(60*offset);
       userDrfFilename += " " + SpecUtils::to_vax_string(now);
     }
 

diff --git a/src/InterSpec.cpp b/src/InterSpec.cpp
@@ -4095,7 +4095,7 @@ void InterSpec::logMessage( const Wt::WString& message, int priority )
 //    wApp->triggerUpdate();
   }else
   {
-    auto now = std::chrono::system_clock::now();
+    auto now = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
     cerr << "Message " << SpecUtils::to_iso_string( now ) << " ";
     cerr << "[" << priority << "]: ";
     cerr << message.toUTF8() << endl << endl;
@@ -6972,8 +6972,8 @@ void InterSpec::saveChartToImg( const bool spectrum, const bool asPng )
     filename += "_timechart";
 
   const int offset = wApp->environment().timeZoneOffset();
-  auto localtime = std::chrono::system_clock::now();
-  localtime += std::chrono::seconds(60*offset);
+  auto localtime = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
+  localtime += chrono::seconds(60*offset);
 
   std::string timestr = SpecUtils::to_iso_string( localtime );
   auto ppos = timestr.find('.');

diff --git a/src/InterSpecApp.cpp b/src/InterSpecApp.cpp
@@ -1145,7 +1145,7 @@ void InterSpecApp::prepareForEndOfSession()
         const int offset = environment().timeZoneOffset();
         WString desc = "End of Session";
         const auto now = chrono::system_clock::now() + chrono::seconds( 60*offset );
-        WString name = SpecUtils::to_common_string( now, true ); //"9-Sep-2014 15:02:15"
+        WString name = SpecUtils::to_common_string( chrono::time_point_cast<chrono::microseconds>(now), true ); //"9-Sep-2014 15:02:15"
 
         Wt::Dbo::ptr<UserState> dbstate;
         std::shared_ptr<DataBaseUtils::DbSession> sql = m_viewer->sql();

diff --git a/src/MakeDrf.cpp b/src/MakeDrf.cpp
@@ -3077,7 +3077,7 @@ void MakeDrf::writeCsvSummary( std::ostream &out,
   int offset = 0;
   if( wApp )
     offset = wApp->environment().timeZoneOffset();
-  auto localtime = std::chrono::system_clock::now();
+  auto localtime = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
   localtime += std::chrono::seconds(60*offset);
 
   out << "# Detector Response Function generated by InterSpec "

diff --git a/src/RelActCalcAuto.cpp b/src/RelActCalcAuto.cpp
@@ -4538,13 +4538,17 @@ void RelActAutoSolution::print_html_report( std::ostream &out ) const
     local_time = Wt::WLocalDateTime::currentDateTime().toString("yyyyMMdd hh:mm:ss").toUTF8();
   }else
   {
-    const auto utc_ts = chrono::system_clock::now();
+    const auto utc_ts = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
     utc_time = SpecUtils::to_common_string( utc_ts, true );
 
 
     std::time_t current_time = std::chrono::system_clock::to_time_t(utc_ts);
     struct tm current_local_time;
+#if( defined( WIN32 ) )
+    localtime_s( &current_local_time, &current_time );
+#else
     localtime_r( &current_time, &current_local_time );
+#endif
     char buffer[64] = { '\0' };
 
     //"9-Sep-2014 03:02:15 PM"

diff --git a/src/SpecMeasManager.cpp b/src/SpecMeasManager.cpp
@@ -1441,8 +1441,8 @@ bool SpecMeasManager::handleMultipleDrfCsv( std::istream &input,
         filename = filename.substr( 0, filename.size() - orig_extension.size() );
 
       const int offset = wApp->environment().timeZoneOffset();
-      auto now = std::chrono::system_clock::now();
-      now += std::chrono::seconds(60*offset);
+      auto now = chrono::time_point_cast<chrono::microseconds>( chrono::system_clock::now() );
+      now += chrono::seconds(60*offset);
 
       string timestr = SpecUtils::to_vax_string(now); //"2014-Sep-19 14:12:01.62"
       const string::size_type pos = timestr.find( ' ' );