orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 2006:6301bbcbcaed

more generic support of value representations

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 09 Jun 2016 14:48:40 +0200
parents	9b61701c35f2
children	655489d9165d

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
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1876 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 799 diff changeset	34
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	35 #ifndef NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	36 #define NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	37 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "FromDcmtkBridge.h"
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	40 #include "ToDcmtkBridge.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	41 #include "../Core/Logging.h"
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	42 #include "../Core/Toolbox.h"
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	43 #include "../Core/Uuid.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	44 #include "../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	46 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	47 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	48
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include <boost/lexical_cast.hpp>
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	50 #include <boost/filesystem.hpp>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	51 #include <boost/algorithm/string/predicate.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	53 #include <dcmtk/dcmdata/dcdeftag.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 #include <dcmtk/dcmdata/dcfilefo.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	57 #include <dcmtk/dcmdata/dcostrmb.h>
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	58 #include <dcmtk/dcmdata/dcpixel.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	59 #include <dcmtk/dcmdata/dcuid.h>
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	60 #include <dcmtk/dcmdata/dcistrmb.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	61
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	62 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	63 #include <dcmtk/dcmdata/dcvras.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	64 #include <dcmtk/dcmdata/dcvrat.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	65 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	66 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	68 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	71 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	72 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	73 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	74 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	75 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	78 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	79 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	80 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	83 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
682 efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 677 diff changeset	85
1930 1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	86 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	87 #include <EmbeddedResources.h>
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	88 #endif
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	89
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	90
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	91 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 {
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	93 static inline uint16_t GetCharValue(char c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	94 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	95 if (c >= '0' && c <= '9')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	96 return c - '0';
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	97 else if (c >= 'a' && c <= 'f')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	98 return c - 'a' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	99 else if (c >= 'A' && c <= 'F')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	100 return c - 'A' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	101 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	102 return 0;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	103 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	104
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	105 static inline uint16_t GetTagValue(const char* c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	106 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	107 return ((GetCharValue(c[0]) << 12) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	108 (GetCharValue(c[1]) << 8) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	109 (GetCharValue(c[2]) << 4) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	110 GetCharValue(c[3]));
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	111 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	112
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	113
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	114 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	115 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	116 EmbeddedResources::FileResourceId resource)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	117 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	118 Toolbox::TemporaryFile tmp;
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	119
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	120 FILE* fp = fopen(tmp.GetPath().c_str(), "wb");
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	121 fwrite(EmbeddedResources::GetFileResourceBuffer(resource),
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	122 EmbeddedResources::GetFileResourceSize(resource), 1, fp);
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	123 fclose(fp);
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	124
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	125 if (!dictionary.loadDictionary(tmp.GetPath().c_str()))
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 throw OrthancException(ErrorCode_InternalError);
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 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	130
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	131 #else
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	132 static void LoadExternalDictionary(DcmDataDictionary& dictionary,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	133 const std::string& directory,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	134 const std::string& filename)
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 boost::filesystem::path p = directory;
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	137 p = p / filename;
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 LOG(WARNING) << "Loading the external DICOM dictionary " << p;
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	140
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	141 if (!dictionary.loadDictionary(p.string().c_str()))
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	142 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	143 throw OrthancException(ErrorCode_InternalError);
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 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	146
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	147 #endif
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	148
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	149
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	150 namespace
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	151 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	152 class DictionaryLocker
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	153 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	154 private:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	155 DcmDataDictionary& dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	156
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	157 public:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	158 DictionaryLocker() : dictionary_(dcmDataDict.wrlock())
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	159 {
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	162 ~DictionaryLocker()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	163 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	164 dcmDataDict.unlock();
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	167 DcmDataDictionary& operator*()
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 return dictionary_;
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	172 DcmDataDictionary* operator->()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	173 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	174 return &dictionary_;
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 };
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	179
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	180 void FromDcmtkBridge::InitializeDictionary()
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	181 {
1657 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 DictionaryLocker locker;
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 locker->clear();
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	186
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	187 #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	188 LOG(WARNING) << "Loading the embedded dictionaries";
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	189 /**
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	190 * 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	191 * 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	192 * dictionary is not loaded by storescu.
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	193 **/
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	194 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	195
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	196 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	197 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	198
1976 325772dadcd6 Macro "__linux" (now obsolete) replaced by macro "__linux__" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1936 diff changeset	199 #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	200 std::string path = DCMTK_DICTIONARY_DIR;
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	201
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	202 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	203 if (env != NULL)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	204 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	205 path = std::string(env);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	206 }
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 LoadExternalDictionary(*locker, path, "dicom.dic");
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	209 LoadExternalDictionary(*locker, path, "private.dic");
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 #else
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	212 #error Support your platform here
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	213 #endif
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	214 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	215
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	216 /* make sure data dictionary is loaded */
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	217 if (!dcmDataDict.isDictionaryLoaded())
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	218 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	219 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	220 throw OrthancException(ErrorCode_InternalError);
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	221 }
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 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	224 // Test the dictionary with a simple DICOM tag
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	225 DcmTag key(0x0010, 0x1030); // This is PatientWeight
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	226 if (key.getEVR() != EVR_DS)
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 LOG(ERROR) << "The DICOM dictionary has not been correctly read";
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	229 throw OrthancException(ErrorCode_InternalError);
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 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	232 }
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
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	235 void FromDcmtkBridge::RegisterDictionaryTag(const DicomTag& tag,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	236 ValueRepresentation vr,
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	237 const std::string& name,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	238 unsigned int minMultiplicity,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	239 unsigned int maxMultiplicity)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	240 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	241 if (minMultiplicity < 1)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	242 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	243 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	244 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	245
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	246 bool arbitrary = false;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	247 if (maxMultiplicity == 0)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	248 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	249 maxMultiplicity = DcmVariableVM;
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	250 arbitrary = true;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	251 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	252 else if (maxMultiplicity < minMultiplicity)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	253 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	254 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	255 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	256
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	257 DcmEVR evr = ToDcmtkBridge::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	258
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	259 LOG(INFO) << "Registering tag in dictionary: " << tag << " " << (DcmVR(evr).getValidVRName()) << " "
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	260 << name << " (multiplicity: " << minMultiplicity << "-"
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	261 << (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	262
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	263 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	264 tag.GetElement(),
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	265 evr, name.c_str(),
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	266 static_cast<int>(minMultiplicity),
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	267 static_cast<int>(maxMultiplicity),
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	268 NULL /* version */,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	269 OFTrue /* doCopyString */,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	270 NULL /* private creator */));
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	271
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	272 entry->setGroupRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	273 entry->setElementRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	274
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	275 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	276 DictionaryLocker locker;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	277 locker->addEntry(entry.release());
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	278 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	279 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	280
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	281
1936 dba0db0a94b4 generalization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1935 diff changeset	282 Encoding FromDcmtkBridge::DetectEncoding(DcmItem& dataset,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	283 Encoding defaultEncoding)
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	284 {
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	285 Encoding encoding = defaultEncoding;
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	286
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	287 OFString tmp;
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	288 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good())
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	289 {
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	290 std::string characterSet = Toolbox::StripSpaces(std::string(tmp.c_str()));
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	291
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	292 if (characterSet.empty())
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	293 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	294 // Empty specific character set tag: Use the default encoding
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	295 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	296 else if (GetDicomEncoding(encoding, characterSet.c_str()))
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	297 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	298 // The specific character set is supported by the Orthanc core
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	299 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	300 else
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	301 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	302 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	303 << ", fallback to ASCII (remove all special characters)";
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	304 encoding = Encoding_Ascii;
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	305 }
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	306 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	307 else
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	308 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	309 // No specific character set tag: Use the default encoding
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	310 }
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	311
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	312 return encoding;
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	313 }
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	314
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	315
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	316 void FromDcmtkBridge::Convert(DicomMap& target,
1936 dba0db0a94b4 generalization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1935 diff changeset	317 DcmItem& dataset,
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	318 unsigned int maxStringLength,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	319 Encoding defaultEncoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 {
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	321 Encoding encoding = DetectEncoding(dataset, defaultEncoding);
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	322
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 target.SetValue(element->getTag().getGTag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 element->getTag().getETag(),
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	331 ConvertLeafElement(*element, DicomToJsonFlags_Default, maxStringLength, encoding));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 }
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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	337 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	338 {
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	339 return DicomTag(tag.getGTag(), tag.getETag());
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	340 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	341
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	342
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	349 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	350 DicomToJsonFlags flags,
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	351 unsigned int maxStringLength,
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	352 Encoding encoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	356 // This function is only applicable to leaf elements
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	357 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	360 char *c = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	361 if (element.isaString() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	362 element.getString(c).good())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	364 if (c == NULL) // This case corresponds to the empty string
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	366 return new DicomValue("", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	370 std::string s(c);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	371 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	372
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	373 if (maxStringLength != 0 &&
cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	374 utf8.size() > maxStringLength)
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	375 {
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	376 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	377 }
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	378 else
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 return new DicomValue(utf8, false);
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	381 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 switch (element.getVR())
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 /**
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	392 * Deal with binary data (including PixelData).
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	394
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	395 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	396 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	397 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	398 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	399 case EVR_ox: // OB or OW depending on context
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	400 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	401 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	402 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	403 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	404 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	405 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	406 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	407 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	408 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	409 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	410 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	411 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	412 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	413 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	414 case EVR_UI: // unique identifier
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	415 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	416 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	417 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	418 if (!(flags & DicomToJsonFlags_ConvertBinaryToNull))
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	419 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	420 Uint8* data = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	421 if (element.getUint8Array(data) == EC_Normal)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	422 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	423 return new DicomValue(reinterpret_cast<const char*>(data), element.getLength(), true);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	424 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	425 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	427 return new DicomValue;
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
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 * Numberic types
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	432 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	434 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	435 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	436 Sint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	437 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	438 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	439 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	440 return new DicomValue;
302 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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	443 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	444 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	445 Sint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	446 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	447 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	448 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	449 return new DicomValue;
302 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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	452 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	453 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	454 Uint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	455 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	456 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	457 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	458 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	459 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	460
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	461 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	462 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	463 Uint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	464 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	465 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	466 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	467 return new DicomValue;
302 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
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	470 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	471 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	472 Float32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	473 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	474 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	475 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	476 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	477 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	478
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	479 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	480 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	481 Float64 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	482 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	483 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	484 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	485 return new DicomValue;
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	486 }
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	487
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	488
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	489 /**
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	490 * Attribute tag.
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	491 **/
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 case EVR_AT:
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	494 {
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	495 DcmTagKey tag;
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	496 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good())
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	497 {
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	498 DicomTag t(tag.getGroup(), tag.getElement());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	499 return new DicomValue(t.Format(), false);
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	500 }
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	501 else
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	502 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	503 return new DicomValue;
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	504 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	505 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	509 * 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	510 * "element.isLeaf()".
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
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	513 case EVR_SQ: // sequence of items
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	514 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	517 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	518 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	519 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	521 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	522 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	523 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	524 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	525 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	526 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	527 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	528 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	529 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	530 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	531 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	532 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	533 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	534 case EVR_OverlayData: // used internally for overlay data
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	535 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	538 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	539 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	540 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	542 default:
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	543 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 catch (boost::bad_lexical_cast)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	548 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	550 catch (std::bad_cast)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	551 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	552 return new DicomValue;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	553 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	557 static Json::Value& PrepareNode(Json::Value& parent,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	558 DcmElement& element,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	559 DicomToJsonFormat format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 {
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	561 assert(parent.type() == Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	563 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	564 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	565
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	566 if (format == DicomToJsonFormat_Short)
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	567 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	568 parent[formattedTag] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	569 return parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	570 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	571
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	572 // 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	573 DcmTag tagbis(element.getTag());
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	574 const std::string tagName(tagbis.getTagName());
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	575
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	576 switch (format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 {
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	578 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	579 parent[tagName] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	580 return parent[tagName];
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 case DicomToJsonFormat_Full:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	583 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	584 parent[formattedTag] = Json::objectValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	585 Json::Value& node = parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	586
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	587 if (element.isLeaf())
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	588 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	589 node["Name"] = tagName;
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	590
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	591 if (tagbis.getPrivateCreator() != NULL)
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 node["PrivateCreator"] = tagbis.getPrivateCreator();
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
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	596 return node;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	597 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	598 else
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	599 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	600 node["Name"] = tagName;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	601 node["Type"] = "Sequence";
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	602 node["Value"] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	603 return node["Value"];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	604 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	605 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	606
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	607 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	608 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	609 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	610 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	611
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	612
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	613 static void LeafValueToJson(Json::Value& target,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	614 const DicomValue& value,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	615 DicomToJsonFormat format,
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	616 DicomToJsonFlags flags,
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	617 unsigned int maxStringLength)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	618 {
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	619 Json::Value* targetValue = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	620 Json::Value* targetType = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	621
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	622 switch (format)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	623 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	624 case DicomToJsonFormat_Short:
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	625 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	626 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	627 assert(target.type() == Json::nullValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	628 targetValue = &target;
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	629 break;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	630 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	631
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	632 case DicomToJsonFormat_Full:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	634 assert(target.type() == Json::objectValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	635 target["Value"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	636 target["Type"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	637 targetType = &target["Type"];
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	638 targetValue = &target["Value"];
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	639 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 }
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	641
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	642 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	643 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	644 }
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	645
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	646 assert(targetValue != NULL);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	647 assert(targetValue->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	648 assert(targetType == NULL \|\| targetType->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	649
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	650 if (value.IsNull())
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 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	653 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	654 *targetType = "Null";
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 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	657 else if (value.IsBinary())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	658 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	659 if (flags & DicomToJsonFlags_ConvertBinaryToAscii)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	660 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	661 *targetValue = Toolbox::ConvertToAscii(value.GetContent());
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
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 std::string s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	666 value.FormatDataUriScheme(s);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	667 *targetValue = s;
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
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	670 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	671 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	672 *targetType = "Binary";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	673 }
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 else if (maxStringLength == 0 \|\|
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	676 value.GetContent().size() <= maxStringLength)
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 *targetValue = value.GetContent();
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 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	681 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	682 *targetType = "String";
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 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	685 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	686 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	687 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	688 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	689 *targetType = "TooLong";
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 }
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	692 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	693
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	694
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	695 static void DatasetToJson(Json::Value& parent,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	696 DcmItem& item,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	697 DicomToJsonFormat format,
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	698 DicomToJsonFlags flags,
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	699 unsigned int maxStringLength,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	700 Encoding encoding);
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	701
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	702
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	703 void FromDcmtkBridge::ToJson(Json::Value& parent,
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	704 DcmElement& element,
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	705 DicomToJsonFormat format,
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	706 DicomToJsonFlags flags,
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	707 unsigned int maxStringLength,
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	708 Encoding encoding)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	709 {
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	710 if (parent.type() == Json::nullValue)
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	711 {
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	712 parent = Json::objectValue;
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	713 }
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	714
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	715 assert(parent.type() == Json::objectValue);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	716 Json::Value& target = PrepareNode(parent, element, format);
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	717
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	718 if (element.isLeaf())
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	719 {
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	720 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, flags, maxStringLength, encoding));
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	721 LeafValueToJson(target, *v, format, flags, maxStringLength);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	725 assert(target.type() == Json::nullValue);
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	726 target = Json::arrayValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	730 // etc. are not." The following dynamic_cast is thus OK.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 DcmItem* child = sequence.getItem(i);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	736 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	737 DatasetToJson(v, *child, format, flags, maxStringLength, encoding);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	738 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	743 static void DatasetToJson(Json::Value& parent,
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	744 DcmItem& item,
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	745 DicomToJsonFormat format,
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	746 DicomToJsonFlags flags,
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	747 unsigned int maxStringLength,
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	748 Encoding encoding)
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	749 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	750 assert(parent.type() == Json::objectValue);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	751
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	752 for (unsigned long i = 0; i < item.card(); i++)
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	753 {
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	754 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	755 if (element == NULL)
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	756 {
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	757 throw OrthancException(ErrorCode_InternalError);
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	758 }
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	759
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	760 DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	761
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	762 /element->getTag().isPrivate()/
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	763 if (tag.IsPrivate() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	764 !(flags & DicomToJsonFlags_IncludePrivateTags))
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	765 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	766 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	767 }
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	768
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	769 if (!(flags & DicomToJsonFlags_IncludeUnknownTags))
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	770 {
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	771 DictionaryLocker locker;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	772 if (locker->findEntry(element->getTag(), NULL) == NULL)
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 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	775 }
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
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	778 DcmEVR evr = element->getTag().getEVR();
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	779 if (evr == EVR_OB \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	780 evr == EVR_OF \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	781 evr == EVR_OW \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	782 evr == EVR_UN \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	783 evr == EVR_ox)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	784 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	785 // This is a binary tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	786 if ((tag == DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludePixelData)) \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	787 (tag != DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludeBinary)))
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	788 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	789 continue;
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 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	792
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	793 FromDcmtkBridge::ToJson(parent, *element, format, flags, maxStringLength, encoding);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	794 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	795 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	796
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	797
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	798 void FromDcmtkBridge::ToJson(Json::Value& target,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 DcmDataset& dataset,
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	800 DicomToJsonFormat format,
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	801 DicomToJsonFlags flags,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	802 unsigned int maxStringLength,
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	803 Encoding defaultEncoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	805 target = Json::objectValue;
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	806 DatasetToJson(target, dataset, format, flags, maxStringLength, DetectEncoding(dataset, defaultEncoding));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	808
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	809
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	810 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	811 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	812 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	813 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	814 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	815 {
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	816 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	817 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	818 }
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	819
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	820
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 std::string FromDcmtkBridge::GetName(const DicomTag& t)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 {
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	823 // Some patches for important tags because of different DICOM
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	824 // dictionaries between DCMTK versions
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	825 std::string n = t.GetMainTagsName();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	826 if (n.size() != 0)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	827 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	828 return n;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	829 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	830 // End of patches
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	831
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	832 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 DcmTagKey tag(t.GetGroup(), t.GetElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	837 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	841 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	845 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	846 DcmTag tag(t.GetGroup(), t.GetElement());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	847 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	848 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	849 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	850 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	851 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	852 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	853 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	854 return std::string(name);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	855 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	856 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	860 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	862 if (strlen(name) == 9 &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	863 isxdigit(name[0]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	864 isxdigit(name[1]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	865 isxdigit(name[2]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	866 isxdigit(name[3]) &&
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	867 (name[4] == '-' \|\| name[4] == ',') &&
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	868 isxdigit(name[5]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	869 isxdigit(name[6]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	870 isxdigit(name[7]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	871 isxdigit(name[8]))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	872 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	873 uint16_t group = GetTagValue(name);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	874 uint16_t element = GetTagValue(name + 5);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	875 return DicomTag(group, element);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	876 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	877
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	878 if (strlen(name) == 8 &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	879 isxdigit(name[0]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	880 isxdigit(name[1]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	881 isxdigit(name[2]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	882 isxdigit(name[3]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	883 isxdigit(name[4]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	884 isxdigit(name[5]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	885 isxdigit(name[6]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	886 isxdigit(name[7]))
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	887 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	888 uint16_t group = GetTagValue(name);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	889 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	890 return DicomTag(group, element);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	891 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	892
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	893 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 dcmDataDict.unlock();
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	900 throw OrthancException(ErrorCode_UnknownDicomTag);
0 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 else
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 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	909 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	910 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	911 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	912 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	913 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	914 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	915 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	916 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	917 throw OrthancException(ErrorCode_UnknownDicomTag);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	918 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	919 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922
1655 e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	923 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	924 {
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	925 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	926 return tmp.isUnknownVR();
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	927 }
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	928
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	929
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930 void FromDcmtkBridge::ToJson(Json::Value& result,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	931 const DicomMap& values,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	932 bool simplify)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	936 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 }
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 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 for (DicomMap::Map::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	942 it = values.map_.begin(); it != values.map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	944 if (simplify)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	945 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	946 if (it->second->IsNull())
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	947 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	948 result[GetName(it->first)] = Json::nullValue;
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	949 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	950 else
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	951 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	952 // TODO IsBinary
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	953 result[GetName(it->first)] = it->second->GetContent();
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	954 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	955 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	956 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	957 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	958 Json::Value value = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	959
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	960 value["Name"] = GetName(it->first);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	961
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	962 if (it->second->IsNull())
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	963 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	964 value["Type"] = "Null";
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	965 value["Value"] = Json::nullValue;
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 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	968 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	969 // TODO IsBinary
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	970 value["Type"] = "String";
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	971 value["Value"] = it->second->GetContent();
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	972 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	973
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	974 result[it->first.Format()] = value;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	975 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	978
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	979
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	980 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level)
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	981 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	982 char uid[100];
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 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	985 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	986 case ResourceType_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	987 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	988 // 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	989 // as a random PatientID.
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	990 return Toolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	991
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	992 case ResourceType_Instance:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	993 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	994
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	995 case ResourceType_Series:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	996 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	997
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	998 case ResourceType_Study:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	999 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1000
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1001 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1002 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1003 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1004 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1005
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1006 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1007 DcmDataset& dataSet)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1008 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1009 // 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	1010 // 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	1011 // syntax, with explicit length.
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1012
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1013 // 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	1014
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	1015
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	1016 /**
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	1017 * 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	1018 * "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	1019 * 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	1020 * (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	1021 **/
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1022 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	1023 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	1024 {
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 // 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	1026 // 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	1027 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	1028 }
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
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1030 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1031
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	1032 // Create the meta-header information
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1033 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	1034 ff.validateMetaInfo(xfer);
1316 1c8dfedefefe Fix anonymization generating non-portable DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1307 diff changeset	1035 ff.removeInvalidGroups();
291 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 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	1038 {
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1039 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	1040 buffer.resize(estimatedSize);
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1041 }
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1042
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1043 DcmOutputBufferStream ob(&buffer[0], buffer.size());
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1044
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	1045 // 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	1046 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	1047 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	1048 /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	1049 /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	1050 ff.transferEnd();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1051
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1052 if (c.good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1053 {
1876 9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1054 // 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	1055 // 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	1056 ob.flush();
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1057
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1058 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	1059 if (effectiveSize < buffer.size())
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1060 {
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1061 buffer.resize(effectiveSize);
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
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1064 return true;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1065 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1066 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1067 {
1876 9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1068 // Error
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1069 buffer.clear();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1070 return false;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1071 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1072 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1073
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1074
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1075 ValueRepresentation FromDcmtkBridge::LookupValueRepresentation(const DicomTag& tag)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1076 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1077 DcmTag t(tag.GetGroup(), tag.GetElement());
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1078 return Convert(t.getEVR());
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1079 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1080
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1081 ValueRepresentation FromDcmtkBridge::Convert(const DcmEVR vr)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1082 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1083 switch (vr)
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1084 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1085 case EVR_AE:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1086 return ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1087
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1088 case EVR_AS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1089 return ValueRepresentation_AgeString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1090
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1091 case EVR_AT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1092 return ValueRepresentation_AttributeTag;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1093
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1094 case EVR_CS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1095 return ValueRepresentation_CodeString;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1096
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1097 case EVR_DA:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1098 return ValueRepresentation_Date;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1099
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1100 case EVR_DS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1101 return ValueRepresentation_DecimalString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1102
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1103 case EVR_DT:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1104 return ValueRepresentation_DateTime;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1105
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1106 case EVR_FL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1107 return ValueRepresentation_FloatingPointSingle;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1108
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1109 case EVR_FD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1110 return ValueRepresentation_FloatingPointDouble;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1111
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1112 case EVR_IS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1113 return ValueRepresentation_IntegerString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1114
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1115 case EVR_LO:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1116 return ValueRepresentation_LongString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1117
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1118 case EVR_LT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1119 return ValueRepresentation_LongText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1120
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1121 case EVR_OB:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1122 return ValueRepresentation_OtherByte;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1123
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1124 // Not supported as of DCMTK 3.6.0
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1125 /*case EVR_OD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1126 return ValueRepresentation_OtherDouble;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1127
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1128 case EVR_OF:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1129 return ValueRepresentation_OtherFloat;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1130
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1131 // Not supported as of DCMTK 3.6.0
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1132 /*case EVR_OL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1133 return ValueRepresentation_OtherLong;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1134
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1135 case EVR_OW:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1136 return ValueRepresentation_OtherWord;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1137
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1138 case EVR_PN:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1139 return ValueRepresentation_PatientName;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1140
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1141 case EVR_SH:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1142 return ValueRepresentation_ShortString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1143
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1144 case EVR_SL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1145 return ValueRepresentation_SignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1146
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1147 case EVR_SQ:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1148 return ValueRepresentation_Sequence;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1149
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1150 case EVR_SS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1151 return ValueRepresentation_SignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1152
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1153 case EVR_ST:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1154 return ValueRepresentation_ShortText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1155
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1156 case EVR_TM:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1157 return ValueRepresentation_Time;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1158
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1159 // Not supported as of DCMTK 3.6.0
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1160 /*case EVR_UC:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1161 return ValueRepresentation_UnlimitedCharacters;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1162
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1163 case EVR_UI:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1164 return ValueRepresentation_UniqueIdentifier;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1165
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1166 case EVR_UL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1167 return ValueRepresentation_UnsignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1168
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1169 case EVR_UN:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1170 return ValueRepresentation_Unknown;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1171
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1172 // Not supported as of DCMTK 3.6.0
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1173 /*case EVR_UR:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1174 return ValueRepresentation_UniversalResource;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1175
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1176 case EVR_US:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1177 return ValueRepresentation_UnsignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1178
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1179 case EVR_UT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1180 return ValueRepresentation_UnlimitedText;
1792 b769623c806c safety check Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	1181
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1182 default:
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1183 return ValueRepresentation_NotSupported;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1184 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1185 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1186
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1187
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1188 static bool IsBinaryTag(const DcmTag& key)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1189 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1190 return (key.isUnknownVR() \|\|
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1191 key.getEVR() == EVR_OB \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1192 key.getEVR() == EVR_OF \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1193 key.getEVR() == EVR_OW \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1194 key.getEVR() == EVR_UN \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1195 key.getEVR() == EVR_ox);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1196 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1197
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1198
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1199 DcmElement* FromDcmtkBridge::CreateElementForTag(const DicomTag& tag)
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 DcmTag key(tag.GetGroup(), tag.GetElement());
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1202
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1203 if (tag.IsPrivate() \|\|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1204 IsBinaryTag(key))
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1205 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1206 return new DcmOtherByteOtherWord(key);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1207 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1208
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1209 switch (key.getEVR())
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1210 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1211 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 /**
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1214 * Binary types, handled above
1689 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 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1218 case EVR_OF: // other float
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1219 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1220 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1221 case EVR_ox: // OB or OW depending on context
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1222 throw OrthancException(ErrorCode_InternalError);
1689 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 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1226 * String types.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1227 * http://support.dcmtk.org/docs/classDcmByteString.html
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1228 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1229
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1230 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1231 return new DcmAgeString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1232
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1233 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1234 return new DcmApplicationEntity(key);
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 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1237 return new DcmCodeString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1238
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1239 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1240 return new DcmDate(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1241
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1242 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1243 return new DcmDateTime(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1244
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1245 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1246 return new DcmDecimalString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1247
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1248 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1249 return new DcmIntegerString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1250
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1251 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1252 return new DcmTime(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1253
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1254 case EVR_UI: // unique identifier
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1255 return new DcmUniqueIdentifier(key);
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 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1258 return new DcmShortText(key);
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 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1261 return new DcmLongString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1262
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1263 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1264 return new DcmLongText(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1265
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1266 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1267 return new DcmUnlimitedText(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1268
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1269 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1270 return new DcmShortString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1271
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1272 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1273 return new DcmPersonName(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1274
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1275
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1276 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1277 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1278 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1279
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1280 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1281 return new DcmSignedLong(key);
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 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1284 return new DcmSignedShort(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1285
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1286 case EVR_UL: // unsigned long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1287 return new DcmUnsignedLong(key);
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 case EVR_US: // unsigned short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1290 return new DcmUnsignedShort(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1291
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1292 case EVR_FL: // float single-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1293 return new DcmFloatingPointSingle(key);
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 case EVR_FD: // float double-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1296 return new DcmFloatingPointDouble(key);
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 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1300 * Sequence types, should never occur at this point.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1301 **/
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 case EVR_SQ: // sequence of items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1304 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1305
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 /**
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1308 * TODO
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1309 **/
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1310
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1311 case EVR_AT: // attribute tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1312 throw OrthancException(ErrorCode_NotImplemented);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1313
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1314
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1315 /**
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1316 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1317 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1318
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1319 case EVR_xs: // SS or US depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1320 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	1321 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1322 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1323 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1324 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1325 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1326 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1327 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1328 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1329 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1330 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1331 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	1332 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1333 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1334 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	1335 default:
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1336 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1337 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1338
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1339 throw OrthancException(ErrorCode_InternalError);
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
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1342
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 void FromDcmtkBridge::FillElementWithString(DcmElement& element,
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1345 const DicomTag& tag,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1346 const std::string& utf8Value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1347 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1348 Encoding dicomEncoding)
1689 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 std::string binary;
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1351 const std::string* decoded = &utf8Value;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1352
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1353 if (decodeDataUriScheme &&
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1354 boost::starts_with(utf8Value, "data:application/octet-stream;base64,"))
1689 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 std::string mime;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1357 if (!Toolbox::DecodeDataUriScheme(mime, binary, utf8Value))
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1358 {
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1359 throw OrthancException(ErrorCode_BadFileFormat);
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1360 }
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1361
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1362 decoded = &binary;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1363 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1364 else if (dicomEncoding != Encoding_Utf8)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1365 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1366 binary = Toolbox::ConvertFromUtf8(utf8Value, dicomEncoding);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1367 decoded = &binary;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1368 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1369
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1370 DcmTag key(tag.GetGroup(), tag.GetElement());
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1371
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1372 if (tag.IsPrivate() \|\|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1373 IsBinaryTag(key))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1374 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1375 if (element.putUint8Array((const Uint8*) decoded->c_str(), decoded->size()).good())
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1376 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1377 return;
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 else
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1380 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1381 throw OrthancException(ErrorCode_InternalError);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1382 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1383 }
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 bool ok = false;
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 try
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1388 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1389 switch (key.getEVR())
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 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1394 * TODO.
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 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1398 case EVR_OF: // other float
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1399 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1400 case EVR_AT: // attribute tag
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1401 throw OrthancException(ErrorCode_NotImplemented);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1402
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1403 case EVR_UN: // unknown value representation
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1404 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1405
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1406
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1407 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1408 * String types.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1409 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1410
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1411 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1412 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1413 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1414 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1415 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1416 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1417 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1418 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1419 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1420 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1421 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1422 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1423 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1424 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1425 case EVR_UI: // unique identifier
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 ok = element.putString(decoded->c_str()).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1428 break;
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
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 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1434 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1435
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1436 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1437 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1438 ok = element.putSint32(boost::lexical_cast<Sint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1439 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1440 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1441
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1442 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1443 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1444 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1445 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1446 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1447
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1448 case EVR_UL: // unsigned long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1449 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1450 ok = element.putUint32(boost::lexical_cast<Uint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1451 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1452 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1453
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1454 case EVR_US: // unsigned short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1455 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1456 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1457 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1458 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1459
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1460 case EVR_FL: // float single-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1461 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1462 ok = element.putFloat32(boost::lexical_cast<float>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1463 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1464 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1465
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1466 case EVR_FD: // float double-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1467 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1468 ok = element.putFloat64(boost::lexical_cast<double>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1469 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1470 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1471
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1472
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1473 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1474 * Sequence types, should never occur at this point.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1475 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1476
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1477 case EVR_SQ: // sequence of items
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 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1480 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1481 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1482
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1483
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1484 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1485 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1486 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1487
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1488 case EVR_ox: // OB or OW depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1489 case EVR_xs: // SS or US depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1490 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	1491 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1492 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1493 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1494 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1495 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1496 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1497 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1498 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1499 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1500 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1501 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	1502 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1503 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1504 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	1505 default:
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1506 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1507 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1508 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1509 catch (boost::bad_lexical_cast&)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1510 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1511 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1512 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1513
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1514 if (!ok)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1515 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1516 throw OrthancException(ErrorCode_InternalError);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1517 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1518 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1519
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1520
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1521 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag,
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1522 const Json::Value& value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1523 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1524 Encoding dicomEncoding)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1525 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1526 std::auto_ptr<DcmElement> element;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1527
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1528 switch (value.type())
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1529 {
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1530 case Json::stringValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1531 element.reset(CreateElementForTag(tag));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1532 FillElementWithString(*element, tag, value.asString(), decodeDataUriScheme, dicomEncoding);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1533 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1534
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1535 case Json::arrayValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1536 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1537 DcmTag key(tag.GetGroup(), tag.GetElement());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1538 if (key.getEVR() != EVR_SQ)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1539 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1540 throw OrthancException(ErrorCode_BadParameterType);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1541 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1542
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1543 DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1544 element.reset(sequence);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1545
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1546 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1547 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1548 std::auto_ptr<DcmItem> item(new DcmItem);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1549
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1550 Json::Value::Members members = value[i].getMemberNames();
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1551 for (Json::Value::ArrayIndex j = 0; j < members.size(); j++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1552 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1553 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	1554 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1555
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1556 sequence->append(item.release());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1557 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1558
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1559 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1560 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1561
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1562 default:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1563 throw OrthancException(ErrorCode_BadParameterType);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1564 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1565
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1566 return element.release();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1567 }
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1568
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1569
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1570 DcmPixelSequence* FromDcmtkBridge::GetPixelSequence(DcmDataset& dataset)
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1571 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1572 DcmElement *element = NULL;
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	1573 if (!dataset.findAndGetElement(DCM_PixelData, element).good())
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1574 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1575 throw OrthancException(ErrorCode_BadFileFormat);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1576 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1577
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1578 DcmPixelData& pixelData = dynamic_cast<DcmPixelData&>(*element);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1579 DcmPixelSequence* pixelSequence = NULL;
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1580 if (!pixelData.getEncapsulatedRepresentation
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1581 (dataset.getOriginalXfer(), NULL, pixelSequence).good())
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1582 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1583 return NULL;
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1584 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1585 else
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1586 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1587 return pixelSequence;
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1588 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1589 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1590
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1591
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1592 Encoding FromDcmtkBridge::ExtractEncoding(const Json::Value& json,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1593 Encoding defaultEncoding)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1594 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1595 if (json.type() != Json::objectValue)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1596 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1597 throw OrthancException(ErrorCode_BadParameterType);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1598 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1599
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1600 Encoding encoding = defaultEncoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1601
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1602 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1603
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1604 // Look for SpecificCharacterSet (0008,0005) in the JSON file
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1605 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1606 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1607 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1608 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1609 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1610 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1611 if (value.type() != Json::stringValue \|\|
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1612 !GetDicomEncoding(encoding, value.asCString()))
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1613 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1614 LOG(ERROR) << "Unknown encoding while creating DICOM from JSON: " << value;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1615 throw OrthancException(ErrorCode_BadRequest);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1616 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1617 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1618 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1619
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1620 return encoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1621 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1622
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1623
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1624 static void SetString(DcmDataset& target,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1625 const DcmTag& tag,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1626 const std::string& value)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1627 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1628 if (!target.putAndInsertString(tag, value.c_str()).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1629 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1630 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1631 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1632 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1633
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1634
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1635 DcmDataset* FromDcmtkBridge::FromJson(const Json::Value& json, // Encoded using UTF-8
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1636 bool generateIdentifiers,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1637 bool decodeDataUriScheme,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1638 Encoding defaultEncoding)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1639 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1640 std::auto_ptr<DcmDataset> result(new DcmDataset);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1641 Encoding encoding = ExtractEncoding(json, defaultEncoding);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1642
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1643 SetString(*result, DCM_SpecificCharacterSet, GetDicomSpecificCharacterSet(encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1644
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1645 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1646
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1647 bool hasPatientId = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1648 bool hasStudyInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1649 bool hasSeriesInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1650 bool hasSopInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1651
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1652 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1653 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1654 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1655 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1656
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1657 if (tag == DICOM_TAG_PATIENT_ID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1658 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1659 hasPatientId = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1660 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1661 else if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1662 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1663 hasStudyInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1664 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1665 else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1666 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1667 hasSeriesInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1668 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1669 else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1670 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1671 hasSopInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1672 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1673
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1674 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1675 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1676 std::auto_ptr<DcmElement> element(FromDcmtkBridge::FromJson(tag, value, decodeDataUriScheme, encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1677 const DcmTagKey& tag = element->getTag();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1678
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1679 result->findAndDeleteElement(tag);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1680
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1681 DcmElement* tmp = element.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1682 if (!result->insert(tmp, false, false).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1683 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1684 delete tmp;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1685 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1686 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1687 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1688 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1689
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1690 if (!hasPatientId &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1691 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1692 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1693 SetString(*result, DCM_PatientID, GenerateUniqueIdentifier(ResourceType_Patient));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1694 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1695
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1696 if (!hasStudyInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1697 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1698 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1699 SetString(*result, DCM_StudyInstanceUID, GenerateUniqueIdentifier(ResourceType_Study));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1700 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1701
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1702 if (!hasSeriesInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1703 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1704 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1705 SetString(*result, DCM_SeriesInstanceUID, GenerateUniqueIdentifier(ResourceType_Series));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1706 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1707
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1708 if (!hasSopInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1709 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1710 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1711 SetString(*result, DCM_SOPInstanceUID, GenerateUniqueIdentifier(ResourceType_Instance));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1712 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1713
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1714 return result.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1715 }
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1716
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1717
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1718 DcmFileFormat* FromDcmtkBridge::LoadFromMemoryBuffer(const void* buffer,
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1719 size_t size)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1720 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1721 DcmInputBufferStream is;
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1722 if (size > 0)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1723 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1724 is.setBuffer(buffer, size);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1725 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1726 is.setEos();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1727
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1728 std::auto_ptr<DcmFileFormat> result(new DcmFileFormat);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1729
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1730 result->transferInit();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1731 if (!result->read(is).good())
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1732 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1733 throw OrthancException(ErrorCode_BadFileFormat);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1734 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1735
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1736 result->loadAllDataIntoMemory();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1737 result->transferEnd();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1738
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1739 return result.release();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1740 }
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1741
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1742
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1743 void FromDcmtkBridge::FromJson(DicomMap& target,
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1744 const Json::Value& source)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1745 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1746 if (source.type() != Json::objectValue)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1747 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1748 throw OrthancException(ErrorCode_BadFileFormat);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1749 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1750
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1751 target.Clear();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1752
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1753 Json::Value::Members members = source.getMemberNames();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1754
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1755 for (size_t i = 0; i < members.size(); i++)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1756 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1757 const Json::Value& value = source[members[i]];
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1758
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1759 if (value.type() != Json::stringValue)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1760 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1761 throw OrthancException(ErrorCode_BadFileFormat);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1762 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1763
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1764 target.SetValue(ParseTag(members[i]), value.asString());
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1765 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1766 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1767 }

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 2006:6301bbcbcaed