Mercurial > hg > orthanc
annotate OrthancFramework/Sources/DicomFormat/DicomSequencesMap.cpp @ 5043:ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
author | Alain Mazy <am@osimis.io> |
---|---|
date | Mon, 27 Jun 2022 15:22:19 +0200 |
parents | |
children |
rev | line source |
---|---|
5043
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
1 /** |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
7 * |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
8 * This program is free software: you can redistribute it and/or |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
9 * modify it under the terms of the GNU General Public License as |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
10 * published by the Free Software Foundation, either version 3 of the |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
11 * License, or (at your option) any later version. |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
12 * |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
13 * This program is distributed in the hope that it will be useful, but |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
14 * WITHOUT ANY WARRANTY; without even the implied warranty of |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
16 * General Public License for more details. |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
17 * |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
18 * You should have received a copy of the GNU General Public License |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
20 **/ |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
21 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
22 #include "../PrecompiledHeaders.h" |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
23 #include "DicomSequencesMap.h" |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
24 #include "../Toolbox.h" |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
25 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
26 namespace Orthanc |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
27 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
28 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
29 #if ORTHANC_ENABLE_DCMTK == 1 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
30 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
31 // copy all tags from Json (used to read from metadata) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
32 void DicomSequencesMap::Deserialize(const Json::Value& serialized) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
33 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
34 Json::Value::Members members = serialized.getMemberNames(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
35 for (size_t i = 0; i < members.size(); i++) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
36 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
37 DicomTag tag(0, 0); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
38 if (DicomTag::ParseHexadecimal(tag, members[i].c_str())) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
39 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
40 sequences_[tag] = serialized[members[i]]; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
41 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
42 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
43 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
44 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
45 #endif |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
46 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
47 // serialize a subet of tags (used to store in the metadata) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
48 void DicomSequencesMap::Serialize(Json::Value& target, const std::set<DicomTag>& tags) const |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
49 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
50 // add the sequences to "target" |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
51 for (std::map<DicomTag, Json::Value>::const_iterator it = sequences_.begin(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
52 it != sequences_.end(); ++it) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
53 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
54 if (tags.find(it->first) != tags.end()) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
55 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
56 target[it->first.Format()] = it->second; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
57 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
58 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
59 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
60 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
61 // copy a subset of tags from Json |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
62 void DicomSequencesMap::FromDicomAsJson(const Json::Value& dicomAsJson, const std::set<DicomTag>& tags) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
63 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
64 for (std::set<DicomTag>::const_iterator it = tags.begin(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
65 it != tags.end(); ++it) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
66 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
67 std::string tag = it->Format(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
68 if (dicomAsJson.isMember(tag)) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
69 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
70 sequences_[*it] = dicomAsJson[tag]; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
71 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
72 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
73 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
74 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
75 void DicomSequencesMap::ToJson(Json::Value& target, DicomToJsonFormat format, const std::set<DicomTag>& tags) const |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
76 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
77 // add the sequences to "target" |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
78 for (std::map<DicomTag, Json::Value>::const_iterator it = sequences_.begin(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
79 it != sequences_.end(); ++it) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
80 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
81 Json::Value sequenceFullJson = Json::objectValue; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
82 sequenceFullJson[it->first.Format()] = it->second; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
83 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
84 Json::Value& requestedFormatJson = sequenceFullJson; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
85 Json::Value convertedJson; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
86 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
87 if (format != DicomToJsonFormat_Full) |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
88 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
89 Toolbox::SimplifyDicomAsJson(convertedJson, sequenceFullJson, format); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
90 requestedFormatJson = convertedJson; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
91 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
92 |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
93 Json::Value::Members keys = requestedFormatJson.getMemberNames(); |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
94 for (size_t i = 0; i < keys.size(); i++) // there should always be only one member in this JSON |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
95 { |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
96 target[keys[i]] = requestedFormatJson[keys[i]]; |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
97 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
98 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
99 } |
ec5c203a97ea
returning sequences in MainDicomTags and RequestedTags
Alain Mazy <am@osimis.io>
parents:
diff
changeset
|
100 } |