Mercurial > hg > orthanc
diff OrthancFramework/Sources/SerializationToolbox.h @ 5807:8279eaab0d1d attach-custom-data
merged default -> attach-custom-data
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Tue, 24 Sep 2024 11:39:52 +0200 |
parents | f7adfb22e20e |
children |
line wrap: on
line diff
--- a/OrthancFramework/Sources/SerializationToolbox.h Thu Sep 15 18:13:17 2022 +0200 +++ b/OrthancFramework/Sources/SerializationToolbox.h Tue Sep 24 11:39:52 2024 +0200 @@ -2,8 +2,9 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2022 Osimis S.A., Belgium - * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium + * Copyright (C) 2017-2023 Osimis S.A., Belgium + * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium + * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -38,6 +39,10 @@ static std::string ReadString(const Json::Value& value, const std::string& field); + static std::string ReadString(const Json::Value& value, + const std::string& field, + const std::string& defaultValue); + static int ReadInteger(const Json::Value& value, const std::string& field); @@ -56,17 +61,23 @@ const std::string& field); static void ReadArrayOfStrings(std::vector<std::string>& target, - const Json::Value& value, + const Json::Value& valueObject, const std::string& field); + static void ReadArrayOfStrings(std::vector<std::string>& target, + const Json::Value& valueArray); + static void ReadListOfStrings(std::list<std::string>& target, const Json::Value& value, const std::string& field); static void ReadSetOfStrings(std::set<std::string>& target, - const Json::Value& value, + const Json::Value& valueObject, const std::string& field); + static void ReadSetOfStrings(std::set<std::string>& target, + const Json::Value& valueArray); + static void ReadSetOfTags(std::set<DicomTag>& target, const Json::Value& value, const std::string& field); @@ -87,10 +98,13 @@ const std::list<std::string>& values, const std::string& field); - static void WriteSetOfStrings(Json::Value& target, + static void WriteSetOfStrings(Json::Value& targetObject, const std::set<std::string>& values, const std::string& field); + static void WriteSetOfStrings(Json::Value& targetArray, + const std::set<std::string>& values); + static void WriteSetOfTags(Json::Value& target, const std::set<DicomTag>& tags, const std::string& field);