Mercurial > hg > orthanc
annotate OrthancServer/FromDcmtkBridge.cpp @ 1695:18c02c6987d5
fix for encodings
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 08 Oct 2015 14:34:19 +0200 |
| parents | 06d579e82bb8 |
| children | a001f6226c7c |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1147
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1147
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
|
448
9d830dcc7730
missing copyright information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
419
diff
changeset
|
32 |
|
9d830dcc7730
missing copyright information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
419
diff
changeset
|
33 |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
34 #include "PrecompiledHeadersServer.h" |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
799
diff
changeset
|
35 |
| 71 | 36 #ifndef NOMINMAX |
| 37 #define NOMINMAX | |
| 38 #endif | |
| 0 | 39 |
| 846 | 40 #include "Internals/DicomImageDecoder.h" |
| 41 | |
| 0 | 42 #include "FromDcmtkBridge.h" |
| 43 #include "ToDcmtkBridge.h" | |
|
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1004
diff
changeset
|
44 #include "OrthancInitialization.h" |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1429
diff
changeset
|
45 #include "../Core/Logging.h" |
|
107
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
106
diff
changeset
|
46 #include "../Core/Toolbox.h" |
| 62 | 47 #include "../Core/OrthancException.h" |
|
1612
96582230ddcb
Core/ImageFormats folder renamed as Core/Images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
48 #include "../Core/Images/PngWriter.h" |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
49 #include "../Core/Uuid.h" |
| 0 | 50 #include "../Core/DicomFormat/DicomString.h" |
| 51 #include "../Core/DicomFormat/DicomNullValue.h" | |
| 79 | 52 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h" |
| 0 | 53 |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
54 #include <list> |
| 71 | 55 #include <limits> |
| 56 | |
| 0 | 57 #include <boost/lexical_cast.hpp> |
| 1656 | 58 #include <boost/filesystem.hpp> |
| 0 | 59 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
60 #include <dcmtk/dcmdata/dcchrstr.h> |
| 0 | 61 #include <dcmtk/dcmdata/dcdicent.h> |
| 62 #include <dcmtk/dcmdata/dcdict.h> | |
| 63 #include <dcmtk/dcmdata/dcfilefo.h> | |
| 64 #include <dcmtk/dcmdata/dcistrmb.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
65 #include <dcmtk/dcmdata/dcuid.h> |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
66 #include <dcmtk/dcmdata/dcmetinf.h> |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
67 #include <dcmtk/dcmdata/dcdeftag.h> |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
68 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
69 #include <dcmtk/dcmdata/dcvrae.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
70 #include <dcmtk/dcmdata/dcvras.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
71 #include <dcmtk/dcmdata/dcvrcs.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
72 #include <dcmtk/dcmdata/dcvrda.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
73 #include <dcmtk/dcmdata/dcvrds.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
74 #include <dcmtk/dcmdata/dcvrdt.h> |
| 0 | 75 #include <dcmtk/dcmdata/dcvrfd.h> |
| 76 #include <dcmtk/dcmdata/dcvrfl.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
77 #include <dcmtk/dcmdata/dcvris.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
78 #include <dcmtk/dcmdata/dcvrlo.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
79 #include <dcmtk/dcmdata/dcvrlt.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
80 #include <dcmtk/dcmdata/dcvrpn.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
81 #include <dcmtk/dcmdata/dcvrsh.h> |
| 0 | 82 #include <dcmtk/dcmdata/dcvrsl.h> |
| 83 #include <dcmtk/dcmdata/dcvrss.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
84 #include <dcmtk/dcmdata/dcvrst.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
85 #include <dcmtk/dcmdata/dcvrtm.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
86 #include <dcmtk/dcmdata/dcvrui.h> |
| 0 | 87 #include <dcmtk/dcmdata/dcvrul.h> |
| 88 #include <dcmtk/dcmdata/dcvrus.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
89 #include <dcmtk/dcmdata/dcvrut.h> |
|
676
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
90 #include <dcmtk/dcmdata/dcpixel.h> |
|
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
91 #include <dcmtk/dcmdata/dcpixseq.h> |
|
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
92 #include <dcmtk/dcmdata/dcpxitem.h> |
| 1131 | 93 #include <dcmtk/dcmdata/dcvrat.h> |
|
676
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
94 |
| 1656 | 95 #include <dcmtk/dcmnet/dul.h> |
| 0 | 96 |
| 2 | 97 #include <boost/math/special_functions/round.hpp> |
| 1689 | 98 #include <boost/algorithm/string/predicate.hpp> |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
99 #include <dcmtk/dcmdata/dcostrmb.h> |
| 0 | 100 |
|
682
efc4928be6fb
Recover pixel data for more transfer syntaxes (notably JPEG)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
677
diff
changeset
|
101 |
| 62 | 102 namespace Orthanc |
| 0 | 103 { |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
104 static inline uint16_t GetCharValue(char c) |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
105 { |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
106 if (c >= '0' && c <= '9') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
107 return c - '0'; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
108 else if (c >= 'a' && c <= 'f') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
109 return c - 'a' + 10; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
110 else if (c >= 'A' && c <= 'F') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
111 return c - 'A' + 10; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
112 else |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
113 return 0; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
114 } |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
115 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
116 static inline uint16_t GetTagValue(const char* c) |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
117 { |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
118 return ((GetCharValue(c[0]) << 12) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
119 (GetCharValue(c[1]) << 8) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
120 (GetCharValue(c[2]) << 4) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
121 GetCharValue(c[3])); |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
122 } |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
123 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
124 |
| 1656 | 125 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 |
| 126 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary, | |
| 127 EmbeddedResources::FileResourceId resource) | |
| 128 { | |
| 129 Toolbox::TemporaryFile tmp; | |
| 130 | |
| 131 FILE* fp = fopen(tmp.GetPath().c_str(), "wb"); | |
| 132 fwrite(EmbeddedResources::GetFileResourceBuffer(resource), | |
| 133 EmbeddedResources::GetFileResourceSize(resource), 1, fp); | |
| 134 fclose(fp); | |
| 135 | |
| 136 if (!dictionary.loadDictionary(tmp.GetPath().c_str())) | |
| 137 { | |
| 138 throw OrthancException(ErrorCode_InternalError); | |
| 139 } | |
| 140 } | |
| 141 | |
| 142 #else | |
| 143 static void LoadExternalDictionary(DcmDataDictionary& dictionary, | |
| 144 const std::string& directory, | |
| 145 const std::string& filename) | |
| 146 { | |
| 147 boost::filesystem::path p = directory; | |
| 148 p = p / filename; | |
| 149 | |
| 150 LOG(WARNING) << "Loading the external DICOM dictionary " << p; | |
| 151 | |
| 152 if (!dictionary.loadDictionary(p.string().c_str())) | |
| 153 { | |
| 154 throw OrthancException(ErrorCode_InternalError); | |
| 155 } | |
| 156 } | |
| 157 | |
| 158 #endif | |
| 159 | |
| 160 | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
161 namespace |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
162 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
163 class DictionaryLocker |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
164 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
165 private: |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
166 DcmDataDictionary& dictionary_; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
167 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
168 public: |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
169 DictionaryLocker() : dictionary_(dcmDataDict.wrlock()) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
170 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
171 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
172 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
173 ~DictionaryLocker() |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
174 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
175 dcmDataDict.unlock(); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
176 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
177 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
178 DcmDataDictionary& operator*() |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
179 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
180 return dictionary_; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
181 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
182 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
183 DcmDataDictionary* operator->() |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
184 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
185 return &dictionary_; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
186 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
187 }; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
188 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
189 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
190 |
| 1656 | 191 void FromDcmtkBridge::InitializeDictionary() |
| 192 { | |
| 193 /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */ | |
| 194 dcmDisableGethostbyaddr.set(OFTrue); | |
| 195 | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
196 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
197 DictionaryLocker locker; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
198 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
199 locker->clear(); |
| 1656 | 200 |
| 201 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
202 LOG(WARNING) << "Loading the embedded dictionaries"; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
203 /** |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
204 * Do not load DICONDE dictionary, it breaks the other tags. The |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
205 * command "strace storescu 2>&1 |grep dic" shows that DICONDE |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
206 * dictionary is not loaded by storescu. |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
207 **/ |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
208 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE); |
| 1656 | 209 |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
210 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
211 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE); |
| 1656 | 212 |
| 213 #elif defined(__linux) || defined(__FreeBSD_kernel__) | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
214 std::string path = DCMTK_DICTIONARY_DIR; |
| 1656 | 215 |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
216 const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
217 if (env != NULL) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
218 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
219 path = std::string(env); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
220 } |
| 1656 | 221 |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
222 LoadExternalDictionary(*locker, path, "dicom.dic"); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
223 LoadExternalDictionary(*locker, path, "private.dic"); |
| 1656 | 224 |
| 225 #else | |
| 226 #error Support your platform here | |
| 227 #endif | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
228 } |
| 1656 | 229 |
| 230 /* make sure data dictionary is loaded */ | |
| 231 if (!dcmDataDict.isDictionaryLoaded()) | |
| 232 { | |
| 233 LOG(ERROR) << "No DICOM dictionary loaded, check environment variable: " << DCM_DICT_ENVIRONMENT_VARIABLE; | |
| 234 throw OrthancException(ErrorCode_InternalError); | |
| 235 } | |
| 236 | |
| 237 { | |
| 238 // Test the dictionary with a simple DICOM tag | |
| 239 DcmTag key(0x0010, 0x1030); // This is PatientWeight | |
| 240 if (key.getEVR() != EVR_DS) | |
| 241 { | |
| 242 LOG(ERROR) << "The DICOM dictionary has not been correctly read"; | |
| 243 throw OrthancException(ErrorCode_InternalError); | |
| 244 } | |
| 245 } | |
| 246 } | |
| 247 | |
| 248 | |
|
1657
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
249 void FromDcmtkBridge::RegisterDictionaryTag(const DicomTag& tag, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
250 const DcmEVR& vr, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
251 const std::string& name, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
252 unsigned int minMultiplicity, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
253 unsigned int maxMultiplicity) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
254 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
255 if (minMultiplicity < 1) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
256 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
257 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
258 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
259 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
260 if (maxMultiplicity == 0) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
261 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
262 maxMultiplicity = DcmVariableVM; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
263 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
264 else if (maxMultiplicity < minMultiplicity) |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
265 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
266 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
267 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
268 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
269 std::auto_ptr<DcmDictEntry> entry(new DcmDictEntry(tag.GetGroup(), |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
270 tag.GetElement(), |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
271 vr, name.c_str(), |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
272 static_cast<int>(minMultiplicity), |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
273 static_cast<int>(maxMultiplicity), |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
274 NULL /* version */, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
275 OFTrue /* doCopyString */, |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
276 NULL /* private creator */)); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
277 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
278 entry->setGroupRangeRestriction(DcmDictRange_Unspecified); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
279 entry->setElementRangeRestriction(DcmDictRange_Unspecified); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
280 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
281 { |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
282 DictionaryLocker locker; |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
283 locker->addEntry(entry.release()); |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
284 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
285 } |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
286 |
|
5360cdba70d8
New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
287 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
288 Encoding FromDcmtkBridge::DetectEncoding(DcmDataset& dataset) |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
289 { |
|
1093
552a038f7c96
Default encoding is Latin-1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
290 // By default, Latin1 encoding is assumed |
| 1557 | 291 std::string s = Configuration::GetGlobalStringParameter("DefaultEncoding", "Latin1"); |
|
1093
552a038f7c96
Default encoding is Latin-1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
292 Encoding encoding = s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str()); |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
293 |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
294 OFString tmp; |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
295 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good()) |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
296 { |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
297 std::string characterSet = Toolbox::StripSpaces(std::string(tmp.c_str())); |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
298 |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
299 if (characterSet.empty()) |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
300 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
301 // Empty specific character set tag: Use the default encoding |
| 1087 | 302 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
303 else if (GetDicomEncoding(encoding, characterSet.c_str())) |
| 1087 | 304 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
305 // The specific character set is supported by the Orthanc core |
| 1087 | 306 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
307 else |
| 1087 | 308 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
309 LOG(WARNING) << "Value of Specific Character Set (0008,0005) is not supported: " << characterSet |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
310 << ", fallback to ASCII (remove all special characters)"; |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
311 encoding = Encoding_Ascii; |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
312 } |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
313 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
314 else |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
315 { |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
316 // No specific character set tag: Use the default encoding |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
317 } |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
318 |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
319 return encoding; |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
320 } |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
321 |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
322 |
| 0 | 323 void FromDcmtkBridge::Convert(DicomMap& target, DcmDataset& dataset) |
| 324 { | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
325 Encoding encoding = DetectEncoding(dataset); |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
326 |
| 0 | 327 target.Clear(); |
| 328 for (unsigned long i = 0; i < dataset.card(); i++) | |
| 329 { | |
| 330 DcmElement* element = dataset.getElement(i); | |
| 331 if (element && element->isLeaf()) | |
| 332 { | |
| 333 target.SetValue(element->getTag().getGTag(), | |
| 334 element->getTag().getETag(), | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
335 ConvertLeafElement(*element, encoding)); |
| 0 | 336 } |
| 337 } | |
| 338 } | |
| 339 | |
| 340 | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
341 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag) |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
342 { |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
343 return DicomTag(tag.getGTag(), tag.getETag()); |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
344 } |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
345 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
346 |
| 0 | 347 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element) |
| 348 { | |
| 349 return DicomTag(element.getGTag(), element.getETag()); | |
| 350 } | |
| 351 | |
| 352 | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
353 bool FromDcmtkBridge::IsPrivateTag(const DicomTag& tag) |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
354 { |
|
1307
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
355 #if 1 |
|
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
356 DcmTagKey tmp(tag.GetGroup(), tag.GetElement()); |
|
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
357 return tmp.isPrivate(); |
|
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
358 #else |
|
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
359 // Implementation for Orthanc versions <= 0.8.5 |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
360 DcmTag tmp(tag.GetGroup(), tag.GetElement()); |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
361 return IsPrivateTag(tmp); |
|
1307
f796207e3df1
Fix replacement and insertion of private DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
362 #endif |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
363 } |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
364 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
365 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
366 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element, |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
367 Encoding encoding) |
| 0 | 368 { |
| 369 if (!element.isLeaf()) | |
| 370 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1557
diff
changeset
|
371 // This function is only applicable to leaf elements |
|
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1557
diff
changeset
|
372 throw OrthancException(ErrorCode_BadParameterType); |
| 0 | 373 } |
| 374 | |
| 375 if (element.isaString()) | |
| 376 { | |
| 377 char *c; | |
|
1429
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
378 if (element.getString(c).good()) |
| 0 | 379 { |
|
1429
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
380 if (c == NULL) // This case corresponds to the empty string |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
381 { |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
382 return new DicomString(""); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
383 } |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
384 else |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
385 { |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
386 std::string s(c); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
387 std::string utf8 = Toolbox::ConvertToUtf8(s, encoding); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
388 return new DicomString(utf8); |
|
7366a0bdda6a
attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1417
diff
changeset
|
389 } |
| 0 | 390 } |
| 391 else | |
| 392 { | |
| 393 return new DicomNullValue; | |
| 394 } | |
| 395 } | |
| 396 | |
| 397 try | |
| 398 { | |
| 399 // http://support.dcmtk.org/docs/dcvr_8h-source.html | |
| 400 switch (element.getVR()) | |
| 401 { | |
| 402 | |
| 403 /** | |
| 404 * TODO. | |
| 405 **/ | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
406 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
407 case EVR_OB: // other byte |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
408 case EVR_OF: // other float |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
409 case EVR_OW: // other word |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
410 case EVR_UN: // unknown value representation |
| 1131 | 411 return new DicomNullValue; |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
412 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
413 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
414 * String types, should never happen at this point because of |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
415 * "element.isaString()". |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
416 **/ |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
417 |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
418 case EVR_DS: // decimal string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
419 case EVR_IS: // integer string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
420 case EVR_AS: // age string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
421 case EVR_DA: // date string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
422 case EVR_DT: // date time string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
423 case EVR_TM: // time string |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
424 case EVR_AE: // application entity title |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
425 case EVR_CS: // code string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
426 case EVR_SH: // short string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
427 case EVR_LO: // long string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
428 case EVR_ST: // short text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
429 case EVR_LT: // long text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
430 case EVR_UT: // unlimited text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
431 case EVR_PN: // person name |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
432 case EVR_UI: // unique identifier |
| 1131 | 433 return new DicomNullValue; |
| 0 | 434 |
| 435 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
436 /** |
| 1131 | 437 * Numberic types |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
438 **/ |
| 0 | 439 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
440 case EVR_SL: // signed long |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
441 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
442 Sint32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
443 if (dynamic_cast<DcmSignedLong&>(element).getSint32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
444 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
445 else |
| 1131 | 446 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
447 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
448 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
449 case EVR_SS: // signed short |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
450 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
451 Sint16 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
452 if (dynamic_cast<DcmSignedShort&>(element).getSint16(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
453 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
454 else |
| 1131 | 455 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
456 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
457 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
458 case EVR_UL: // unsigned long |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
459 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
460 Uint32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
461 if (dynamic_cast<DcmUnsignedLong&>(element).getUint32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
462 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
463 else |
| 1131 | 464 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
465 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
466 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
467 case EVR_US: // unsigned short |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
468 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
469 Uint16 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
470 if (dynamic_cast<DcmUnsignedShort&>(element).getUint16(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
471 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
472 else |
| 1131 | 473 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
474 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
475 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
476 case EVR_FL: // float single-precision |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
477 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
478 Float32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
479 if (dynamic_cast<DcmFloatingPointSingle&>(element).getFloat32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
480 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
481 else |
| 1131 | 482 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
483 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
484 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
485 case EVR_FD: // float double-precision |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
486 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
487 Float64 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
488 if (dynamic_cast<DcmFloatingPointDouble&>(element).getFloat64(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
489 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
490 else |
| 1131 | 491 return new DicomNullValue; |
| 492 } | |
| 493 | |
| 494 | |
| 495 /** | |
| 496 * Attribute tag. | |
| 497 **/ | |
| 498 | |
| 499 case EVR_AT: | |
| 500 { | |
| 1147 | 501 DcmTagKey tag; |
| 502 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good()) | |
| 503 { | |
| 504 DicomTag t(tag.getGroup(), tag.getElement()); | |
| 505 return new DicomString(t.Format()); | |
| 506 } | |
| 1131 | 507 else |
| 1147 | 508 { |
| 1131 | 509 return new DicomNullValue; |
| 1147 | 510 } |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
511 } |
| 0 | 512 |
| 513 | |
| 514 /** | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
515 * Sequence types, should never occur at this point because of |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
516 * "element.isLeaf()". |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
517 **/ |
| 0 | 518 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
519 case EVR_SQ: // sequence of items |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
520 return new DicomNullValue; |
| 0 | 521 |
| 522 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
523 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
524 * Internal to DCMTK. |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
525 **/ |
| 0 | 526 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
527 case EVR_ox: // OB or OW depending on context |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
528 case EVR_xs: // SS or US depending on context |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
529 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
530 case EVR_na: // na="not applicable", for data which has no VR |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
531 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
532 case EVR_item: // used internally for items |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
533 case EVR_metainfo: // used internally for meta info datasets |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
534 case EVR_dataset: // used internally for datasets |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
535 case EVR_fileFormat: // used internally for DICOM files |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
536 case EVR_dicomDir: // used internally for DICOMDIR objects |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
537 case EVR_dirRecord: // used internally for DICOMDIR records |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
538 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
539 case EVR_pixelItem: // used internally for pixel items in a compressed image |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
540 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
541 case EVR_PixelData: // used internally for uncompressed pixeld data |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
542 case EVR_OverlayData: // used internally for overlay data |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
543 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
544 return new DicomNullValue; |
| 0 | 545 |
| 546 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
547 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
548 * Default case. |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
549 **/ |
| 0 | 550 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
551 default: |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
552 return new DicomNullValue; |
| 0 | 553 } |
| 554 } | |
| 555 catch (boost::bad_lexical_cast) | |
| 556 { | |
| 557 return new DicomNullValue; | |
| 558 } | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
559 catch (std::bad_cast) |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
560 { |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
561 return new DicomNullValue; |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
562 } |
| 0 | 563 } |
| 564 | |
| 565 | |
| 1687 | 566 static Json::Value& PrepareNode(Json::Value& parent, |
| 567 DcmElement& element, | |
| 568 DicomToJsonFormat format) | |
| 0 | 569 { |
| 1687 | 570 assert(parent.type() == Json::objectValue); |
| 0 | 571 |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
572 DicomTag tag(FromDcmtkBridge::GetTag(element)); |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
573 const std::string formattedTag = tag.Format(); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
574 |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
575 if (format == DicomToJsonFormat_Short) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
576 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
577 parent[formattedTag] = Json::nullValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
578 return parent[formattedTag]; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
579 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
580 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
581 // This code gives access to the name of the private tags |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
582 DcmTag tagbis(element.getTag()); |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
583 const std::string tagName(tagbis.getTagName()); |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
584 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
585 switch (format) |
| 0 | 586 { |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
587 case DicomToJsonFormat_Simple: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
588 parent[tagName] = Json::nullValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
589 return parent[tagName]; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
590 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
591 case DicomToJsonFormat_Full: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
592 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
593 parent[formattedTag] = Json::objectValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
594 Json::Value& node = parent[formattedTag]; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
595 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
596 if (element.isLeaf()) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
597 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
598 node["Name"] = tagName; |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
599 |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
600 if (tagbis.getPrivateCreator() != NULL) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
601 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
602 node["PrivateCreator"] = tagbis.getPrivateCreator(); |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
603 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
604 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
605 return node; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
606 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
607 else |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
608 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
609 node["Name"] = tagName; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
610 node["Type"] = "Sequence"; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
611 node["Value"] = Json::nullValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
612 return node["Value"]; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
613 } |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
614 } |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
615 |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
616 default: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
617 throw OrthancException(ErrorCode_ParameterOutOfRange); |
| 1687 | 618 } |
| 619 } | |
| 620 | |
| 621 | |
| 622 static void LeafValueToJson(Json::Value& target, | |
| 623 const DicomValue& value, | |
| 624 DicomToJsonFormat format, | |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
625 unsigned int maxStringLength) |
| 1687 | 626 { |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
627 std::string content = value.AsString(); |
| 1687 | 628 |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
629 switch (format) |
| 1687 | 630 { |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
631 case DicomToJsonFormat_Short: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
632 case DicomToJsonFormat_Simple: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
633 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
634 assert(target.type() == Json::nullValue); |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
635 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
636 if (!value.IsNull() && |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
637 (maxStringLength == 0 || |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
638 content.size() <= maxStringLength)) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
639 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
640 target = content; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
641 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
642 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
643 break; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
644 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
645 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
646 case DicomToJsonFormat_Full: |
| 0 | 647 { |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
648 assert(target.type() == Json::objectValue); |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
649 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
650 if (value.IsNull()) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
651 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
652 target["Type"] = "Null"; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
653 target["Value"] = Json::nullValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
654 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
655 else |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
656 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
657 if (maxStringLength == 0 || |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
658 content.size() <= maxStringLength) |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
659 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
660 target["Type"] = "String"; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
661 target["Value"] = content; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
662 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
663 else |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
664 { |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
665 target["Type"] = "TooLong"; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
666 target["Value"] = Json::nullValue; |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
667 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
668 } |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
669 break; |
| 0 | 670 } |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
671 |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
672 default: |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
673 throw OrthancException(ErrorCode_ParameterOutOfRange); |
| 1687 | 674 } |
| 675 } | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
676 |
| 1687 | 677 |
| 678 static void DatasetToJson(Json::Value& parent, | |
| 679 DcmItem& item, | |
| 680 DicomToJsonFormat format, | |
| 681 unsigned int maxStringLength, | |
| 682 Encoding encoding); | |
| 683 | |
| 684 | |
| 1690 | 685 void FromDcmtkBridge::ToJson(Json::Value& parent, |
| 686 DcmElement& element, | |
| 687 DicomToJsonFormat format, | |
| 688 unsigned int maxStringLength, | |
| 689 Encoding encoding) | |
| 1687 | 690 { |
| 1691 | 691 if (parent.type() == Json::nullValue) |
| 692 { | |
| 693 parent = Json::objectValue; | |
| 694 } | |
| 695 | |
| 696 assert(parent.type() == Json::objectValue); | |
| 1687 | 697 Json::Value& target = PrepareNode(parent, element, format); |
| 698 | |
| 699 if (element.isLeaf()) | |
| 700 { | |
| 701 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, encoding)); | |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
702 LeafValueToJson(target, *v, format, maxStringLength); |
| 0 | 703 } |
| 704 else | |
| 705 { | |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
706 assert(target.type() == Json::nullValue); |
|
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
707 target = Json::arrayValue; |
| 0 | 708 |
| 709 // "All subclasses of DcmElement except for DcmSequenceOfItems | |
| 710 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset | |
| 1687 | 711 // etc. are not." The following dynamic_cast is thus OK. |
| 0 | 712 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element); |
| 713 | |
| 714 for (unsigned long i = 0; i < sequence.card(); i++) | |
| 715 { | |
| 716 DcmItem* child = sequence.getItem(i); | |
| 1687 | 717 Json::Value& v = target.append(Json::objectValue); |
| 1686 | 718 DatasetToJson(v, *child, format, maxStringLength, encoding); |
| 1687 | 719 } |
| 0 | 720 } |
| 721 } | |
| 722 | |
| 723 | |
| 1687 | 724 static void DatasetToJson(Json::Value& parent, |
| 1686 | 725 DcmItem& item, |
| 726 DicomToJsonFormat format, | |
| 727 unsigned int maxStringLength, | |
| 728 Encoding encoding) | |
| 729 { | |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
730 assert(parent.type() == Json::objectValue); |
| 1686 | 731 |
| 732 for (unsigned long i = 0; i < item.card(); i++) | |
| 733 { | |
| 734 DcmElement* element = item.getElement(i); | |
| 1690 | 735 FromDcmtkBridge::ToJson(parent, *element, format, maxStringLength, encoding); |
| 1686 | 736 } |
| 737 } | |
| 738 | |
| 739 | |
| 1687 | 740 void FromDcmtkBridge::ToJson(Json::Value& target, |
| 0 | 741 DcmDataset& dataset, |
| 1686 | 742 DicomToJsonFormat format, |
| 0 | 743 unsigned int maxStringLength) |
| 744 { | |
|
1688
27d70e9ee2e4
DicomToJsonFormat enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1687
diff
changeset
|
745 target = Json::objectValue; |
| 1687 | 746 DatasetToJson(target, dataset, format, maxStringLength, DetectEncoding(dataset)); |
| 0 | 747 } |
| 748 | |
| 749 | |
| 750 std::string FromDcmtkBridge::GetName(const DicomTag& t) | |
| 751 { | |
| 106 | 752 // Some patches for important tags because of different DICOM |
| 753 // dictionaries between DCMTK versions | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
754 std::string n = t.GetMainTagsName(); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
755 if (n.size() != 0) |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
756 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
757 return n; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
758 } |
| 106 | 759 // End of patches |
| 760 | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
761 #if 0 |
| 0 | 762 DcmTagKey tag(t.GetGroup(), t.GetElement()); |
| 763 const DcmDataDictionary& dict = dcmDataDict.rdlock(); | |
| 764 const DcmDictEntry* entry = dict.findEntry(tag, NULL); | |
| 765 | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
766 std::string s(DcmTag_ERROR_TagName); |
| 0 | 767 if (entry != NULL) |
| 768 { | |
| 769 s = std::string(entry->getTagName()); | |
| 770 } | |
| 771 | |
| 772 dcmDataDict.unlock(); | |
| 773 return s; | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
774 #else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
775 DcmTag tag(t.GetGroup(), t.GetElement()); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
776 const char* name = tag.getTagName(); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
777 if (name == NULL) |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
778 { |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
779 return DcmTag_ERROR_TagName; |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
780 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
781 else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
782 { |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
783 return std::string(name); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
784 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
785 #endif |
| 0 | 786 } |
| 787 | |
| 788 | |
| 304 | 789 DicomTag FromDcmtkBridge::ParseTag(const char* name) |
| 0 | 790 { |
| 304 | 791 if (strlen(name) == 9 && |
| 792 isxdigit(name[0]) && | |
| 793 isxdigit(name[1]) && | |
| 794 isxdigit(name[2]) && | |
| 795 isxdigit(name[3]) && | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
796 (name[4] == '-' || name[4] == ',') && |
| 304 | 797 isxdigit(name[5]) && |
| 798 isxdigit(name[6]) && | |
| 799 isxdigit(name[7]) && | |
| 800 isxdigit(name[8])) | |
| 801 { | |
| 802 uint16_t group = GetTagValue(name); | |
| 803 uint16_t element = GetTagValue(name + 5); | |
| 804 return DicomTag(group, element); | |
| 805 } | |
| 806 | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
807 #if 0 |
| 0 | 808 const DcmDataDictionary& dict = dcmDataDict.rdlock(); |
| 809 const DcmDictEntry* entry = dict.findEntry(name); | |
| 810 | |
| 811 if (entry == NULL) | |
| 812 { | |
| 813 dcmDataDict.unlock(); | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1557
diff
changeset
|
814 throw OrthancException(ErrorCode_UnknownDicomTag); |
| 0 | 815 } |
| 816 else | |
| 817 { | |
| 818 DcmTagKey key = entry->getKey(); | |
| 819 DicomTag tag(key.getGroup(), key.getElement()); | |
| 820 dcmDataDict.unlock(); | |
| 821 return tag; | |
| 822 } | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
823 #else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
824 DcmTag tag; |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
825 if (DcmTag::findTagFromName(name, tag).good()) |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
826 { |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
827 return DicomTag(tag.getGTag(), tag.getETag()); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
828 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
829 else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
830 { |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1557
diff
changeset
|
831 throw OrthancException(ErrorCode_UnknownDicomTag); |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
832 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
833 #endif |
| 0 | 834 } |
| 835 | |
| 836 | |
|
1655
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
837 bool FromDcmtkBridge::IsUnknownTag(const DicomTag& tag) |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
838 { |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
839 DcmTag tmp(tag.GetGroup(), tag.GetElement()); |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
840 return tmp.isUnknownVR(); |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
841 } |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
842 |
|
e40fd0d925c5
/tools/create-dicom can create tags with unknown VR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
843 |
| 0 | 844 void FromDcmtkBridge::Print(FILE* fp, const DicomMap& m) |
| 845 { | |
| 846 for (DicomMap::Map::const_iterator | |
| 656 | 847 it = m.map_.begin(); it != m.map_.end(); ++it) |
| 0 | 848 { |
| 849 DicomTag t = it->first; | |
| 850 std::string s = it->second->AsString(); | |
| 319 | 851 fprintf(fp, "0x%04x 0x%04x (%s) [%s]\n", t.GetGroup(), t.GetElement(), GetName(t).c_str(), s.c_str()); |
| 0 | 852 } |
| 853 } | |
| 854 | |
| 855 | |
| 856 void FromDcmtkBridge::ToJson(Json::Value& result, | |
| 1368 | 857 const DicomMap& values, |
| 858 bool simplify) | |
| 0 | 859 { |
| 860 if (result.type() != Json::objectValue) | |
| 861 { | |
| 62 | 862 throw OrthancException(ErrorCode_BadParameterType); |
| 0 | 863 } |
| 864 | |
| 865 result.clear(); | |
| 866 | |
| 867 for (DicomMap::Map::const_iterator | |
| 656 | 868 it = values.map_.begin(); it != values.map_.end(); ++it) |
| 0 | 869 { |
| 1368 | 870 if (simplify) |
| 871 { | |
| 872 result[GetName(it->first)] = it->second->AsString(); | |
| 873 } | |
| 874 else | |
| 875 { | |
| 876 Json::Value value = Json::objectValue; | |
| 877 | |
| 878 value["Name"] = GetName(it->first); | |
| 879 | |
| 880 if (it->second->IsNull()) | |
| 881 { | |
| 882 value["Type"] = "Null"; | |
| 883 value["Value"] = Json::nullValue; | |
| 884 } | |
| 885 else | |
| 886 { | |
| 887 value["Type"] = "String"; | |
| 888 value["Value"] = it->second->AsString(); | |
| 889 } | |
| 890 | |
| 891 result[it->first.Format()] = value; | |
| 892 } | |
| 0 | 893 } |
| 894 } | |
| 176 | 895 |
| 896 | |
| 788 | 897 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level) |
| 176 | 898 { |
| 899 char uid[100]; | |
| 900 | |
| 901 switch (level) | |
| 902 { | |
| 788 | 903 case ResourceType_Patient: |
| 311 | 904 // The "PatientID" field is of type LO (Long String), 64 |
| 905 // Bytes Maximum. An UUID is of length 36, thus it can be used | |
| 906 // as a random PatientID. | |
| 907 return Toolbox::GenerateUuid(); | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
908 |
| 788 | 909 case ResourceType_Instance: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
910 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT); |
| 176 | 911 |
| 788 | 912 case ResourceType_Series: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
913 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT); |
| 176 | 914 |
| 788 | 915 case ResourceType_Study: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
916 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT); |
| 176 | 917 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
918 default: |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
919 throw OrthancException(ErrorCode_ParameterOutOfRange); |
| 176 | 920 } |
| 921 } | |
| 922 | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
923 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer, |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
924 DcmDataset& dataSet) |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
925 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
926 // Determine the transfer syntax which shall be used to write the |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
927 // information to the file. We always switch to the Little Endian |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
928 // syntax, with explicit length. |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
929 |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
930 // http://support.dcmtk.org/docs/dcxfer_8h-source.html |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
931 |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
932 |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
933 /** |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
934 * Note that up to Orthanc 0.7.1 (inclusive), the |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
935 * "EXS_LittleEndianExplicit" was always used to save the DICOM |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
936 * dataset into memory. We now keep the original transfer syntax |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
937 * (if available). |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
938 **/ |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
939 E_TransferSyntax xfer = dataSet.getOriginalXfer(); |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
940 if (xfer == EXS_Unknown) |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
941 { |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
942 // No information about the original transfer syntax: This is |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
943 // most probably a DICOM dataset that was read from memory. |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
944 xfer = EXS_LittleEndianExplicit; |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
945 } |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
946 |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
947 E_EncodingType encodingType = /*opt_sequenceType*/ EET_ExplicitLength; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
948 |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
949 // Create the meta-header information |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
950 DcmFileFormat ff(&dataSet); |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
951 ff.validateMetaInfo(xfer); |
|
1316
1c8dfedefefe
Fix anonymization generating non-portable DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1307
diff
changeset
|
952 ff.removeInvalidGroups(); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
953 |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
954 // Create a memory buffer with the proper size |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
955 uint32_t s = ff.calcElementLength(xfer, encodingType); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
956 buffer.resize(s); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
957 DcmOutputBufferStream ob(&buffer[0], s); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
958 |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
959 // Fill the memory buffer with the meta-header and the dataset |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
960 ff.transferInit(); |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
961 OFCondition c = ff.write(ob, xfer, encodingType, NULL, |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
962 /*opt_groupLength*/ EGL_recalcGL, |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
963 /*opt_paddingType*/ EPD_withoutPadding); |
|
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
964 ff.transferEnd(); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
965 |
|
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
966 // Handle errors |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
967 if (c.good()) |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
968 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
969 return true; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
970 } |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
971 else |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
972 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
973 buffer.clear(); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
974 return false; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
975 } |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
976 } |
| 1360 | 977 |
| 978 | |
|
1417
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
979 ValueRepresentation FromDcmtkBridge::GetValueRepresentation(const DicomTag& tag) |
| 1360 | 980 { |
| 981 DcmTag t(tag.GetGroup(), tag.GetElement()); | |
|
1417
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
982 switch (t.getEVR()) |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
983 { |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
984 case EVR_PN: |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
985 return ValueRepresentation_PatientName; |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
986 |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
987 case EVR_DA: |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
988 return ValueRepresentation_Date; |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
989 |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
990 case EVR_DT: |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
991 return ValueRepresentation_DateTime; |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
992 |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
993 case EVR_TM: |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
994 return ValueRepresentation_Time; |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
995 |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
996 default: |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
997 return ValueRepresentation_Other; |
|
8e23f16a198d
fix issues 35 and 37
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
998 } |
| 1360 | 999 } |
| 1000 | |
| 1689 | 1001 |
|
1693
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1002 static bool IsBinaryTag(const DcmTag& key) |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1003 { |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1004 return key.isPrivate() || key.isUnknownVR(); |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1005 } |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1006 |
| 1689 | 1007 |
| 1008 DcmElement* FromDcmtkBridge::CreateElementForTag(const DicomTag& tag) | |
| 1009 { | |
| 1010 DcmTag key(tag.GetGroup(), tag.GetElement()); | |
| 1011 | |
|
1693
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1012 if (IsBinaryTag(key)) |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1013 { |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1014 return new DcmOtherByteOtherWord(key); |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1015 } |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1016 |
| 1689 | 1017 switch (key.getEVR()) |
| 1018 { | |
| 1019 // http://support.dcmtk.org/docs/dcvr_8h-source.html | |
| 1020 | |
| 1021 /** | |
| 1022 * TODO. | |
| 1023 **/ | |
| 1024 | |
| 1025 case EVR_OB: // other byte | |
| 1026 case EVR_OF: // other float | |
| 1027 case EVR_OW: // other word | |
| 1028 case EVR_AT: // attribute tag | |
| 1029 throw OrthancException(ErrorCode_NotImplemented); | |
| 1030 | |
| 1031 case EVR_UN: // unknown value representation | |
| 1032 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 1033 | |
| 1034 | |
| 1035 /** | |
| 1036 * String types. | |
| 1037 * http://support.dcmtk.org/docs/classDcmByteString.html | |
| 1038 **/ | |
| 1039 | |
| 1040 case EVR_AS: // age string | |
| 1041 return new DcmAgeString(key); | |
| 1042 | |
| 1043 case EVR_AE: // application entity title | |
| 1044 return new DcmApplicationEntity(key); | |
| 1045 | |
| 1046 case EVR_CS: // code string | |
| 1047 return new DcmCodeString(key); | |
| 1048 | |
| 1049 case EVR_DA: // date string | |
| 1050 return new DcmDate(key); | |
| 1051 | |
| 1052 case EVR_DT: // date time string | |
| 1053 return new DcmDateTime(key); | |
| 1054 | |
| 1055 case EVR_DS: // decimal string | |
| 1056 return new DcmDecimalString(key); | |
| 1057 | |
| 1058 case EVR_IS: // integer string | |
| 1059 return new DcmIntegerString(key); | |
| 1060 | |
| 1061 case EVR_TM: // time string | |
| 1062 return new DcmTime(key); | |
| 1063 | |
| 1064 case EVR_UI: // unique identifier | |
| 1065 return new DcmUniqueIdentifier(key); | |
| 1066 | |
| 1067 case EVR_ST: // short text | |
| 1068 return new DcmShortText(key); | |
| 1069 | |
| 1070 case EVR_LO: // long string | |
| 1071 return new DcmLongString(key); | |
| 1072 | |
| 1073 case EVR_LT: // long text | |
| 1074 return new DcmLongText(key); | |
| 1075 | |
| 1076 case EVR_UT: // unlimited text | |
| 1077 return new DcmUnlimitedText(key); | |
| 1078 | |
| 1079 case EVR_SH: // short string | |
| 1080 return new DcmShortString(key); | |
| 1081 | |
| 1082 case EVR_PN: // person name | |
| 1083 return new DcmPersonName(key); | |
| 1084 | |
| 1085 | |
| 1086 /** | |
| 1087 * Numerical types | |
| 1088 **/ | |
| 1089 | |
| 1090 case EVR_SL: // signed long | |
| 1091 return new DcmSignedLong(key); | |
| 1092 | |
| 1093 case EVR_SS: // signed short | |
| 1094 return new DcmSignedShort(key); | |
| 1095 | |
| 1096 case EVR_UL: // unsigned long | |
| 1097 return new DcmUnsignedLong(key); | |
| 1098 | |
| 1099 case EVR_US: // unsigned short | |
| 1100 return new DcmUnsignedShort(key); | |
| 1101 | |
| 1102 case EVR_FL: // float single-precision | |
| 1103 return new DcmFloatingPointSingle(key); | |
| 1104 | |
| 1105 case EVR_FD: // float double-precision | |
| 1106 return new DcmFloatingPointDouble(key); | |
| 1107 | |
| 1108 | |
| 1109 /** | |
| 1110 * Sequence types, should never occur at this point. | |
| 1111 **/ | |
| 1112 | |
| 1113 case EVR_SQ: // sequence of items | |
| 1114 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 1115 | |
| 1116 | |
| 1117 /** | |
| 1118 * Internal to DCMTK. | |
| 1119 **/ | |
| 1120 | |
| 1121 case EVR_ox: // OB or OW depending on context | |
| 1122 case EVR_xs: // SS or US depending on context | |
| 1123 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name) | |
| 1124 case EVR_na: // na="not applicable", for data which has no VR | |
| 1125 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor | |
| 1126 case EVR_item: // used internally for items | |
| 1127 case EVR_metainfo: // used internally for meta info datasets | |
| 1128 case EVR_dataset: // used internally for datasets | |
| 1129 case EVR_fileFormat: // used internally for DICOM files | |
| 1130 case EVR_dicomDir: // used internally for DICOMDIR objects | |
| 1131 case EVR_dirRecord: // used internally for DICOMDIR records | |
| 1132 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image | |
| 1133 case EVR_pixelItem: // used internally for pixel items in a compressed image | |
| 1134 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR) | |
| 1135 case EVR_PixelData: // used internally for uncompressed pixeld data | |
| 1136 case EVR_OverlayData: // used internally for overlay data | |
| 1137 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR | |
| 1138 default: | |
| 1139 break; | |
| 1140 } | |
| 1141 | |
| 1142 throw OrthancException(ErrorCode_InternalError); | |
| 1143 } | |
| 1144 | |
| 1145 | |
| 1146 | |
| 1147 void FromDcmtkBridge::FillElementWithString(DcmElement& element, | |
| 1148 const DicomTag& tag, | |
| 1695 | 1149 const std::string& utf8Value, |
| 1150 bool decodeBinaryTags, | |
| 1151 Encoding dicomEncoding) | |
| 1689 | 1152 { |
| 1153 std::string binary; | |
| 1695 | 1154 const std::string* decoded = &utf8Value; |
| 1689 | 1155 |
| 1156 if (decodeBinaryTags && | |
| 1695 | 1157 boost::starts_with(utf8Value, "data:application/octet-stream;base64,")) |
| 1689 | 1158 { |
| 1159 std::string mime; | |
| 1695 | 1160 Toolbox::DecodeDataUriScheme(mime, binary, utf8Value); |
| 1161 decoded = &binary; | |
| 1162 } | |
| 1163 else if (dicomEncoding != Encoding_Utf8) | |
| 1164 { | |
| 1165 binary = Toolbox::ConvertFromUtf8(utf8Value, dicomEncoding); | |
| 1689 | 1166 decoded = &binary; |
| 1167 } | |
| 1168 | |
|
1693
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1169 DcmTag key(tag.GetGroup(), tag.GetElement()); |
| 1689 | 1170 |
|
1693
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1171 if (IsBinaryTag(key)) |
| 1689 | 1172 { |
| 1173 if (element.putUint8Array((const Uint8*) decoded->c_str(), decoded->size()).good()) | |
| 1174 { | |
| 1175 return; | |
| 1176 } | |
| 1177 else | |
| 1178 { | |
| 1179 throw OrthancException(ErrorCode_InternalError); | |
| 1180 } | |
| 1181 } | |
| 1182 | |
| 1183 bool ok = false; | |
| 1184 | |
| 1185 try | |
| 1186 { | |
| 1187 switch (key.getEVR()) | |
| 1188 { | |
| 1189 // http://support.dcmtk.org/docs/dcvr_8h-source.html | |
| 1190 | |
| 1191 /** | |
| 1192 * TODO. | |
| 1193 **/ | |
| 1194 | |
| 1195 case EVR_OB: // other byte | |
| 1196 case EVR_OF: // other float | |
| 1197 case EVR_OW: // other word | |
| 1198 case EVR_AT: // attribute tag | |
| 1199 throw OrthancException(ErrorCode_NotImplemented); | |
| 1200 | |
| 1201 case EVR_UN: // unknown value representation | |
| 1202 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 1203 | |
| 1204 | |
| 1205 /** | |
| 1206 * String types. | |
| 1207 **/ | |
| 1208 | |
| 1209 case EVR_DS: // decimal string | |
| 1210 case EVR_IS: // integer string | |
| 1211 case EVR_AS: // age string | |
| 1212 case EVR_DA: // date string | |
| 1213 case EVR_DT: // date time string | |
| 1214 case EVR_TM: // time string | |
| 1215 case EVR_AE: // application entity title | |
| 1216 case EVR_CS: // code string | |
| 1217 case EVR_SH: // short string | |
| 1218 case EVR_LO: // long string | |
| 1219 case EVR_ST: // short text | |
| 1220 case EVR_LT: // long text | |
| 1221 case EVR_UT: // unlimited text | |
| 1222 case EVR_PN: // person name | |
| 1223 case EVR_UI: // unique identifier | |
| 1224 { | |
| 1225 ok = element.putString(decoded->c_str()).good(); | |
| 1226 break; | |
| 1227 } | |
| 1228 | |
| 1229 | |
| 1230 /** | |
| 1231 * Numerical types | |
| 1232 **/ | |
| 1233 | |
| 1234 case EVR_SL: // signed long | |
| 1235 { | |
| 1236 ok = element.putSint32(boost::lexical_cast<Sint32>(*decoded)).good(); | |
| 1237 break; | |
| 1238 } | |
| 1239 | |
| 1240 case EVR_SS: // signed short | |
| 1241 { | |
| 1242 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good(); | |
| 1243 break; | |
| 1244 } | |
| 1245 | |
| 1246 case EVR_UL: // unsigned long | |
| 1247 { | |
| 1248 ok = element.putUint32(boost::lexical_cast<Uint32>(*decoded)).good(); | |
| 1249 break; | |
| 1250 } | |
| 1251 | |
| 1252 case EVR_US: // unsigned short | |
| 1253 { | |
| 1254 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good(); | |
| 1255 break; | |
| 1256 } | |
| 1257 | |
| 1258 case EVR_FL: // float single-precision | |
| 1259 { | |
| 1260 ok = element.putFloat32(boost::lexical_cast<float>(*decoded)).good(); | |
| 1261 break; | |
| 1262 } | |
| 1263 | |
| 1264 case EVR_FD: // float double-precision | |
| 1265 { | |
| 1266 ok = element.putFloat64(boost::lexical_cast<double>(*decoded)).good(); | |
| 1267 break; | |
| 1268 } | |
| 1269 | |
| 1270 | |
| 1271 /** | |
| 1272 * Sequence types, should never occur at this point. | |
| 1273 **/ | |
| 1274 | |
| 1275 case EVR_SQ: // sequence of items | |
| 1276 { | |
| 1277 ok = false; | |
| 1278 break; | |
| 1279 } | |
| 1280 | |
| 1281 | |
| 1282 /** | |
| 1283 * Internal to DCMTK. | |
| 1284 **/ | |
| 1285 | |
| 1286 case EVR_ox: // OB or OW depending on context | |
| 1287 case EVR_xs: // SS or US depending on context | |
| 1288 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name) | |
| 1289 case EVR_na: // na="not applicable", for data which has no VR | |
| 1290 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor | |
| 1291 case EVR_item: // used internally for items | |
| 1292 case EVR_metainfo: // used internally for meta info datasets | |
| 1293 case EVR_dataset: // used internally for datasets | |
| 1294 case EVR_fileFormat: // used internally for DICOM files | |
| 1295 case EVR_dicomDir: // used internally for DICOMDIR objects | |
| 1296 case EVR_dirRecord: // used internally for DICOMDIR records | |
| 1297 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image | |
| 1298 case EVR_pixelItem: // used internally for pixel items in a compressed image | |
| 1299 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR) | |
| 1300 case EVR_PixelData: // used internally for uncompressed pixeld data | |
| 1301 case EVR_OverlayData: // used internally for overlay data | |
| 1302 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR | |
| 1303 default: | |
| 1304 break; | |
| 1305 } | |
| 1306 } | |
| 1307 catch (boost::bad_lexical_cast&) | |
| 1308 { | |
| 1309 ok = false; | |
| 1310 } | |
| 1311 | |
| 1312 if (!ok) | |
| 1313 { | |
| 1314 throw OrthancException(ErrorCode_InternalError); | |
| 1315 } | |
| 1316 } | |
| 1317 | |
| 1318 | |
|
1693
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1319 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag, |
|
558b25228a23
creation of tag hierarchy from json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1691
diff
changeset
|
1320 const Json::Value& value, |
| 1695 | 1321 bool decodeBinaryTags, |
| 1322 Encoding dicomEncoding) | |
| 1689 | 1323 { |
| 1324 std::auto_ptr<DcmElement> element; | |
| 1325 | |
| 1690 | 1326 switch (value.type()) |
| 1689 | 1327 { |
| 1690 | 1328 case Json::stringValue: |
| 1329 element.reset(CreateElementForTag(tag)); | |
| 1695 | 1330 FillElementWithString(*element, tag, value.asString(), decodeBinaryTags, dicomEncoding); |
| 1690 | 1331 break; |
| 1332 | |
| 1333 case Json::arrayValue: | |
| 1334 { | |
| 1335 DcmTag key(tag.GetGroup(), tag.GetElement()); | |
| 1336 if (key.getEVR() != EVR_SQ) | |
| 1337 { | |
| 1338 throw OrthancException(ErrorCode_BadParameterType); | |
| 1339 } | |
| 1340 | |
| 1341 DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size()); | |
| 1342 element.reset(sequence); | |
| 1343 | |
| 1344 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++) | |
| 1345 { | |
| 1346 std::auto_ptr<DcmItem> item(new DcmItem); | |
| 1347 | |
| 1348 Json::Value::Members members = value[i].getMemberNames(); | |
| 1349 for (Json::Value::ArrayIndex j = 0; j < members.size(); j++) | |
| 1350 { | |
| 1695 | 1351 item->insert(FromJson(ParseTag(members[j]), value[i][members[j]], decodeBinaryTags, dicomEncoding)); |
| 1690 | 1352 } |
| 1353 | |
| 1354 sequence->append(item.release()); | |
| 1355 } | |
| 1356 | |
| 1357 break; | |
| 1358 } | |
| 1359 | |
| 1360 default: | |
| 1361 throw OrthancException(ErrorCode_BadParameterType); | |
| 1689 | 1362 } |
| 1363 | |
| 1364 return element.release(); | |
| 1365 } | |
| 0 | 1366 } |