orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 1876:9b458e4484a1

truncation of serialized DICOM buffers if calcElementLength was overestimated

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 08 Dec 2015 10:17:26 +0100
parents	a7bea843a7bc
children	b1291df2f780

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

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 1876:9b458e4484a1