Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Common/Convert.cpp (1 of 5 files). Show all
Unified · Split
| @@ -29,13 +29,21 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | namespace gsfts = GSF::TimeSeries; |
| 31 | 31 | |
| 32 | −std::size_t gsfts::TicksToString(char* ptr, std::size_t maxsize, std::string format, int64_t ticks) | |
| 32 | +void GSF::TimeSeries::GetUnixTime(gsfts::int64_t ticks, std::time_t& unixSOC, int& milliseconds) | |
| 33 | 33 | { |
| 34 | 34 | // Unix dates are measured as the number of seconds since 1/1/1970 |
| 35 | 35 | const int64_t BaseTimeOffset = 621355968000000000L; |
| 36 | 36 | |
| 37 | − std::time_t fromSeconds = (std::time_t)((ticks - BaseTimeOffset) / 10000000); | |
| 38 | − int milliseconds = (int)(ticks / 10000 % 1000); | |
| 37 | + unixSOC = (std::time_t)((ticks - BaseTimeOffset) / 10000000); | |
| 38 | + milliseconds = (int)(ticks / 10000 % 1000); | |
| 39 | +} | |
| 40 | + | |
| 41 | +std::size_t GSF::TimeSeries::TicksToString(char* ptr, std::size_t maxsize, std::string format, gsfts::int64_t ticks) | |
| 42 | +{ | |
| 43 | + std::time_t fromSeconds; | |
| 44 | + int milliseconds; | |
| 45 | + | |
| 46 | + GetUnixTime(ticks, fromSeconds, milliseconds); | |
| 39 | 47 | |
| 40 | 48 | std::stringstream formatStream; |
| 41 | 49 | std::size_t formatIndex = 0; |
| @@ -78,4 +86,4 @@ std::size_t gsfts::TicksToString(char* ptr, std::size_t maxsize, std::string for · 36 unmodified lines | ||
| 78 | 86 | } |
| 79 | 87 | |
| 80 | 88 | return std::strftime(ptr, maxsize, formatStream.str().data(), std::localtime(&fromSeconds)); |
| 81 | −} | |
| 89 | +} | |