Mercurial > hg > orthanc-wsi
changeset 93:14146ecd1688
Display version of the framework in the logs
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 23 Dec 2016 16:49:23 +0100 |
| parents | 4b0e0f7c9957 |
| children | 5164bb05f972 21ba24e6e381 |
| files | Applications/ApplicationToolbox.cpp Applications/ApplicationToolbox.h Applications/DicomToTiff.cpp Applications/Dicomizer.cpp NEWS |
| diffstat | 5 files changed, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/ApplicationToolbox.cpp Fri Dec 23 16:06:05 2016 +0100 +++ b/Applications/ApplicationToolbox.cpp Fri Dec 23 16:49:23 2016 +0100 @@ -24,10 +24,13 @@ #include "../Resources/Orthanc/Core/HttpClient.h" #include "../Resources/Orthanc/Core/Logging.h" #include "../Resources/Orthanc/Core/MultiThreading/BagOfTasksProcessor.h" +#include "../Resources/Orthanc/Core/SystemToolbox.h" #include "../Resources/Orthanc/OrthancServer/FromDcmtkBridge.h" +#include <boost/filesystem.hpp> #include <boost/lexical_cast.hpp> #include <boost/regex.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> #include <cassert> @@ -202,5 +205,27 @@ << std::endl << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl; } + + + void ShowVersionInLog(const char* path) + { + std::string version(ORTHANC_WSI_VERSION); + + if (version == "mainline") + { + try + { + boost::filesystem::path exe(Orthanc::SystemToolbox::GetPathToExecutable()); + std::time_t creation = boost::filesystem::last_write_time(exe); + boost::posix_time::ptime converted(boost::posix_time::from_time_t(creation)); + version += " (" + boost::posix_time::to_iso_string(converted) + ")"; + } + catch (...) + { + } + } + + LOG(WARNING) << "Orthanc WSI version: " << version; + } } }
--- a/Applications/ApplicationToolbox.h Fri Dec 23 16:06:05 2016 +0100 +++ b/Applications/ApplicationToolbox.h Fri Dec 23 16:49:23 2016 +0100 @@ -42,5 +42,7 @@ const std::string& color); void PrintVersion(const char* path); + + void ShowVersionInLog(const char* path); } }
--- a/Applications/DicomToTiff.cpp Fri Dec 23 16:06:05 2016 +0100 +++ b/Applications/DicomToTiff.cpp Fri Dec 23 16:49:23 2016 +0100 @@ -274,6 +274,7 @@ int main(int argc, char* argv[]) { OrthancWSI::ApplicationToolbox::GlobalInitialize(); + OrthancWSI::ApplicationToolbox::ShowVersionInLog(argv[0]); int exitStatus = 0; boost::program_options::variables_map options;
--- a/Applications/Dicomizer.cpp Fri Dec 23 16:06:05 2016 +0100 +++ b/Applications/Dicomizer.cpp Fri Dec 23 16:49:23 2016 +0100 @@ -876,6 +876,7 @@ int main(int argc, char* argv[]) { OrthancWSI::ApplicationToolbox::GlobalInitialize(); + OrthancWSI::ApplicationToolbox::ShowVersionInLog(argv[0]); int exitStatus = 0;
--- a/NEWS Fri Dec 23 16:06:05 2016 +0100 +++ b/NEWS Fri Dec 23 16:49:23 2016 +0100 @@ -4,6 +4,8 @@ * Thanks to David Clunie's feedback: - Fix generation of tag "Dimension Index Sequence" (0020,9222) - Fix generation of tag "Dimension Index Values" (0020,9157) +* Improved logging in the viewer plugin +* Display version of the framework in the logs Version 0.2 (2016/11/28)