orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 311:26efccdff583

anonymisation

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 21 Dec 2012 12:44:32 +0100
parents	fbf2b2282086
children	fc856d175d18

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Belgium
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	12 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	17 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	19 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	32 #ifndef NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	33 #define NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	34 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include "FromDcmtkBridge.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include "ToDcmtkBridge.h"
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	39 #include "../Core/Toolbox.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	40 #include "../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 #include "../Core/PngWriter.h"
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	42 #include "../Core/Uuid.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include "../Core/DicomFormat/DicomString.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include "../Core/DicomFormat/DicomNullValue.h"
79 297bad4e1019 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	45 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	47 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	48 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	49
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	52 #include <dcmtk/dcmdata/dcchrstr.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 #include <dcmtk/dcmdata/dcfilefo.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 #include <dcmtk/dcmdata/dcistrmb.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	57 #include <dcmtk/dcmdata/dcuid.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	58
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	59 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	60 #include <dcmtk/dcmdata/dcvras.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	61 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	62 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	63 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	64 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	68 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	69 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	70 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	71 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	74 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	75 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	76 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	79 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	81 #include <boost/math/special_functions/round.hpp>
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	82 #include <glog/logging.h>
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	83 #include <dcmtk/dcmdata/dcostrmb.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	85 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	87 void ParsedDicomFile::Setup(const char* buffer, size_t size)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	88 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	89 DcmInputBufferStream is;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	90 if (size > 0)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	91 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	92 is.setBuffer(buffer, size);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	93 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	94 is.setEos();
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	95
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	96 file_.reset(new DcmFileFormat);
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	97 file_->transferInit();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	98 if (!file_->read(is).good())
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 throw OrthancException(ErrorCode_BadFileFormat);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	101 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	102 file_->loadAllDataIntoMemory();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	103 file_->transferEnd();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	104 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	105
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	106
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	107 static void SendPathValueForDictionary(RestApiOutput& output,
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	108 DcmItem& dicom)
285 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 Json::Value v = Json::arrayValue;
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 for (unsigned long i = 0; i < dicom.card(); i++)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	113 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	114 DcmElement* element = dicom.getElement(i);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	115 if (element)
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 char buf[16];
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	118 sprintf(buf, "%04x-%04x", element->getTag().getGTag(), element->getTag().getETag());
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	119 v.append(buf);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	120 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	121 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	122
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	123 output.AnswerJson(v);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	124 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	125
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	126 static inline uint16_t GetCharValue(char c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	127 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	128 if (c >= '0' && c <= '9')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	129 return c - '0';
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	130 else if (c >= 'a' && c <= 'f')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	131 return c - 'a' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	132 else if (c >= 'A' && c <= 'F')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	133 return c - 'A' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	134 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	135 return 0;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	136 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	137
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	138 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	139 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	140 return ((GetCharValue(c[0]) << 12) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	141 (GetCharValue(c[1]) << 8) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	142 (GetCharValue(c[2]) << 4) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	143 GetCharValue(c[3]));
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	144 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	145
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	146 static void ParseTagAndGroup(DcmTagKey& key,
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	147 const std::string& tag)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	148 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	149 DicomTag t = FromDcmtkBridge::ParseTag(tag);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	150 key = DcmTagKey(t.GetGroup(), t.GetElement());
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	151 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	152
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	153
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	154 static void SendSequence(RestApiOutput& output,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	155 DcmSequenceOfItems& sequence)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	156 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	157 // This element is a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	158 Json::Value v = Json::arrayValue;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	159
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	160 for (unsigned long i = 0; i < sequence.card(); i++)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	161 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	162 v.append(boost::lexical_cast<std::string>(i));
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	163 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	164
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	165 output.AnswerJson(v);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	166 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	167
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	168 static void AnswerDicomField(RestApiOutput& output,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	169 DcmElement& element)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	170 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	171 // This element is not a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	172 std::string buffer;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	173 buffer.resize(65536);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	174 Uint32 length = element.getLength();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	175 Uint32 offset = 0;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	176
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	177 output.GetLowLevelOutput().SendOkHeader("application/octet-stream", true, length, NULL);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	178
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	179 while (offset < length)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	180 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	181 Uint32 nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	182 if (length - offset < buffer.size())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	183 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	184 nbytes = length - offset;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	185 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	186 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	187 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	188 nbytes = buffer.size();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	189 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	190
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	191 if (element.getPartialValue(&buffer[0], offset, nbytes).good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	192 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	193 output.GetLowLevelOutput().Send(&buffer[0], nbytes);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	194 offset += nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	195 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	196 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	197 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	198 LOG(ERROR) << "Error while sending a DICOM field";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	199 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	200 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	201 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	202
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	203 output.MarkLowLevelOutputDone();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	204 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	205
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	206 static void SendPathValueForLeaf(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	207 const std::string& tag,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	208 DcmItem& dicom)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	209 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	210 DcmTagKey k;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	211 ParseTagAndGroup(k, tag);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	212
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	213 DcmSequenceOfItems* sequence = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	214 if (dicom.findAndGetSequence(k, sequence).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	215 sequence != NULL &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	216 sequence->getVR() == EVR_SQ)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	217 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	218 SendSequence(output, *sequence);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	219 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	220 }
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	221
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	222 DcmElement* element = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	223 if (dicom.findAndGetElement(k, element).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	224 element != NULL &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	225 element->getVR() != EVR_UNKNOWN &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	226 element->getVR() != EVR_SQ)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	227 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	228 AnswerDicomField(output, *element);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	229 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	230 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	231
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	232 void ParsedDicomFile::SendPathValue(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	233 const UriComponents& uri)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	234 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	235 DcmItem* dicom = file_->getDataset();
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	236
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	237 // Go down in the tag hierarchy according to the URI
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	238 for (size_t pos = 0; pos < uri.size() / 2; pos++)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	239 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	240 size_t index;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	241 try
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	242 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	243 index = boost::lexical_cast<size_t>(uri[2 * pos + 1]);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	244 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	245 catch (boost::bad_lexical_cast&)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	246 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	247 return;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	248 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	249
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	250 DcmTagKey k;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	251 DcmItem *child = NULL;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	252 ParseTagAndGroup(k, uri[2 * pos]);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	253 if (!dicom->findAndGetSequenceItem(k, child, index).good() \|\|
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	254 child == NULL)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	255 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	256 return;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	257 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	258
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	259 dicom = child;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	260 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	261
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	262 // We have reached the end of the URI
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	263 if (uri.size() % 2 == 0)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	264 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	265 SendPathValueForDictionary(output, *dicom);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	266 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	267 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	268 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	269 SendPathValueForLeaf(output, uri.back(), *dicom);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	270 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	271 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	272
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	273
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	274
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 static DcmElement* CreateElementForTag(const DicomTag& tag)
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 DcmTag key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	280
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	281 switch (key.getEVR())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	282 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	283 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 * TODO.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	289 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	290 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	291 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	292 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	293 throw OrthancException(ErrorCode_NotImplemented);
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_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	296 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	297
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	298
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	299 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	300 * String types.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	301 * http://support.dcmtk.org/docs/classDcmByteString.html
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_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	305 return new DcmAgeString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	306
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	307 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	308 return new DcmApplicationEntity(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	309
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	310 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	311 return new DcmCodeString(key);
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_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	314 return new DcmDate(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	315
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	316 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	317 return new DcmDateTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	318
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	319 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	320 return new DcmDecimalString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	321
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	322 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	323 return new DcmIntegerString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	324
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	325 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	326 return new DcmTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	327
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	328 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	329 return new DcmUniqueIdentifier(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	330
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	331 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	332 return new DcmShortText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	333
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	334 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	335 return new DcmLongString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	336
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	337 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	338 return new DcmLongText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	339
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	340 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	341 return new DcmUnlimitedText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	342
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	343 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	344 return new DcmShortString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	345
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	346 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	347 return new DcmPersonName(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	348
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	349
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	350 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	351 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	352 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	353
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	354 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	355 return new DcmSignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	356
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	357 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	358 return new DcmSignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	359
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	360 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	361 return new DcmUnsignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	362
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	363 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	364 return new DcmUnsignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	365
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	366 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	367 return new DcmFloatingPointSingle(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	368
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	369 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	370 return new DcmFloatingPointDouble(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	371
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	372
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	373 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	374 * Sequence types, should never occur at this point.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	377 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	378 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	379
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	380
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	381 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	382 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	383 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	384
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	385 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	386 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	387 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	388 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	389 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	390 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	391 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	392 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	393 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	394 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	395 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	396 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	397 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	398 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	399 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	400 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	401 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	402 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	403 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	404 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	405
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	406 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	407 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	408
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	409
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	410
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	411 static void FillElementWithString(DcmElement& element,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	412 const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	413 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	414 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	415 DcmTag key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	416 bool ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	417
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	418 try
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	419 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	420 switch (key.getEVR())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	421 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	422 // http://support.dcmtk.org/docs/dcvr_8h-source.html
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	423
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	424 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	425 * TODO.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	426 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	427
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	428 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	429 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	430 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	431 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	432 throw OrthancException(ErrorCode_NotImplemented);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	433
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	434 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	435 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	436
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	437
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	438 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	439 * String types.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	440 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	441
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	442 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	443 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	444 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	445 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	446 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	447 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	448 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	449 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	450 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	451 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	452 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	453 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	454 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	455 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	456 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	457 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	458 ok = element.putString(value.c_str()).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	459 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	460 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	461
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	462
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	463 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	464 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	465 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	466
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	467 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	468 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	469 ok = element.putSint32(boost::lexical_cast<Sint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	470 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	471 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	472
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	473 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	474 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	475 ok = element.putSint16(boost::lexical_cast<Sint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	476 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	477 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	478
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	479 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	480 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	481 ok = element.putUint32(boost::lexical_cast<Uint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	482 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	483 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	484
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	485 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	486 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	487 ok = element.putUint16(boost::lexical_cast<Uint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	488 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	489 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	490
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	491 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	492 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	493 ok = element.putFloat32(boost::lexical_cast<float>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	494 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	495 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	496
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	497 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	498 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	499 ok = element.putFloat64(boost::lexical_cast<double>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	500 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	501 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	502
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	503
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	504 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	505 * Sequence types, should never occur at this point.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	506 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	507
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	508 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	509 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	510 ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	511 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	512 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	513
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	514
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	515 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	516 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	517 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	518
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	519 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	520 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	521 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	522 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	523 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	524 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	525 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	526 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	527 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	528 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	529 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	530 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	531 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	532 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	533 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	534 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	535 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	536 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	537 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	538 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	539 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	540 catch (boost::bad_lexical_cast&)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	541 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	542 ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	543 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	544
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	545 if (!ok)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	546 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	547 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	548 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	549 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	550
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	551
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	552 void ParsedDicomFile::Remove(const DicomTag& tag)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	553 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	554 DcmTagKey key(tag.GetGroup(), tag.GetElement());
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	555 DcmElement* element = file_->getDataset()->remove(key);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	556 if (element != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	557 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	558 delete element;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	559 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	560 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	561
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	562
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	563
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	564 void ParsedDicomFile::RemovePrivateTags()
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	565 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	566 typedef std::list<DcmElement*> Tags;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	567
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	568 Tags privateTags;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	569
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	570 DcmDataset& dataset = *file_->getDataset();
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	571 for (unsigned long i = 0; i < dataset.card(); i++)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	572 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	573 DcmElement* element = dataset.getElement(i);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	574 DcmTag tag(element->getTag());
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	575 if (!strcmp("PrivateCreator", tag.getTagName()) \|\| // TODO - This may change with future versions of DCMTK
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	576 tag.getPrivateCreator() != NULL)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	577 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	578 privateTags.push_back(element);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	579 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	580 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	581
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	582 for (Tags::iterator it = privateTags.begin();
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	583 it != privateTags.end(); it++)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	584 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	585 DcmElement* tmp = dataset.remove(*it);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	586 if (tmp != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	587 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	588 delete tmp;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	589 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	590 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	591 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	592
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	593
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	594
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	595 void ParsedDicomFile::Insert(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	596 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	597 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	598 std::auto_ptr<DcmElement> element(CreateElementForTag(tag));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	599 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	600
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	601 if (!file_->getDataset()->insert(element.release(), false, false).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	602 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	603 // This field already exists
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	604 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	605 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	606 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	607
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	608
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	609 void ParsedDicomFile::Replace(const DicomTag& tag,
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	610 const std::string& value,
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	611 DicomReplaceMode mode)
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	612 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	613 DcmTagKey key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	614 DcmElement* element = NULL;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	615
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	616 if (!file_->getDataset()->findAndGetElement(key, element).good() \|\|
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	617 element == NULL)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	618 {
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	619 // This field does not exist, act wrt. the specified "mode"
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	620 switch (mode)
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	621 {
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	622 case DicomReplaceMode_InsertIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	623 Insert(tag, value);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	624 break;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	625
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	626 case DicomReplaceMode_ThrowIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	627 throw OrthancException(ErrorCode_InexistentItem);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	628
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	629 case DicomReplaceMode_IgnoreIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	630 return;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	631 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	632 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	633 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	634 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	635 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	636 }
303 c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	637
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	638
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	639 /**
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	640 * dcmodify will automatically correct 'Media Storage SOP Class
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	641 * UID' and 'Media Storage SOP Instance UID' in the metaheader, if
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	642 * you make changes to the related tags in the dataset ('SOP Class
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	643 * UID' and 'SOP Instance UID') via insert or modify mode
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	644 * options. You can disable this behaviour by using the -nmu
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	645 * option.
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	646 **/
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	647 if (tag == DICOM_TAG_SOP_CLASS_UID)
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	648 Replace(DICOM_TAG_MEDIA_STORAGE_SOP_CLASS_UID, value, DicomReplaceMode_InsertIfAbsent);
303 c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	649
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	650 if (tag == DICOM_TAG_SOP_INSTANCE_UID)
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	651 Replace(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID, value, DicomReplaceMode_InsertIfAbsent);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	652 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	653
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	654
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	655 void ParsedDicomFile::Answer(RestApiOutput& output)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	656 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	657 std::string serialized;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	658 if (FromDcmtkBridge::SaveToMemoryBuffer(serialized, file_->getDataset()))
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	659 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	660 output.AnswerBuffer(serialized, "application/octet-stream");
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	661 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	662 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	663
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	664
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	665
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	666 bool ParsedDicomFile::GetTagValue(std::string& value,
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	667 const DicomTag& tag)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	668 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	669 DcmTagKey k(tag.GetGroup(), tag.GetElement());
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	670 DcmDataset& dataset = *file_->getDataset();
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	671 DcmElement* element = NULL;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	672 if (!dataset.findAndGetElement(k, element).good() \|\|
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	673 element == NULL)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	674 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	675 return false;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	676 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	677
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	678 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(*element));
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	679
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	680 if (v.get() == NULL)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	681 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	682 value = "";
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	683 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	684 else
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	685 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	686 value = v->AsString();
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	687 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	688
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	689 return true;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	690 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	691
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	692
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 void FromDcmtkBridge::Convert(DicomMap& target, DcmDataset& dataset)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 target.SetValue(element->getTag().getGTag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 element->getTag().getETag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 ConvertLeafElement(*element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	719 throw OrthancException("Only applicable to leaf elements");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 if (element.isaString())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 char *c;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725 if (element.getString(c).good() &&
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726 c != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 std::string s(c);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	729 std::string utf8 = Toolbox::ConvertToUtf8(s, "ISO-8859-1"); // TODO Parameter?
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 return new DicomString(utf8);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 /**
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 * TODO.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	747
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	748 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	749 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	750 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	751 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	752 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	753 return new DicomNullValue();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	754
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	755 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	756 * 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	757 * "element.isaString()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	758 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	759
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	760 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	761 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	762 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	763 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	764 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	765 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	766 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	767 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	768 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	769 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	770 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	771 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	772 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	773 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	774 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	775 return new DicomNullValue();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	778 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	779 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	780 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	782 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	783 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	784 Sint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	785 if (dynamic_cast<DcmSignedLong&>(element).getSint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	786 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	787 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	788 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	789 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	790
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	791 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	792 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	793 Sint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	794 if (dynamic_cast<DcmSignedShort&>(element).getSint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	795 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	796 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	797 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	798 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	799
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	800 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	801 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	802 Uint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	803 if (dynamic_cast<DcmUnsignedLong&>(element).getUint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	804 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	805 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	806 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	807 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	808
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	809 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	810 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	811 Uint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	812 if (dynamic_cast<DcmUnsignedShort&>(element).getUint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	813 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	814 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	815 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	816 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	817
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	818 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	819 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	820 Float32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	821 if (dynamic_cast<DcmFloatingPointSingle&>(element).getFloat32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	822 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	823 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	824 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	825 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	826
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	827 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	828 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	829 Float64 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	830 if (dynamic_cast<DcmFloatingPointDouble&>(element).getFloat64(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	831 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	832 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	833 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	834 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	838 * 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	839 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	840 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	841
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	842 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	843 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	845
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	846 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	847 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	848 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	850 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	851 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	852 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	853 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	854 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	855 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	856 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	857 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	858 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	859 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	860 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	861 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	862 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	863 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	864 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	865 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	866 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	867 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	870 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	871 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	872 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	874 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	875 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 catch (boost::bad_lexical_cast)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	882 catch (std::bad_cast)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	883 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	884 return new DicomNullValue;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	885 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	886 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 unsigned int maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 static void StoreItem(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 DcmItem& item,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 target = Json::Value(Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 for (unsigned long i = 0; i < item.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 DcmElement* element = item.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 StoreElement(target, *element, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911 assert(target.type() == Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	913 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	914 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	915
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	916 #if 0
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	917 const std::string tagName = FromDcmtkBridge::GetName(tag);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	918 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	919 // 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	920 DcmTag tagbis(element.getTag());
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	921 const std::string tagName(tagbis.getTagName());
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	922 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924 if (element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	926 Json::Value value(Json::objectValue);
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	927 value["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	928
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	929 if (tagbis.getPrivateCreator() != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	930 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	931 value["PrivateCreator"] = tagbis.getPrivateCreator();
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	932 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	933
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 if (v->IsNull())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	937 value["Type"] = "Null";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	938 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 std::string s = v->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 if (maxStringLength == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 s.size() <= maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	946 value["Type"] = "String";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	947 value["Value"] = s;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	951 value["Type"] = "TooLong";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	952 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	955
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	956 target[formattedTag] = value;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	960 Json::Value children(Json::arrayValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964 // etc. are not." The following cast is thus OK.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	965 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 DcmItem* child = sequence.getItem(i);
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	970 Json::Value& v = children.append(Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 StoreItem(v, *child, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	973
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	974 target[formattedTag]["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	975 target[formattedTag]["Type"] = "Sequence";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	976 target[formattedTag]["Value"] = children;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	979
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	980
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	981 void FromDcmtkBridge::ToJson(Json::Value& root,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	982 DcmDataset& dataset,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	983 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	985 StoreItem(root, dataset, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	987
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	988
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	989
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	990 void FromDcmtkBridge::ToJson(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991 const std::string& path,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	992 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 if (!dicom.loadFile(path.c_str()).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	997 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	999 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1001 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1002 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1003 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1004
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1006 static void ExtractPngImagePreview(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1007 DicomIntegerPixelAccessor& accessor)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1008 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1009 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1010
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1011 int32_t min, max;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1012 accessor.GetExtremeValues(min, max);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1013
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1014 std::vector<uint8_t> image(accessor.GetWidth() * accessor.GetHeight(), 0);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1015 if (min != max)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1016 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1017 uint8_t* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1018 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1019 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1020 for (unsigned int x = 0; x < accessor.GetWidth(); x++, pixel++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1021 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1022 int32_t v = accessor.GetValue(x, y);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1023 *pixel = static_cast<uint8_t>(
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1024 boost::math::lround(static_cast<float>(v - min) /
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1025 static_cast<float>(max - min) * 255.0f));
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1026 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1027 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1028 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1029
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1030 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1031 accessor.GetWidth(), PixelFormat_Grayscale8, &image[0]);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1032 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1033
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1034
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1035 template <typename T>
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1036 static void ExtractPngImageTruncate(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1037 DicomIntegerPixelAccessor& accessor,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1038 PixelFormat format)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1039 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1040 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1041
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1042 std::vector<T> image(accessor.GetWidth() * accessor.GetHeight(), 0);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1043 T* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1044 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1045 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1046 for (unsigned int x = 0; x < accessor.GetWidth(); x++, pixel++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1047 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1048 int32_t v = accessor.GetValue(x, y);
73 cb5ad233c336 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	1049 if (v < std::numeric_limits<T>::min())
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1050 *pixel = std::numeric_limits<T>::min();
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1051 else if (v > std::numeric_limits<T>::max())
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1052 *pixel = std::numeric_limits<T>::max();
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1053 else
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1054 *pixel = static_cast<T>(v);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1055 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1056 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1057
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1058 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1059 accessor.GetWidth() * sizeof(T), format, &image[0]);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1060 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1061
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1062
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1063 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1064 DcmDataset& dataset,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1065 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1066 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 std::auto_ptr<DicomIntegerPixelAccessor> accessor;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 DicomMap m;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 FromDcmtkBridge::Convert(m, dataset);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 DcmElement* e;
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	1076 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() &&
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1077 e != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1078 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 Uint8* pixData = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080 if (e->getUint8Array(pixData) == EC_Normal)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 accessor.reset(new DicomIntegerPixelAccessor(m, pixData, e->getLength()));
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1083 accessor->SetCurrentFrame(frame);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1087 PixelFormat format;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1088 switch (mode)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1089 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1090 case ImageExtractionMode_Preview:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1091 case ImageExtractionMode_UInt8:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1092 format = PixelFormat_Grayscale8;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1093 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1094
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1095 case ImageExtractionMode_UInt16:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1096 format = PixelFormat_Grayscale16;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1097 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1098
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1099 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1100 throw OrthancException(ErrorCode_NotImplemented);
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1101 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1102
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 if (accessor.get() == NULL \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 accessor->GetWidth() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 accessor->GetHeight() == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1107 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1108 w.WriteToMemory(result, 0, 0, 0, format, NULL);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1112 switch (mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1114 case ImageExtractionMode_Preview:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1115 ExtractPngImagePreview(result, *accessor);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1116 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1117
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1118 case ImageExtractionMode_UInt8:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1119 ExtractPngImageTruncate<uint8_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1120 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1121
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1122 case ImageExtractionMode_UInt16:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1123 ExtractPngImageTruncate<uint16_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1124 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1125
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1126 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1127 throw OrthancException(ErrorCode_NotImplemented);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1129 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1130 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1131
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1132
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1133 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1134 const std::string& dicomContent,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1135 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1136 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1137 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1138 DcmInputBufferStream is;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1139 if (dicomContent.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1140 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1141 is.setBuffer(&dicomContent[0], dicomContent.size());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1142 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1143 is.setEos();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1144
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1146 if (dicom.read(is).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1147 {
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1148 ExtractPngImage(result, *dicom.getDataset(), frame, mode);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1149 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1150 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1151 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1152 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1153 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1154 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1155
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1156
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1157
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1158 std::string FromDcmtkBridge::GetName(const DicomTag& t)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1159 {
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1160 // Some patches for important tags because of different DICOM
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1161 // dictionaries between DCMTK versions
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1162 std::string n = t.GetMainTagsName();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1163 if (n.size() != 0)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1164 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1165 return n;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1166 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1167 // End of patches
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1168
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1169 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1170 DcmTagKey tag(t.GetGroup(), t.GetElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1174 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1175 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1181 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1182 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1183 DcmTag tag(t.GetGroup(), t.GetElement());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1184 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1185 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1186 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1187 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1188 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1189 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1190 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1191 return std::string(name);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1192 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1193 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1197 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1199 if (strlen(name) == 9 &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1200 isxdigit(name[0]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1201 isxdigit(name[1]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1202 isxdigit(name[2]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1203 isxdigit(name[3]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1204 name[4] == '-' &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1205 isxdigit(name[5]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1206 isxdigit(name[6]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1207 isxdigit(name[7]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1208 isxdigit(name[8]))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1209 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1210 uint16_t group = GetTagValue(name);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1211 uint16_t element = GetTagValue(name + 5);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1212 return DicomTag(group, element);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1213 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1214
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1215 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1216 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1217 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1218
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221 dcmDataDict.unlock();
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1222 throw OrthancException("Unknown DICOM tag");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1223 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1224 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1225 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1226 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1227 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1229 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1230 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1231 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1232 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1233 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1234 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1235 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1236 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1237 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1238 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1239 throw OrthancException("Unknown DICOM tag");
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1240 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1241 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 void FromDcmtkBridge::Print(FILE* fp, const DicomMap& m)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1247 for (DicomMap::Map::const_iterator
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 it = m.map_.begin(); it != m.map_.end(); it++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1250 DicomTag t = it->first;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251 std::string s = it->second->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 printf("0x%04x 0x%04x (%s) [%s]\n", t.GetGroup(), t.GetElement(), GetName(t).c_str(), s.c_str());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 void FromDcmtkBridge::ToJson(Json::Value& result,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 const DicomMap& values)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1262 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1265 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1266
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1267 for (DicomMap::Map::const_iterator
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1268 it = values.map_.begin(); it != values.map_.end(); it++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 result[GetName(it->first)] = it->second->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1273
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1274
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1275 std::string FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1276 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1277 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1278
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1279 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1280 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1281 case DicomRootLevel_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1282 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1283 // Bytes Maximum. An UUID is of length 36, thus it can be used
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1284 // as a random PatientID.
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1285 return Toolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1286
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1287 case DicomRootLevel_Instance:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1288 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1289
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1290 case DicomRootLevel_Series:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1291 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1292
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1293 case DicomRootLevel_Study:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1294 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1295
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1296 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1297 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1298 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1299 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1300
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1301 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1302 DcmDataset* dataSet)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1303 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1304 // 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	1305 // 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	1306 // syntax, with explicit length.
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1307
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1308 // http://support.dcmtk.org/docs/dcxfer_8h-source.html
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1309 E_TransferSyntax xfer = EXS_LittleEndianExplicit;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1310 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1311
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1312 uint32_t s = dataSet->getLength(xfer, encodingType);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1313
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1314 buffer.resize(s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1315 DcmOutputBufferStream ob(&buffer[0], s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1316
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1317 dataSet->transferInit();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1318
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1319 #if DCMTK_VERSION_NUMBER >= 360
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1320 OFCondition c = dataSet->write(ob, xfer, encodingType, NULL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1321 /opt_groupLength/ EGL_recalcGL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1322 /opt_paddingType/ EPD_withoutPadding);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1323 #else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1324 OFCondition c = dataSet->write(ob, xfer, encodingType, NULL);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1325 #endif
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1326
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1327 dataSet->transferEnd();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1328 if (c.good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1329 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1330 return true;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1331 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1332 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1333 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1334 buffer.clear();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1335 return false;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1336 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1337
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1338 #if 0
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1339 OFCondition cond = cbdata->dcmff->saveFile(fileName.c_str(), xfer,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1340 encodingType,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1341 /opt_groupLength/ EGL_recalcGL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1342 /opt_paddingType/ EPD_withoutPadding,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1343 OFstatic_cast(Uint32, /opt_filepad/ 0),
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1344 OFstatic_cast(Uint32, /opt_itempad/ 0),
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1345 (opt_useMetaheader) ? EWM_fileformat : EWM_dataset);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1346 #endif
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1347 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 }

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 311:26efccdff583