Mercurial > hg > orthanc
annotate OrthancServer/FromDcmtkBridge.cpp @ 1190:851a55d183c9
fix issue #22
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 16 Oct 2014 11:23:09 +0200 |
| parents | ae9a83a6fa47 |
| children | 6e7e5ed91c2d |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 689 | 3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, |
| 0 | 4 * Belgium |
| 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" |
|
107
3b45473c0a73
replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
106
diff
changeset
|
45 #include "../Core/Toolbox.h" |
| 62 | 46 #include "../Core/OrthancException.h" |
| 799 | 47 #include "../Core/ImageFormats/PngWriter.h" |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
48 #include "../Core/Uuid.h" |
| 0 | 49 #include "../Core/DicomFormat/DicomString.h" |
| 50 #include "../Core/DicomFormat/DicomNullValue.h" | |
| 79 | 51 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h" |
| 0 | 52 |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
53 #include <list> |
| 71 | 54 #include <limits> |
| 55 | |
| 0 | 56 #include <boost/lexical_cast.hpp> |
| 57 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
58 #include <dcmtk/dcmdata/dcchrstr.h> |
| 0 | 59 #include <dcmtk/dcmdata/dcdicent.h> |
| 60 #include <dcmtk/dcmdata/dcdict.h> | |
| 61 #include <dcmtk/dcmdata/dcfilefo.h> | |
| 62 #include <dcmtk/dcmdata/dcistrmb.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
63 #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
|
64 #include <dcmtk/dcmdata/dcmetinf.h> |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
65 #include <dcmtk/dcmdata/dcdeftag.h> |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
66 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
67 #include <dcmtk/dcmdata/dcvrae.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
68 #include <dcmtk/dcmdata/dcvras.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
69 #include <dcmtk/dcmdata/dcvrcs.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
70 #include <dcmtk/dcmdata/dcvrda.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
71 #include <dcmtk/dcmdata/dcvrds.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
72 #include <dcmtk/dcmdata/dcvrdt.h> |
| 0 | 73 #include <dcmtk/dcmdata/dcvrfd.h> |
| 74 #include <dcmtk/dcmdata/dcvrfl.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
75 #include <dcmtk/dcmdata/dcvris.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
76 #include <dcmtk/dcmdata/dcvrlo.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
77 #include <dcmtk/dcmdata/dcvrlt.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
78 #include <dcmtk/dcmdata/dcvrpn.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
79 #include <dcmtk/dcmdata/dcvrsh.h> |
| 0 | 80 #include <dcmtk/dcmdata/dcvrsl.h> |
| 81 #include <dcmtk/dcmdata/dcvrss.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
82 #include <dcmtk/dcmdata/dcvrst.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
83 #include <dcmtk/dcmdata/dcvrtm.h> |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
84 #include <dcmtk/dcmdata/dcvrui.h> |
| 0 | 85 #include <dcmtk/dcmdata/dcvrul.h> |
| 86 #include <dcmtk/dcmdata/dcvrus.h> | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
87 #include <dcmtk/dcmdata/dcvrut.h> |
|
676
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
88 #include <dcmtk/dcmdata/dcpixel.h> |
|
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
89 #include <dcmtk/dcmdata/dcpixseq.h> |
|
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
90 #include <dcmtk/dcmdata/dcpxitem.h> |
| 1131 | 91 #include <dcmtk/dcmdata/dcvrat.h> |
|
676
aa5ca7a2166f
experiments with pixel data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
92 |
| 0 | 93 |
| 2 | 94 #include <boost/math/special_functions/round.hpp> |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
95 #include <glog/logging.h> |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
96 #include <dcmtk/dcmdata/dcostrmb.h> |
| 0 | 97 |
|
682
efc4928be6fb
Recover pixel data for more transfer syntaxes (notably JPEG)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
677
diff
changeset
|
98 |
| 62 | 99 namespace Orthanc |
| 0 | 100 { |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
101 static inline uint16_t GetCharValue(char c) |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
102 { |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
103 if (c >= '0' && c <= '9') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
104 return c - '0'; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
105 else if (c >= 'a' && c <= 'f') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
106 return c - 'a' + 10; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
107 else if (c >= 'A' && c <= 'F') |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
108 return c - 'A' + 10; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
109 else |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
110 return 0; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
111 } |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
112 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
113 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
|
114 { |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
115 return ((GetCharValue(c[0]) << 12) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
116 (GetCharValue(c[1]) << 8) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
117 (GetCharValue(c[2]) << 4) + |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
118 GetCharValue(c[3])); |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
119 } |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
176
diff
changeset
|
120 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
121 |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
122 Encoding FromDcmtkBridge::DetectEncoding(DcmDataset& dataset) |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
123 { |
|
1093
552a038f7c96
Default encoding is Latin-1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
124 // By default, Latin1 encoding is assumed |
|
1086
e56c3ed8d738
Parameter to set the default encoding for DICOM files without SpecificCharacterSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1004
diff
changeset
|
125 std::string s = Configuration::GetGlobalStringParameter("DefaultEncoding", ""); |
|
1093
552a038f7c96
Default encoding is Latin-1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1090
diff
changeset
|
126 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
|
127 |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
128 OFString tmp; |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
129 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good()) |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
130 { |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
131 std::string characterSet = Toolbox::StripSpaces(std::string(tmp.c_str())); |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
132 |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
133 if (characterSet.empty()) |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
134 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
135 // Empty specific character set tag: Use the default encoding |
| 1087 | 136 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
137 else if (GetDicomEncoding(encoding, characterSet.c_str())) |
| 1087 | 138 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
139 // The specific character set is supported by the Orthanc core |
| 1087 | 140 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
141 else |
| 1087 | 142 { |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
143 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
|
144 << ", fallback to ASCII (remove all special characters)"; |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
145 encoding = Encoding_Ascii; |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
146 } |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
147 } |
|
1090
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
148 else |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
149 { |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
150 // No specific character set tag: Use the default encoding |
|
e494ceb8d763
support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1087
diff
changeset
|
151 } |
|
957
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
152 |
|
63973b76a51f
detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
153 return encoding; |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
154 } |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
155 |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
156 |
| 0 | 157 void FromDcmtkBridge::Convert(DicomMap& target, DcmDataset& dataset) |
| 158 { | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
159 Encoding encoding = DetectEncoding(dataset); |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
160 |
| 0 | 161 target.Clear(); |
| 162 for (unsigned long i = 0; i < dataset.card(); i++) | |
| 163 { | |
| 164 DcmElement* element = dataset.getElement(i); | |
| 165 if (element && element->isLeaf()) | |
| 166 { | |
| 167 target.SetValue(element->getTag().getGTag(), | |
| 168 element->getTag().getETag(), | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
169 ConvertLeafElement(*element, encoding)); |
| 0 | 170 } |
| 171 } | |
| 172 } | |
| 173 | |
| 174 | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
175 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag) |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
176 { |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
177 return DicomTag(tag.getGTag(), tag.getETag()); |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
178 } |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
179 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
180 |
| 0 | 181 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element) |
| 182 { | |
| 183 return DicomTag(element.getGTag(), element.getETag()); | |
| 184 } | |
| 185 | |
| 186 | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
187 bool FromDcmtkBridge::IsPrivateTag(DcmTag& tag) |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
188 { |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
189 return (tag.getPrivateCreator() != NULL || |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
190 !strcmp("PrivateCreator", tag.getTagName())); // TODO - This may change with future versions of DCMTK |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
191 } |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
192 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
193 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
194 bool FromDcmtkBridge::IsPrivateTag(const DicomTag& tag) |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
195 { |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
196 DcmTag tmp(tag.GetGroup(), tag.GetElement()); |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
197 return IsPrivateTag(tmp); |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
198 } |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
199 |
|
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
200 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
201 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element, |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
202 Encoding encoding) |
| 0 | 203 { |
| 204 if (!element.isLeaf()) | |
| 205 { | |
| 62 | 206 throw OrthancException("Only applicable to leaf elements"); |
| 0 | 207 } |
| 208 | |
| 209 if (element.isaString()) | |
| 210 { | |
| 211 char *c; | |
| 212 if (element.getString(c).good() && | |
| 213 c != NULL) | |
| 214 { | |
| 215 std::string s(c); | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
216 std::string utf8 = Toolbox::ConvertToUtf8(s, encoding); |
| 0 | 217 return new DicomString(utf8); |
| 218 } | |
| 219 else | |
| 220 { | |
| 221 return new DicomNullValue; | |
| 222 } | |
| 223 } | |
| 224 | |
| 225 try | |
| 226 { | |
| 227 // http://support.dcmtk.org/docs/dcvr_8h-source.html | |
| 228 switch (element.getVR()) | |
| 229 { | |
| 230 | |
| 231 /** | |
| 232 * TODO. | |
| 233 **/ | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
234 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
235 case EVR_OB: // other byte |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
236 case EVR_OF: // other float |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
237 case EVR_OW: // other word |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
238 case EVR_UN: // unknown value representation |
| 1131 | 239 return new DicomNullValue; |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
240 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
241 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
242 * 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
|
243 * "element.isaString()". |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
244 **/ |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
245 |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
246 case EVR_DS: // decimal string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
247 case EVR_IS: // integer string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
248 case EVR_AS: // age string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
249 case EVR_DA: // date string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
250 case EVR_DT: // date time string |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
251 case EVR_TM: // time string |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
252 case EVR_AE: // application entity title |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
253 case EVR_CS: // code string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
254 case EVR_SH: // short string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
255 case EVR_LO: // long string |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
256 case EVR_ST: // short text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
257 case EVR_LT: // long text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
258 case EVR_UT: // unlimited text |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
259 case EVR_PN: // person name |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
260 case EVR_UI: // unique identifier |
| 1131 | 261 return new DicomNullValue; |
| 0 | 262 |
| 263 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
264 /** |
| 1131 | 265 * Numberic types |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
266 **/ |
| 0 | 267 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
268 case EVR_SL: // signed long |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
269 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
270 Sint32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
271 if (dynamic_cast<DcmSignedLong&>(element).getSint32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
272 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
273 else |
| 1131 | 274 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
275 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
276 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
277 case EVR_SS: // signed short |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
278 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
279 Sint16 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
280 if (dynamic_cast<DcmSignedShort&>(element).getSint16(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
281 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
282 else |
| 1131 | 283 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
284 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
285 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
286 case EVR_UL: // unsigned long |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
287 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
288 Uint32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
289 if (dynamic_cast<DcmUnsignedLong&>(element).getUint32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
290 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
291 else |
| 1131 | 292 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
293 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
294 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
295 case EVR_US: // unsigned short |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
296 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
297 Uint16 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
298 if (dynamic_cast<DcmUnsignedShort&>(element).getUint16(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
299 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
300 else |
| 1131 | 301 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
302 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
303 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
304 case EVR_FL: // float single-precision |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
305 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
306 Float32 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
307 if (dynamic_cast<DcmFloatingPointSingle&>(element).getFloat32(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
308 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
309 else |
| 1131 | 310 return new DicomNullValue; |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
311 } |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
312 |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
313 case EVR_FD: // float double-precision |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
314 { |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
315 Float64 f; |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
316 if (dynamic_cast<DcmFloatingPointDouble&>(element).getFloat64(f).good()) |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
317 return new DicomString(boost::lexical_cast<std::string>(f)); |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
318 else |
| 1131 | 319 return new DicomNullValue; |
| 320 } | |
| 321 | |
| 322 | |
| 323 /** | |
| 324 * Attribute tag. | |
| 325 **/ | |
| 326 | |
| 327 case EVR_AT: | |
| 328 { | |
| 1147 | 329 DcmTagKey tag; |
| 330 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good()) | |
| 331 { | |
| 332 DicomTag t(tag.getGroup(), tag.getElement()); | |
| 333 return new DicomString(t.Format()); | |
| 334 } | |
| 1131 | 335 else |
| 1147 | 336 { |
| 1131 | 337 return new DicomNullValue; |
| 1147 | 338 } |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
339 } |
| 0 | 340 |
| 341 | |
| 342 /** | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
343 * 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
|
344 * "element.isLeaf()". |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
345 **/ |
| 0 | 346 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
347 case EVR_SQ: // sequence of items |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
348 return new DicomNullValue; |
| 0 | 349 |
| 350 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
351 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
352 * Internal to DCMTK. |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
353 **/ |
| 0 | 354 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
355 case EVR_ox: // OB or OW depending on context |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
356 case EVR_xs: // SS or US depending on context |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
357 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
|
358 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
|
359 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
|
360 case EVR_item: // used internally for items |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
361 case EVR_metainfo: // used internally for meta info datasets |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
362 case EVR_dataset: // used internally for datasets |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
363 case EVR_fileFormat: // used internally for DICOM files |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
364 case EVR_dicomDir: // used internally for DICOMDIR objects |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
365 case EVR_dirRecord: // used internally for DICOMDIR records |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
366 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
|
367 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
|
368 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
|
369 case EVR_PixelData: // used internally for uncompressed pixeld data |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
370 case EVR_OverlayData: // used internally for overlay data |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
371 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
|
372 return new DicomNullValue; |
| 0 | 373 |
| 374 | |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
375 /** |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
376 * Default case. |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
377 **/ |
| 0 | 378 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
379 default: |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
380 return new DicomNullValue; |
| 0 | 381 } |
| 382 } | |
| 383 catch (boost::bad_lexical_cast) | |
| 384 { | |
| 385 return new DicomNullValue; | |
| 386 } | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
387 catch (std::bad_cast) |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
388 { |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
389 return new DicomNullValue; |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
390 } |
| 0 | 391 } |
| 392 | |
| 393 | |
| 394 static void StoreElement(Json::Value& target, | |
| 395 DcmElement& element, | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
396 unsigned int maxStringLength, |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
397 Encoding encoding); |
| 0 | 398 |
| 399 static void StoreItem(Json::Value& target, | |
| 400 DcmItem& item, | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
401 unsigned int maxStringLength, |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
402 Encoding encoding) |
| 0 | 403 { |
| 404 target = Json::Value(Json::objectValue); | |
| 405 | |
| 406 for (unsigned long i = 0; i < item.card(); i++) | |
| 407 { | |
| 408 DcmElement* element = item.getElement(i); | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
409 StoreElement(target, *element, maxStringLength, encoding); |
| 0 | 410 } |
| 411 } | |
| 412 | |
| 413 | |
| 414 static void StoreElement(Json::Value& target, | |
| 415 DcmElement& element, | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
416 unsigned int maxStringLength, |
|
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
417 Encoding encoding) |
| 0 | 418 { |
| 419 assert(target.type() == Json::objectValue); | |
| 420 | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
421 DicomTag tag(FromDcmtkBridge::GetTag(element)); |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
422 const std::string formattedTag = tag.Format(); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
423 |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
424 #if 0 |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
425 const std::string tagName = FromDcmtkBridge::GetName(tag); |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
426 #else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
427 // This version of the code gives access to the name of the private tags |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
428 DcmTag tagbis(element.getTag()); |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
429 const std::string tagName(tagbis.getTagName()); |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
430 #endif |
| 0 | 431 |
| 432 if (element.isLeaf()) | |
| 433 { | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
434 Json::Value value(Json::objectValue); |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
435 value["Name"] = tagName; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
436 |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
437 if (tagbis.getPrivateCreator() != NULL) |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
438 { |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
439 value["PrivateCreator"] = tagbis.getPrivateCreator(); |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
440 } |
|
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
441 |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
442 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, encoding)); |
| 0 | 443 if (v->IsNull()) |
| 444 { | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
445 value["Type"] = "Null"; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
446 value["Value"] = Json::nullValue; |
| 0 | 447 } |
| 448 else | |
| 449 { | |
| 450 std::string s = v->AsString(); | |
| 451 if (maxStringLength == 0 || | |
| 452 s.size() <= maxStringLength) | |
| 453 { | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
454 value["Type"] = "String"; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
455 value["Value"] = s; |
| 0 | 456 } |
| 457 else | |
| 458 { | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
459 value["Type"] = "TooLong"; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
460 value["Value"] = Json::nullValue; |
| 0 | 461 } |
| 462 } | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
463 |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
464 target[formattedTag] = value; |
| 0 | 465 } |
| 466 else | |
| 467 { | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
468 Json::Value children(Json::arrayValue); |
| 0 | 469 |
| 470 // "All subclasses of DcmElement except for DcmSequenceOfItems | |
| 471 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset | |
| 472 // etc. are not." The following cast is thus OK. | |
| 473 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element); | |
| 474 | |
| 475 for (unsigned long i = 0; i < sequence.card(); i++) | |
| 476 { | |
| 477 DcmItem* child = sequence.getItem(i); | |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
478 Json::Value& v = children.append(Json::objectValue); |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
479 StoreItem(v, *child, maxStringLength, encoding); |
| 0 | 480 } |
|
35
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
481 |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
482 target[formattedTag]["Name"] = tagName; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
483 target[formattedTag]["Type"] = "Sequence"; |
|
f6d12037f886
full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
484 target[formattedTag]["Value"] = children; |
| 0 | 485 } |
| 486 } | |
| 487 | |
| 488 | |
| 489 void FromDcmtkBridge::ToJson(Json::Value& root, | |
| 490 DcmDataset& dataset, | |
| 491 unsigned int maxStringLength) | |
| 492 { | |
|
956
2fd5a163776d
primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
949
diff
changeset
|
493 StoreItem(root, dataset, maxStringLength, DetectEncoding(dataset)); |
| 0 | 494 } |
| 495 | |
| 496 | |
| 497 | |
| 498 void FromDcmtkBridge::ToJson(Json::Value& target, | |
| 499 const std::string& path, | |
| 500 unsigned int maxStringLength) | |
| 501 { | |
| 502 DcmFileFormat dicom; | |
| 503 if (!dicom.loadFile(path.c_str()).good()) | |
| 504 { | |
| 62 | 505 throw OrthancException(ErrorCode_BadFileFormat); |
| 0 | 506 } |
| 507 else | |
| 508 { | |
| 509 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength); | |
| 510 } | |
| 511 } | |
| 512 | |
| 513 | |
| 514 | |
| 515 std::string FromDcmtkBridge::GetName(const DicomTag& t) | |
| 516 { | |
| 106 | 517 // Some patches for important tags because of different DICOM |
| 518 // dictionaries between DCMTK versions | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
519 std::string n = t.GetMainTagsName(); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
520 if (n.size() != 0) |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
521 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
522 return n; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
523 } |
| 106 | 524 // End of patches |
| 525 | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
526 #if 0 |
| 0 | 527 DcmTagKey tag(t.GetGroup(), t.GetElement()); |
| 528 const DcmDataDictionary& dict = dcmDataDict.rdlock(); | |
| 529 const DcmDictEntry* entry = dict.findEntry(tag, NULL); | |
| 530 | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
531 std::string s(DcmTag_ERROR_TagName); |
| 0 | 532 if (entry != NULL) |
| 533 { | |
| 534 s = std::string(entry->getTagName()); | |
| 535 } | |
| 536 | |
| 537 dcmDataDict.unlock(); | |
| 538 return s; | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
539 #else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
540 DcmTag tag(t.GetGroup(), t.GetElement()); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
541 const char* name = tag.getTagName(); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
542 if (name == NULL) |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
543 { |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
544 return DcmTag_ERROR_TagName; |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
545 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
546 else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
547 { |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
548 return std::string(name); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
549 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
550 #endif |
| 0 | 551 } |
| 552 | |
| 553 | |
| 304 | 554 DicomTag FromDcmtkBridge::ParseTag(const char* name) |
| 0 | 555 { |
| 304 | 556 if (strlen(name) == 9 && |
| 557 isxdigit(name[0]) && | |
| 558 isxdigit(name[1]) && | |
| 559 isxdigit(name[2]) && | |
| 560 isxdigit(name[3]) && | |
|
991
2f76b92addd4
keep private tags during anonymization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
957
diff
changeset
|
561 (name[4] == '-' || name[4] == ',') && |
| 304 | 562 isxdigit(name[5]) && |
| 563 isxdigit(name[6]) && | |
| 564 isxdigit(name[7]) && | |
| 565 isxdigit(name[8])) | |
| 566 { | |
| 567 uint16_t group = GetTagValue(name); | |
| 568 uint16_t element = GetTagValue(name + 5); | |
| 569 return DicomTag(group, element); | |
| 570 } | |
| 571 | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
572 #if 0 |
| 0 | 573 const DcmDataDictionary& dict = dcmDataDict.rdlock(); |
| 574 const DcmDictEntry* entry = dict.findEntry(name); | |
| 575 | |
| 576 if (entry == NULL) | |
| 577 { | |
| 578 dcmDataDict.unlock(); | |
| 62 | 579 throw OrthancException("Unknown DICOM tag"); |
| 0 | 580 } |
| 581 else | |
| 582 { | |
| 583 DcmTagKey key = entry->getKey(); | |
| 584 DicomTag tag(key.getGroup(), key.getElement()); | |
| 585 dcmDataDict.unlock(); | |
| 586 return tag; | |
| 587 } | |
|
305
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
588 #else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
589 DcmTag tag; |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
590 if (DcmTag::findTagFromName(name, tag).good()) |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
591 { |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
592 return DicomTag(tag.getGTag(), tag.getETag()); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
593 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
594 else |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
595 { |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
596 throw OrthancException("Unknown DICOM tag"); |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
597 } |
|
86bb79522f19
name of the private tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
598 #endif |
| 0 | 599 } |
| 600 | |
| 601 | |
| 602 void FromDcmtkBridge::Print(FILE* fp, const DicomMap& m) | |
| 603 { | |
| 604 for (DicomMap::Map::const_iterator | |
| 656 | 605 it = m.map_.begin(); it != m.map_.end(); ++it) |
| 0 | 606 { |
| 607 DicomTag t = it->first; | |
| 608 std::string s = it->second->AsString(); | |
| 319 | 609 fprintf(fp, "0x%04x 0x%04x (%s) [%s]\n", t.GetGroup(), t.GetElement(), GetName(t).c_str(), s.c_str()); |
| 0 | 610 } |
| 611 } | |
| 612 | |
| 613 | |
| 614 void FromDcmtkBridge::ToJson(Json::Value& result, | |
| 615 const DicomMap& values) | |
| 616 { | |
| 617 if (result.type() != Json::objectValue) | |
| 618 { | |
| 62 | 619 throw OrthancException(ErrorCode_BadParameterType); |
| 0 | 620 } |
| 621 | |
| 622 result.clear(); | |
| 623 | |
| 624 for (DicomMap::Map::const_iterator | |
| 656 | 625 it = values.map_.begin(); it != values.map_.end(); ++it) |
| 0 | 626 { |
| 627 result[GetName(it->first)] = it->second->AsString(); | |
| 628 } | |
| 629 } | |
| 176 | 630 |
| 631 | |
| 788 | 632 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level) |
| 176 | 633 { |
| 634 char uid[100]; | |
| 635 | |
| 636 switch (level) | |
| 637 { | |
| 788 | 638 case ResourceType_Patient: |
| 311 | 639 // The "PatientID" field is of type LO (Long String), 64 |
| 640 // Bytes Maximum. An UUID is of length 36, thus it can be used | |
| 641 // as a random PatientID. | |
| 642 return Toolbox::GenerateUuid(); | |
|
306
326d5a4a5af3
modification of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
305
diff
changeset
|
643 |
| 788 | 644 case ResourceType_Instance: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
645 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT); |
| 176 | 646 |
| 788 | 647 case ResourceType_Series: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
648 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT); |
| 176 | 649 |
| 788 | 650 case ResourceType_Study: |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
651 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT); |
| 176 | 652 |
|
302
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
653 default: |
|
238134081136
modification of dicom files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
654 throw OrthancException(ErrorCode_ParameterOutOfRange); |
| 176 | 655 } |
| 656 } | |
| 657 | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
658 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer, |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
659 DcmDataset& dataSet) |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
660 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
661 // 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
|
662 // 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
|
663 // syntax, with explicit length. |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
664 |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
665 // 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
|
666 |
|
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
|
667 |
|
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
|
668 /** |
|
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
|
669 * 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
|
670 * "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
|
671 * 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
|
672 * (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
|
673 **/ |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
674 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
|
675 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
|
676 { |
|
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
|
677 // 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
|
678 // 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
|
679 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
|
680 } |
|
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
|
681 |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
682 E_EncodingType encodingType = /*opt_sequenceType*/ EET_ExplicitLength; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
683 |
|
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
|
684 // Create the meta-header information |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
991
diff
changeset
|
685 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
|
686 ff.validateMetaInfo(xfer); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
687 |
|
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
|
688 // 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
|
689 uint32_t s = ff.calcElementLength(xfer, encodingType); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
690 buffer.resize(s); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
691 DcmOutputBufferStream ob(&buffer[0], s); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
692 |
|
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
|
693 // 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
|
694 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
|
695 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
|
696 /*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
|
697 /*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
|
698 ff.transferEnd(); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
699 |
|
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
|
700 // Handle errors |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
701 if (c.good()) |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
702 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
703 return true; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
704 } |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
705 else |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
706 { |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
707 buffer.clear(); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
708 return false; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
709 } |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
710 } |
| 0 | 711 } |