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