Mercurial > hg > orthanc-stone
diff Framework/Toolbox/MessagingToolbox.h @ 118:a4d0b6c82b29 wasm
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Oct 2017 14:31:26 +0200 |
parents | 2eca030792aa |
children | e2fe9352f240 |
line wrap: on
line diff
--- a/Framework/Toolbox/MessagingToolbox.h Thu Sep 28 16:55:51 2017 +0200 +++ b/Framework/Toolbox/MessagingToolbox.h Mon Oct 02 14:31:26 2017 +0200 @@ -24,40 +24,16 @@ #include "../Enumerations.h" #include <Plugins/Samples/Common/IOrthancConnection.h> +#include <Plugins/Samples/Common/IDicomDataset.h> #include <Core/Images/ImageAccessor.h> +#include <Core/DicomFormat/DicomMap.h> #include <json/value.h> -#if defined(__native_client__) -# include <ppapi/cpp/core.h> -#else -# include <boost/date_time/posix_time/ptime.hpp> -#endif - namespace OrthancStone { namespace MessagingToolbox { - class Timestamp // TODO REMOVE THIS - { - private: -#if defined(__native_client__) - PP_TimeTicks time_; -#else - boost::posix_time::ptime time_; -#endif - - public: - Timestamp(); - -#if defined(__native_client__) - static void Initialize(pp::Core* core); -#endif - - int GetMillisecondsSince(const Timestamp& other); - }; - - bool ParseJson(Json::Value& target, const void* content, size_t size); @@ -88,5 +64,8 @@ unsigned int frame, unsigned int quality, Orthanc::PixelFormat targetFormat); + + void ConvertDataset(Orthanc::DicomMap& target, + const OrthancPlugins::IDicomDataset& source); } }