orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 304:4eea080e6e7a

refactoring

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 19 Dec 2012 14:57:18 +0100
parents	c76a35a85c69
children	86bb79522f19

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"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include "../Core/DicomFormat/DicomString.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include "../Core/DicomFormat/DicomNullValue.h"
79 297bad4e1019 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	44 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	46 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	47
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	50 #include <dcmtk/dcmdata/dcchrstr.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 #include <dcmtk/dcmdata/dcfilefo.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 #include <dcmtk/dcmdata/dcistrmb.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	55 #include <dcmtk/dcmdata/dcuid.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	56
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	57 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	58 #include <dcmtk/dcmdata/dcvras.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	59 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	60 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	61 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	62 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	65 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	66 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	68 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	69 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	72 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	73 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	74 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	77 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	79 #include <boost/math/special_functions/round.hpp>
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	80 #include <glog/logging.h>
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	81 #include <dcmtk/dcmdata/dcostrmb.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	83 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	85 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	86 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	87 DcmInputBufferStream is;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	88 if (size > 0)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	89 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	90 is.setBuffer(buffer, size);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	91 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	92 is.setEos();
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 file_.reset(new DcmFileFormat);
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	95 file_->transferInit();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	96 if (!file_->read(is).good())
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	97 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	98 throw OrthancException(ErrorCode_BadFileFormat);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	99 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	100 file_->loadAllDataIntoMemory();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	101 file_->transferEnd();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	102 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	103
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 static void SendPathValueForDictionary(RestApiOutput& output,
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	106 DcmItem& dicom)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	107 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	108 Json::Value v = Json::arrayValue;
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 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	111 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	112 DcmElement* element = dicom.getElement(i);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	113 if (element)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	114 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	115 char buf[16];
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	116 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	117 v.append(buf);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	118 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	119 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	120
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	121 output.AnswerJson(v);
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
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	124 static inline uint16_t GetCharValue(char c)
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 if (c >= '0' && c <= '9')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	127 return c - '0';
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	128 else if (c >= 'a' && c <= 'f')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	129 return c - 'a' + 10;
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
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	133 return 0;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	134 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	135
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	136 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	137 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	138 return ((GetCharValue(c[0]) << 12) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	139 (GetCharValue(c[1]) << 8) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	140 (GetCharValue(c[2]) << 4) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	141 GetCharValue(c[3]));
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	142 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	143
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	144 static void ParseTagAndGroup(DcmTagKey& key,
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	145 const std::string& tag)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	146 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	147 DicomTag t = FromDcmtkBridge::ParseTag(tag);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	148 key = DcmTagKey(t.GetGroup(), t.GetElement());
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	149 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	150
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	151
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	152 static void SendSequence(RestApiOutput& output,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	153 DcmSequenceOfItems& sequence)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	154 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	155 // This element is a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	156 Json::Value v = Json::arrayValue;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	157
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	158 for (unsigned long i = 0; i < sequence.card(); i++)
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 v.append(boost::lexical_cast<std::string>(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
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	163 output.AnswerJson(v);
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
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	166 static void AnswerDicomField(RestApiOutput& output,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	167 DcmElement& element)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	168 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	169 // This element is not a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	170 std::string buffer;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	171 buffer.resize(65536);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	172 Uint32 length = element.getLength();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	173 Uint32 offset = 0;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	174
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	175 output.GetLowLevelOutput().SendOkHeader("application/octet-stream", true, length, NULL);
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 while (offset < length)
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 Uint32 nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	180 if (length - offset < buffer.size())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	181 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	182 nbytes = length - offset;
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 else
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 nbytes = buffer.size();
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
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	189 if (element.getPartialValue(&buffer[0], offset, nbytes).good())
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 output.GetLowLevelOutput().Send(&buffer[0], nbytes);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	192 offset += nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	193 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	194 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	195 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	196 LOG(ERROR) << "Error while sending a DICOM field";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	197 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	198 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	199 }
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 output.MarkLowLevelOutputDone();
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
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	204 static void SendPathValueForLeaf(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	205 const std::string& tag,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	206 DcmItem& dicom)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	207 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	208 DcmTagKey k;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	209 ParseTagAndGroup(k, tag);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	210
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	211 DcmSequenceOfItems* sequence = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	212 if (dicom.findAndGetSequence(k, sequence).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	213 sequence != NULL &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	214 sequence->getVR() == EVR_SQ)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	215 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	216 SendSequence(output, *sequence);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	217 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	218 }
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	219
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	220 DcmElement* element = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	221 if (dicom.findAndGetElement(k, element).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	222 element != NULL &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	223 element->getVR() != EVR_UNKNOWN &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	224 element->getVR() != EVR_SQ)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	225 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	226 AnswerDicomField(output, *element);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	227 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	228 }
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 void ParsedDicomFile::SendPathValue(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	231 const UriComponents& uri)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	232 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	233 DcmItem* dicom = file_->getDataset();
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 // 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	236 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	237 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	238 size_t index;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	239 try
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	240 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	241 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	242 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	243 catch (boost::bad_lexical_cast&)
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 return;
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
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	248 DcmTagKey k;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	249 DcmItem *child = NULL;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	250 ParseTagAndGroup(k, uri[2 * pos]);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	251 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	252 child == NULL)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	253 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	254 return;
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
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	257 dicom = child;
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
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	260 // 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	261 if (uri.size() % 2 == 0)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	262 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	263 SendPathValueForDictionary(output, *dicom);
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 else
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 SendPathValueForLeaf(output, uri.back(), *dicom);
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 }
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
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	272
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	273
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 static DcmElement* CreateElementForTag(const DicomTag& tag)
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 DcmTag key(tag.GetGroup(), tag.GetElement());
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 switch (key.getEVR())
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 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	284 * TODO.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	287 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	288 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	289 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	290 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	291 throw OrthancException(ErrorCode_NotImplemented);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	292
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	293 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	294 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	295
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	296
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 * String types.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	299 * http://support.dcmtk.org/docs/classDcmByteString.html
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	300 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	301
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	302 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	303 return new DcmAgeString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	304
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	305 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	306 return new DcmApplicationEntity(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	307
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	308 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	309 return new DcmCodeString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	310
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	311 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	312 return new DcmDate(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	313
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	314 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	315 return new DcmDateTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	316
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	317 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	318 return new DcmDecimalString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	319
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	320 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	321 return new DcmIntegerString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	322
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	323 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	324 return new DcmTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	325
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	326 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	327 return new DcmUniqueIdentifier(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	328
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	329 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	330 return new DcmShortText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	331
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	332 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	333 return new DcmLongString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	334
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	335 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	336 return new DcmLongText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	337
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	338 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	339 return new DcmUnlimitedText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	340
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	341 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	342 return new DcmShortString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	343
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	344 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	345 return new DcmPersonName(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	346
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	347
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 * Numerical types
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	352 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	353 return new DcmSignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	354
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	355 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	356 return new DcmSignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	357
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	358 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	359 return new DcmUnsignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	360
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	361 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	362 return new DcmUnsignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	363
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	364 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	365 return new DcmFloatingPointSingle(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	366
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	367 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	368 return new DcmFloatingPointDouble(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	369
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	370
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 * Sequence types, should never occur at this point.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	375 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	376 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	377
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	378
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 * Internal to DCMTK.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	383 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	384 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	385 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	386 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	387 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	388 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	389 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	390 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	391 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	392 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	393 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	394 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	395 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	396 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	397 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	398 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	399 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	400 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	401 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	402 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	403
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	404 throw OrthancException(ErrorCode_InternalError);
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
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 static void FillElementWithString(DcmElement& element,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	410 const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	411 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	412 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	413 DcmTag key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	414 bool ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	415
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	416 try
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 switch (key.getEVR())
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 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	423 * TODO.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	426 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	427 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	428 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	429 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	430 throw OrthancException(ErrorCode_NotImplemented);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	431
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	432 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	433 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	434
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	435
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 * String types.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	440 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	441 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	442 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	443 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	444 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	445 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	446 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	447 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	448 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	449 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	450 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	451 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	452 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	453 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	454 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	455 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	456 ok = element.putString(value.c_str()).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	457 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	458 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	459
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	460
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 * Numerical types
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	465 case EVR_SL: // signed long
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 ok = element.putSint32(boost::lexical_cast<Sint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	468 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	469 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	470
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	471 case EVR_SS: // signed short
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 ok = element.putSint16(boost::lexical_cast<Sint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	474 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	475 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	476
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	477 case EVR_UL: // unsigned long
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 ok = element.putUint32(boost::lexical_cast<Uint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	480 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	481 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	482
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	483 case EVR_US: // unsigned short
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 ok = element.putUint16(boost::lexical_cast<Uint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	486 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	487 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	488
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	489 case EVR_FL: // float single-precision
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 ok = element.putFloat32(boost::lexical_cast<float>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	492 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	493 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	494
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	495 case EVR_FD: // float double-precision
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 ok = element.putFloat64(boost::lexical_cast<double>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	498 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	499 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	500
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 * Sequence types, should never occur at this point.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	506 case EVR_SQ: // sequence of items
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 ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	509 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	510 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	511
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 * Internal to DCMTK.
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	517 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	518 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	519 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	520 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	521 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	522 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	523 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	524 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	525 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	526 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	527 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	528 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	529 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	530 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	531 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	532 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	533 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	534 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	535 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	536 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	537 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	538 catch (boost::bad_lexical_cast&)
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 ok = false;
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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	543 if (!ok)
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 throw OrthancException(ErrorCode_InternalError);
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 }
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 void ParsedDicomFile::Remove(const DicomTag& tag)
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 DcmTagKey key(tag.GetGroup(), tag.GetElement());
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 // TODO This call results in memory leaks inside DCMTK
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	555 file_->getDataset()->remove(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	556 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	557
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	558
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	559
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	560 void ParsedDicomFile::Insert(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	561 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	562 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	563 std::auto_ptr<DcmElement> element(CreateElementForTag(tag));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	564 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	565
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	566 if (!file_->getDataset()->insert(element.release(), false, false).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	567 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	568 // This field already exists
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	569 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	570 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	571 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	572
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	573
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	574 void ParsedDicomFile::ReplaceInternal(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	575 const std::string& value,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	576 bool insertOnAbsent)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	577 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	578 DcmTagKey key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	579 DcmElement* element = NULL;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	580
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	581 if (!file_->getDataset()->findAndGetElement(key, element).good() \|\|
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	582 element == NULL)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	583 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	584 if (insertOnAbsent)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	585 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	586 // This field does not exist, use "Insert()" instead
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	587 Insert(tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	588 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	589 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	590 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	591 throw OrthancException(ErrorCode_InternalError);
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 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	595 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	596 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	597 }
303 c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	598
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	599
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	600 /**
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	601 * dcmodify will automatically correct 'Media Storage SOP Class
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	602 * 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	603 * 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	604 * UID' and 'SOP Instance UID') via insert or modify mode
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	605 * options. You can disable this behaviour by using the -nmu
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	606 * option.
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	607 **/
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	608 if (tag == DICOM_TAG_SOP_CLASS_UID)
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	609 ReplaceInternal(DICOM_TAG_MEDIA_STORAGE_SOP_CLASS_UID, value, true);
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	610
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	611 if (tag == DICOM_TAG_SOP_INSTANCE_UID)
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	612 ReplaceInternal(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID, value, true);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	613 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	614
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 void ParsedDicomFile::Replace(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	617 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	618 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	619 return ReplaceInternal(tag, value, false);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	620 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	621
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	622 void ParsedDicomFile::InsertOrReplace(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	623 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	624 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	625 return ReplaceInternal(tag, value, true);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	626 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	627
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	628
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	629
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	630 void ParsedDicomFile::Answer(RestApiOutput& output)
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 std::string serialized;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	633 if (FromDcmtkBridge::SaveToMemoryBuffer(serialized, file_->getDataset()))
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 output.AnswerBuffer(serialized, "application/octet-stream");
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	636 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	637 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	638
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	639
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 void FromDcmtkBridge::Convert(DicomMap& target, DcmDataset& dataset)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 target.SetValue(element->getTag().getGTag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 element->getTag().getETag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 ConvertLeafElement(*element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	666 throw OrthancException("Only applicable to leaf elements");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 if (element.isaString())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 char *c;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 if (element.getString(c).good() &&
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 c != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 std::string s(c);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	676 std::string utf8 = Toolbox::ConvertToUtf8(s, "ISO-8859-1"); // TODO Parameter?
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 return new DicomString(utf8);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 /**
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 * TODO.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	695 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	696 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	697 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	698 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	699 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	700 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	701 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	702 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	703 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	704 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	705 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	706 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	707
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	708
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	709 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	710 * 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	711 * "element.isaString()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	712 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	713
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	714 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	715 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	716 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	717 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	718 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	719 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	720 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	721 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	722 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	723 return new DicomNullValue();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	726 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	727 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	728 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	730 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	731 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	732 Sint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	733 if (dynamic_cast<DcmSignedLong&>(element).getSint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	734 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	735 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	736 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	737 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	738 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	739 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	740 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	741 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	742
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	743 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	744 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	745 Sint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	746 if (dynamic_cast<DcmSignedShort&>(element).getSint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	747 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	748 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	749 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	750 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	751 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	752 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	753 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	754 }
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 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	757 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	758 Uint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	759 if (dynamic_cast<DcmUnsignedLong&>(element).getUint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	760 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	761 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	762 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	763 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	764 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	765 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	766 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	767 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	768
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	769 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	770 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	771 Uint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	772 if (dynamic_cast<DcmUnsignedShort&>(element).getUint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	773 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	774 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	775 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	776 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	777 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	778 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	779 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	780 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	781
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	782 case EVR_FL: // float single-precision
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 Float32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	785 if (dynamic_cast<DcmFloatingPointSingle&>(element).getFloat32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	786 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	787 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	788 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	789 else
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 return new DicomNullValue();
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 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	794
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	795 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	796 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	797 Float64 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	798 if (dynamic_cast<DcmFloatingPointDouble&>(element).getFloat64(f).good())
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 return new DicomString(boost::lexical_cast<std::string>(f));
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 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	803 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	804 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	805 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	806 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	808
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	809 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	810 * 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	811 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	812 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	814 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	815 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	818 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	819 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	820 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	822 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	823 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	824 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	825 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	826 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	827 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	828 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	829 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	830 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	831 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	832 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	833 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	834 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	835 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	836 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	837 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	838 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	839 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840
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 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	843 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	844 **/
0 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 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	847 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	848 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850 catch (boost::bad_lexical_cast)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 unsigned int maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 static void StoreItem(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 DcmItem& item,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 target = Json::Value(Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 for (unsigned long i = 0; i < item.card(); i++)
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 DcmElement* element = item.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 StoreElement(target, *element, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 assert(target.type() == Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	881 DicomTag tag(FromDcmtkBridge::GetTag(element));
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	882 const std::string tagName = FromDcmtkBridge::GetName(tag);
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	883 const std::string formattedTag = tag.Format();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885 if (element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	886 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	887 Json::Value value(Json::objectValue);
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	888 value["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	889
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 if (v->IsNull())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	893 value["Type"] = "Null";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	894 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 std::string s = v->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 if (maxStringLength == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 s.size() <= maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	902 value["Type"] = "String";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	903 value["Value"] = s;
0 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 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	907 value["Type"] = "TooLong";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	908 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	911
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	912 target[formattedTag] = value;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	916 Json::Value children(Json::arrayValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 // etc. are not." The following cast is thus OK.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 DcmItem* child = sequence.getItem(i);
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	926 Json::Value& v = children.append(Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	927 StoreItem(v, *child, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	929
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	930 target[formattedTag]["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	931 target[formattedTag]["Type"] = "Sequence";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	932 target[formattedTag]["Value"] = children;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 void FromDcmtkBridge::ToJson(Json::Value& root,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 DcmDataset& dataset,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 StoreItem(root, dataset, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946 void FromDcmtkBridge::ToJson(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 const std::string& path,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 if (!dicom.loadFile(path.c_str()).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	953 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	962 static void ExtractPngImagePreview(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	963 DicomIntegerPixelAccessor& accessor)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	964 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	965 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	966
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	967 int32_t min, max;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	968 accessor.GetExtremeValues(min, max);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	969
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	970 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	971 if (min != max)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	972 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	973 uint8_t* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	974 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	975 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	976 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	977 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	978 int32_t v = accessor.GetValue(x, y);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	979 *pixel = static_cast<uint8_t>(
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	980 boost::math::lround(static_cast<float>(v - min) /
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	981 static_cast<float>(max - min) * 255.0f));
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	982 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	983 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	984 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	985
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	986 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	987 accessor.GetWidth(), PixelFormat_Grayscale8, &image[0]);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	988 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	989
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	990
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	991 template <typename T>
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	992 static void ExtractPngImageTruncate(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	993 DicomIntegerPixelAccessor& accessor,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	994 PixelFormat format)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	995 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	996 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	997
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	998 std::vector<T> image(accessor.GetWidth() * accessor.GetHeight(), 0);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	999 T* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1000 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1001 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1002 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	1003 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1004 int32_t v = accessor.GetValue(x, y);
73 cb5ad233c336 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	1005 if (v < std::numeric_limits<T>::min())
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1006 *pixel = std::numeric_limits<T>::min();
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1007 else if (v > std::numeric_limits<T>::max())
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1008 *pixel = std::numeric_limits<T>::max();
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1009 else
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1010 *pixel = static_cast<T>(v);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1011 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1012 }
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 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1015 accessor.GetWidth() * sizeof(T), format, &image[0]);
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
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1018
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1019 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1020 DcmDataset& dataset,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1021 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1022 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 std::auto_ptr<DicomIntegerPixelAccessor> accessor;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 DicomMap m;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 FromDcmtkBridge::Convert(m, dataset);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 DcmElement* e;
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	1032 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() &&
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 e != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 Uint8* pixData = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 if (e->getUint8Array(pixData) == EC_Normal)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 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	1039 accessor->SetCurrentFrame(frame);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1040 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1041 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1042
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1043 PixelFormat format;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1044 switch (mode)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1045 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1046 case ImageExtractionMode_Preview:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1047 case ImageExtractionMode_UInt8:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1048 format = PixelFormat_Grayscale8;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1049 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1050
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1051 case ImageExtractionMode_UInt16:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1052 format = PixelFormat_Grayscale16;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1053 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1054
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1055 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1056 throw OrthancException(ErrorCode_NotImplemented);
42 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
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 if (accessor.get() == NULL \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 accessor->GetWidth() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 accessor->GetHeight() == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1063 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1064 w.WriteToMemory(result, 0, 0, 0, format, NULL);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1068 switch (mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1070 case ImageExtractionMode_Preview:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1071 ExtractPngImagePreview(result, *accessor);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1072 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1073
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1074 case ImageExtractionMode_UInt8:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1075 ExtractPngImageTruncate<uint8_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1076 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1077
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1078 case ImageExtractionMode_UInt16:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1079 ExtractPngImageTruncate<uint16_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1080 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1081
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1082 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1083 throw OrthancException(ErrorCode_NotImplemented);
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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1089 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1090 const std::string& dicomContent,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1091 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1092 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1093 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 DcmInputBufferStream is;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 if (dicomContent.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1097 is.setBuffer(&dicomContent[0], dicomContent.size());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1098 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099 is.setEos();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 if (dicom.read(is).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 {
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1104 ExtractPngImage(result, *dicom.getDataset(), frame, mode);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1108 throw OrthancException(ErrorCode_BadFileFormat);
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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114 std::string FromDcmtkBridge::GetName(const DicomTag& t)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115 {
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1116 // Some patches for important tags because of different DICOM
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1117 // dictionaries between DCMTK versions
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1118 std::string n = t.GetMainTagsName();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1119 if (n.size() != 0)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1120 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1121 return n;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1122 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1123 // End of patches
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1124
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125 DcmTagKey tag(t.GetGroup(), t.GetElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
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 std::string s("Unknown");
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1130 if (entry != NULL)
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 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1134
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1135 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1136 return s;
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1139
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1140 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1141 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1142 if (strlen(name) == 9 &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1143 isxdigit(name[0]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1144 isxdigit(name[1]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1145 isxdigit(name[2]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1146 isxdigit(name[3]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1147 name[4] == '-' &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1148 isxdigit(name[5]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1149 isxdigit(name[6]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1150 isxdigit(name[7]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1151 isxdigit(name[8]))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1152 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1153 uint16_t group = GetTagValue(name);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1154 uint16_t element = GetTagValue(name + 5);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1155 return DicomTag(group, element);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1156 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1157
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1158 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1159 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1160
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1161 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 dcmDataDict.unlock();
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1164 throw OrthancException("Unknown DICOM tag");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1170 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1174
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1175
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176 void FromDcmtkBridge::Print(FILE* fp, const DicomMap& m)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178 for (DicomMap::Map::const_iterator
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179 it = m.map_.begin(); it != m.map_.end(); it++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1181 DicomTag t = it->first;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1182 std::string s = it->second->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1183 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	1184 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1185 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1186
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1187
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 void FromDcmtkBridge::ToJson(Json::Value& result,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1189 const DicomMap& values)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1190 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1191 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1193 throw OrthancException(ErrorCode_BadParameterType);
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 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1197
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 for (DicomMap::Map::const_iterator
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199 it = values.map_.begin(); it != values.map_.end(); it++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1201 result[GetName(it->first)] = it->second->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1202 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1204
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1205
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1206 std::string FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1207 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1208 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1209
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1210 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1211 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1212 case DicomRootLevel_Instance:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1213 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1214
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1215 case DicomRootLevel_Series:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1216 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1217
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1218 case DicomRootLevel_Study:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1219 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1220
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1221 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1222 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1223 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1224 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1225
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1226 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1227 DcmDataset* dataSet)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1228 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1229 // 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	1230 // 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	1231 // syntax, with explicit length.
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1232
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1233 // http://support.dcmtk.org/docs/dcxfer_8h-source.html
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1234 E_TransferSyntax xfer = EXS_LittleEndianExplicit;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1235 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1236
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1237 uint32_t s = dataSet->getLength(xfer, encodingType);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1238
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1239 buffer.resize(s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1240 DcmOutputBufferStream ob(&buffer[0], s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1241
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1242 dataSet->transferInit();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1243
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1244 #if DCMTK_VERSION_NUMBER >= 360
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1245 OFCondition c = dataSet->write(ob, xfer, encodingType, NULL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1246 /opt_groupLength/ EGL_recalcGL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1247 /opt_paddingType/ EPD_withoutPadding);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1248 #else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1249 OFCondition c = dataSet->write(ob, xfer, encodingType, NULL);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1250 #endif
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1251
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1252 dataSet->transferEnd();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1253 if (c.good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1254 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1255 return true;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1256 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1257 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1258 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1259 buffer.clear();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1260 return false;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1261 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1262
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1263 #if 0
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1264 OFCondition cond = cbdata->dcmff->saveFile(fileName.c_str(), xfer,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1265 encodingType,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1266 /opt_groupLength/ EGL_recalcGL,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1267 /opt_paddingType/ EPD_withoutPadding,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1268 OFstatic_cast(Uint32, /opt_filepad/ 0),
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1269 OFstatic_cast(Uint32, /opt_itempad/ 0),
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1270 (opt_useMetaheader) ? EWM_fileformat : EWM_dataset);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1271 #endif
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1272 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 }

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 304:4eea080e6e7a