orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 2232:3dd44baebc36

macro ORTHANC_ENABLE_LUA for orthanc-wsi

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 14 Dec 2016 16:57:21 +0100
parents	3eefb84ac0bd
children	a3a65de1840f

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"
2172 84d1d392a9ab GenerateUuid() not available in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2152 diff changeset	42 #include "../Core/SystemToolbox.h"
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	43 #include "../Core/Toolbox.h"
2142 5a8840920121 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2131 diff changeset	44 #include "../Core/TemporaryFile.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	45 #include "../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	47 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	48 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	49
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 #include <boost/lexical_cast.hpp>
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	51 #include <boost/filesystem.hpp>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	52 #include <boost/algorithm/string/predicate.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	54 #include <dcmtk/dcmdata/dcdeftag.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 #include <dcmtk/dcmdata/dcfilefo.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	58 #include <dcmtk/dcmdata/dcostrmb.h>
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	59 #include <dcmtk/dcmdata/dcpixel.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	60 #include <dcmtk/dcmdata/dcuid.h>
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	61 #include <dcmtk/dcmdata/dcistrmb.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	62
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	63 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	64 #include <dcmtk/dcmdata/dcvras.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	65 #include <dcmtk/dcmdata/dcvrat.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	66 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	68 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	69 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	72 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	73 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	74 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	75 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	76 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	79 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	80 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	81 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	84 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
682 efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 677 diff changeset	86
1930 1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	87 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	88 #include <EmbeddedResources.h>
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	89 #endif
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	90
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	91
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	92 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 {
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	94 static inline uint16_t GetCharValue(char c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	95 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	96 if (c >= '0' && c <= '9')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	97 return c - '0';
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	98 else if (c >= 'a' && c <= 'f')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	99 return c - 'a' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	100 else if (c >= 'A' && c <= 'F')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	101 return c - 'A' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	102 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	103 return 0;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	104 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	105
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	106 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	107 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	108 return ((GetCharValue(c[0]) << 12) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	109 (GetCharValue(c[1]) << 8) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	110 (GetCharValue(c[2]) << 4) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	111 GetCharValue(c[3]));
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	112 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	113
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	114
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	115 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	116 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	117 EmbeddedResources::FileResourceId resource)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	118 {
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	119 std::string content;
08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	120 EmbeddedResources::GetFileResource(content, resource);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	121
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	122 TemporaryFile tmp;
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	123 tmp.Write(content);
1656 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 {
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	127 LOG(ERROR) << "Cannot read embedded dictionary. Under Windows, make sure that "
08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	128 << "your TEMP directory does not contain special characters.";
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	129 throw OrthancException(ErrorCode_InternalError);
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 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	132
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	133 #else
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	134 static void LoadExternalDictionary(DcmDataDictionary& dictionary,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	135 const std::string& directory,
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	136 const std::string& filename)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	137 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	138 boost::filesystem::path p = directory;
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	139 p = p / filename;
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 LOG(WARNING) << "Loading the external DICOM dictionary " << p;
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 if (!dictionary.loadDictionary(p.string().c_str()))
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 throw OrthancException(ErrorCode_InternalError);
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 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	148 #endif
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	149
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	150
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	151 namespace
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	152 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	153 class DictionaryLocker
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	154 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	155 private:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	156 DcmDataDictionary& dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	157
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	158 public:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	159 DictionaryLocker() : dictionary_(dcmDataDict.wrlock())
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	163 ~DictionaryLocker()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	164 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	165 dcmDataDict.unlock();
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	168 DcmDataDictionary& operator*()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	169 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	170 return dictionary_;
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	173 DcmDataDictionary* operator->()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	174 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	175 return &dictionary_;
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
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	180
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	181 void FromDcmtkBridge::InitializeDictionary(bool loadPrivateDictionary)
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	182 {
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	183 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	184 DictionaryLocker locker;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	185
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	186 locker->clear();
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	187
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	188 #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	189 LOG(WARNING) << "Loading the embedded dictionaries";
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	190 /**
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	191 * 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	192 * 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	193 * dictionary is not loaded by storescu.
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	194 **/
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	195 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	196
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	197 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM);
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	198
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	199 if (loadPrivateDictionary)
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	200 {
2152 cbebc5d072b0 Use of DCMTK 3.6.1 dictionary of private tags in standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	201 LOG(INFO) << "Loading the embedded dictionary of private tags";
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	202 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE);
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	203 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	204 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	205 {
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	206 LOG(INFO) << "The dictionary of private tags has not been loaded";
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	207 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	208
1976 325772dadcd6 Macro "__linux" (now obsolete) replaced by macro "__linux__" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1936 diff changeset	209 #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	210 std::string path = DCMTK_DICTIONARY_DIR;
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	211
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	212 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	213 if (env != NULL)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	214 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	215 path = std::string(env);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	216 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	217
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	218 LoadExternalDictionary(*locker, path, "dicom.dic");
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	219
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	220 if (loadPrivateDictionary)
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	221 {
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	222 LoadExternalDictionary(*locker, path, "private.dic");
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	223 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	224 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	225 {
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	226 LOG(INFO) << "The dictionary of private tags has not been loaded";
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	227 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	228
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	229 #else
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	230 #error Support your platform here
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	231 #endif
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	232 }
1656 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 /* make sure data dictionary is loaded */
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	235 if (!dcmDataDict.isDictionaryLoaded())
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	236 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	237 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	238 throw OrthancException(ErrorCode_InternalError);
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	239 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	240
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	241 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	242 // Test the dictionary with a simple DICOM tag
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	243 DcmTag key(0x0010, 0x1030); // This is PatientWeight
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	244 if (key.getEVR() != EVR_DS)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	245 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	246 LOG(ERROR) << "The DICOM dictionary has not been correctly read";
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	247 throw OrthancException(ErrorCode_InternalError);
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	248 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	249 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	250 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	251
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	252
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	253 void FromDcmtkBridge::RegisterDictionaryTag(const DicomTag& tag,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	254 ValueRepresentation vr,
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	255 const std::string& name,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	256 unsigned int minMultiplicity,
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	257 unsigned int maxMultiplicity,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	258 const std::string& privateCreator)
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	259 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	260 if (minMultiplicity < 1)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	261 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	262 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	263 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	264
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	265 bool arbitrary = false;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	266 if (maxMultiplicity == 0)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	267 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	268 maxMultiplicity = DcmVariableVM;
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	269 arbitrary = true;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	270 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	271 else if (maxMultiplicity < minMultiplicity)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	272 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	273 throw OrthancException(ErrorCode_ParameterOutOfRange);
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
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	276 DcmEVR evr = ToDcmtkBridge::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	277
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	278 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	279 << name << " (multiplicity: " << minMultiplicity << "-"
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	280 << (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	281
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	282 std::auto_ptr<DcmDictEntry> entry;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	283 if (privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	284 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	285 if (tag.GetGroup() % 2 == 1)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	286 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	287 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	288 sprintf(buf, "Warning: You are registering a private tag (%04x,%04x), "
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	289 "but no private creator was associated with it",
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	290 tag.GetGroup(), tag.GetElement());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	291 LOG(WARNING) << buf;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	292 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	293
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	294 entry.reset(new DcmDictEntry(tag.GetGroup(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	295 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	296 evr, name.c_str(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	297 static_cast<int>(minMultiplicity),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	298 static_cast<int>(maxMultiplicity),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	299 NULL /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	300 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	301 NULL /* private creator */));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	302 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	303 else
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	304 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	305 // "Private Data Elements have an odd Group Number that is not
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	306 // (0001,eeee), (0003,eeee), (0005,eeee), (0007,eeee), or
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	307 // (FFFF,eeee)."
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	308 if (tag.GetGroup() % 2 == 0 /* even */ \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	309 tag.GetGroup() == 0x0001 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	310 tag.GetGroup() == 0x0003 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	311 tag.GetGroup() == 0x0005 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	312 tag.GetGroup() == 0x0007 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	313 tag.GetGroup() == 0xffff)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	314 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	315 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	316 sprintf(buf, "Trying to register private tag (%04x,%04x), but it must have an odd group >= 0x0009",
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	317 tag.GetGroup(), tag.GetElement());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	318 LOG(ERROR) << buf;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	319 throw OrthancException(ErrorCode_ParameterOutOfRange);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	320 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	321
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	322 entry.reset(new DcmDictEntry(tag.GetGroup(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	323 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	324 evr, name.c_str(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	325 static_cast<int>(minMultiplicity),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	326 static_cast<int>(maxMultiplicity),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	327 "private" /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	328 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	329 privateCreator.c_str()));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	330 }
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	331
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	332 entry->setGroupRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	333 entry->setElementRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	334
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	335 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	336 DictionaryLocker locker;
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	337
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	338 if (locker->findEntry(name.c_str()))
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	339 {
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	340 LOG(ERROR) << "Cannot register two tags with the same symbolic name \"" << name << "\"";
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	341 throw OrthancException(ErrorCode_AlreadyExistingTag);
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	342 }
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	343
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	344 locker->addEntry(entry.release());
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	345 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	346 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	347
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	348
1936 dba0db0a94b4 generalization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1935 diff changeset	349 Encoding FromDcmtkBridge::DetectEncoding(DcmItem& dataset,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	350 Encoding defaultEncoding)
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	351 {
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	352 Encoding encoding = defaultEncoding;
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	353
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	354 OFString tmp;
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	355 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good())
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	356 {
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	357 std::string characterSet = Toolbox::StripSpaces(std::string(tmp.c_str()));
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	358
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	359 if (characterSet.empty())
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	360 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	361 // Empty specific character set tag: Use the default encoding
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	362 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	363 else if (GetDicomEncoding(encoding, characterSet.c_str()))
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	364 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	365 // The specific character set is supported by the Orthanc core
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	366 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	367 else
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1086 diff changeset	368 {
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	369 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	370 << ", fallback to ASCII (remove all special characters)";
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	371 encoding = Encoding_Ascii;
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	372 }
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	373 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	374 else
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	375 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	376 // No specific character set tag: Use the default encoding
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	377 }
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	378
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	379 return encoding;
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	380 }
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	381
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	382
2125 b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	383 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	384 DcmItem& dataset,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	385 unsigned int maxStringLength,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	386 Encoding defaultEncoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 {
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	388 Encoding encoding = DetectEncoding(dataset, defaultEncoding);
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	389
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 target.SetValue(element->getTag().getGTag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 element->getTag().getETag(),
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	398 ConvertLeafElement(*element, DicomToJsonFlags_Default, maxStringLength, encoding));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	404 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	405 {
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	406 return DicomTag(tag.getGTag(), tag.getETag());
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	407 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	408
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	409
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	416 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	417 DicomToJsonFlags flags,
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	418 unsigned int maxStringLength,
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	419 Encoding encoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	423 // This function is only applicable to leaf elements
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	424 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
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 char *c = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	428 if (element.isaString() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	429 element.getString(c).good())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	431 if (c == NULL) // This case corresponds to the empty string
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	433 return new DicomValue("", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	437 std::string s(c);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	438 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	439
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	440 if (maxStringLength != 0 &&
cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	441 utf8.size() > maxStringLength)
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	442 {
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	443 return new DicomValue; // Too long, create a NULL value
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	444 }
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	445 else
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	446 {
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	447 return new DicomValue(utf8, false);
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	448 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	452
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	453 if (element.getVR() == EVR_UN)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	454 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	455 // Unknown value representation: Lookup in the dictionary. This
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	456 // is notably the case for private tags registered with the
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	457 // "Dictionary" configuration option.
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	458 DictionaryLocker locker;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	459
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	460 const DcmDictEntry* entry = locker->findEntry(element.getTag().getXTag(),
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	461 element.getTag().getPrivateCreator());
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	462 if (entry != NULL &&
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	463 entry->getVR().isaString())
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	464 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	465 Uint8* data = NULL;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	466
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	467 // At (*), we do not try and convert to UTF-8, as nothing says
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	468 // the encoding of the private tag is the same as that of the
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	469 // remaining of the DICOM dataset. Only go for ASCII strings.
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	470
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	471 if (element.getUint8Array(data) == EC_Normal &&
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	472 Toolbox::IsAsciiString(data, element.getLength())) // (*)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	473 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	474 if (data == NULL)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	475 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	476 return new DicomValue("", false); // Empty string
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	477 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	478 else if (maxStringLength != 0 &&
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	479 element.getLength() > maxStringLength)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	480 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	481 return new DicomValue; // Too long, create a NULL value
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	482 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	483 else
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	484 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	485 std::string s(reinterpret_cast<const char*>(data), element.getLength());
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	486 return new DicomValue(s, false);
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	487 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	488 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	489 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	490 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	491
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	492
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 /**
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	500 * Deal with binary data (including PixelData).
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	502
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	503 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	504 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	505 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	506 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	507 case EVR_ox: // OB or OW depending on context
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	508 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	509 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	510 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	511 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	512 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	513 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	514 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	515 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	516 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	517 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	518 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	519 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	520 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	521 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	522 case EVR_UI: // unique identifier
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	523 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	524 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	525 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	526 if (!(flags & DicomToJsonFlags_ConvertBinaryToNull))
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	527 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	528 Uint8* data = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	529 if (element.getUint8Array(data) == EC_Normal)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	530 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	531 return new DicomValue(reinterpret_cast<const char*>(data), element.getLength(), true);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	532 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	533 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	535 return new DicomValue;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	536 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	537
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	538 /**
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	539 * Numeric types
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 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 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	543 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	544 Sint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	545 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	546 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	547 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	548 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	549 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	550
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	551 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	552 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	553 Sint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	554 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	555 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	556 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	557 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	558 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	559
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	560 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	561 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	562 Uint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	563 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	564 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	565 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	566 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	567 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	568
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	569 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	570 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	571 Uint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	572 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	573 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	574 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	575 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	576 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	577
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	578 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	579 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	580 Float32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	581 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	582 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	583 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	584 return new DicomValue;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	585 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	586
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	587 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	588 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	589 Float64 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	590 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	591 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	592 else
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	593 return new DicomValue;
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	594 }
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	595
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	596
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	597 /**
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	598 * Attribute tag.
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	599 **/
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	600
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	601 case EVR_AT:
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	602 {
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	603 DcmTagKey tag;
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	604 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good())
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	605 {
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	606 DicomTag t(tag.getGroup(), tag.getElement());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	607 return new DicomValue(t.Format(), false);
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	608 }
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	609 else
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	610 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	611 return new DicomValue;
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	612 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	613 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	617 * 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	618 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	619 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	621 case EVR_SQ: // sequence of items
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	622 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	625 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	626 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	627 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	629 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	630 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	631 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	632 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	633 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	634 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	635 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	636 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	637 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	638 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	639 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	640 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	641 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	642 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	643 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	646 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	647 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	648 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	650 default:
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	651 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 catch (boost::bad_lexical_cast)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	656 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	658 catch (std::bad_cast)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	659 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	660 return new DicomValue;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	661 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	665 static Json::Value& PrepareNode(Json::Value& parent,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	666 DcmElement& element,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	667 DicomToJsonFormat format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 {
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	669 assert(parent.type() == Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	671 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	672 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	673
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	674 if (format == DicomToJsonFormat_Short)
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	675 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	676 parent[formattedTag] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	677 return parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	678 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	679
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	680 // This code gives access to the name of the private tags
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	681 std::string tagName = FromDcmtkBridge::GetTagName(element);
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	682
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	683 switch (format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 {
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	685 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	686 parent[tagName] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	687 return parent[tagName];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	688
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	689 case DicomToJsonFormat_Full:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	690 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	691 parent[formattedTag] = Json::objectValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	692 Json::Value& node = parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	693
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	694 if (element.isLeaf())
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	695 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	696 node["Name"] = tagName;
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	697
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	698 if (element.getTag().getPrivateCreator() != NULL)
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	699 {
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	700 node["PrivateCreator"] = element.getTag().getPrivateCreator();
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	701 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	702
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	703 return node;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	704 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	705 else
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	706 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	707 node["Name"] = tagName;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	708 node["Type"] = "Sequence";
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	709 node["Value"] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	710 return node["Value"];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	711 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	712 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	713
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	714 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	715 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	716 }
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
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	719
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	720 static void LeafValueToJson(Json::Value& target,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	721 const DicomValue& value,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	722 DicomToJsonFormat format,
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	723 DicomToJsonFlags flags,
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	724 unsigned int maxStringLength)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	725 {
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	726 Json::Value* targetValue = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	727 Json::Value* targetType = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	728
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	729 switch (format)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	730 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	731 case DicomToJsonFormat_Short:
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	732 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	733 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	734 assert(target.type() == Json::nullValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	735 targetValue = &target;
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	736 break;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	737 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	738
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	739 case DicomToJsonFormat_Full:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	741 assert(target.type() == Json::objectValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	742 target["Value"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	743 target["Type"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	744 targetType = &target["Type"];
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	745 targetValue = &target["Value"];
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	746 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 }
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	748
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	749 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	750 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	751 }
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	752
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	753 assert(targetValue != NULL);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	754 assert(targetValue->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	755 assert(targetType == NULL \|\| targetType->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	756
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	757 if (value.IsNull())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	758 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	759 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	760 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	761 *targetType = "Null";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	762 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	763 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	764 else if (value.IsBinary())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	765 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	766 if (flags & DicomToJsonFlags_ConvertBinaryToAscii)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	767 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	768 *targetValue = Toolbox::ConvertToAscii(value.GetContent());
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	769 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	770 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	771 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	772 std::string s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	773 value.FormatDataUriScheme(s);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	774 *targetValue = s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	775 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	776
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	777 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	778 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	779 *targetType = "Binary";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	780 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	781 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	782 else if (maxStringLength == 0 \|\|
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	783 value.GetContent().size() <= maxStringLength)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	784 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	785 *targetValue = value.GetContent();
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	786
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	787 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	788 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	789 *targetType = "String";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	790 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	791 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	792 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	793 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	794 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	795 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	796 *targetType = "TooLong";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	797 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	798 }
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	799 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	800
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	801
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	802 void FromDcmtkBridge::ElementToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	803 DcmElement& element,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	804 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	805 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	806 unsigned int maxStringLength,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	807 Encoding encoding)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	808 {
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	809 if (parent.type() == Json::nullValue)
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	810 {
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	811 parent = Json::objectValue;
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	812 }
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	813
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	814 assert(parent.type() == Json::objectValue);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	815 Json::Value& target = PrepareNode(parent, element, format);
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	816
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	817 if (element.isLeaf())
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	818 {
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	819 // The "0" below lets "LeafValueToJson()" take care of "TooLong" values
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	820 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, flags, 0, encoding));
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	821 LeafValueToJson(target, *v, format, flags, maxStringLength);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	825 assert(target.type() == Json::nullValue);
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	826 target = Json::arrayValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	830 // etc. are not." The following dynamic_cast is thus OK.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 DcmItem* child = sequence.getItem(i);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	836 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	837 DatasetToJson(v, *child, format, flags, maxStringLength, encoding);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	838 }
0 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 }
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
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	843 void FromDcmtkBridge::DatasetToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	844 DcmItem& item,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	845 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	846 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	847 unsigned int maxStringLength,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	848 Encoding encoding)
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	849 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	850 assert(parent.type() == Json::objectValue);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	851
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	852 for (unsigned long i = 0; i < item.card(); i++)
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	853 {
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	854 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	855 if (element == NULL)
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	856 {
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	857 throw OrthancException(ErrorCode_InternalError);
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	858 }
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	859
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	860 DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	861
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	862 /element->getTag().isPrivate()/
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	863 if (tag.IsPrivate() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	864 !(flags & DicomToJsonFlags_IncludePrivateTags))
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	865 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	866 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	867 }
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	868
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	869 if (!(flags & DicomToJsonFlags_IncludeUnknownTags))
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	870 {
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	871 DictionaryLocker locker;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	872 if (locker->findEntry(element->getTag(), NULL) == NULL)
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	873 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	874 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	875 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	876 }
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	877
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	878 DcmEVR evr = element->getTag().getEVR();
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	879 if (evr == EVR_OB \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	880 evr == EVR_OF \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	881 evr == EVR_OW \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	882 evr == EVR_UN \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	883 evr == EVR_ox)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	884 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	885 // This is a binary tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	886 if ((tag == DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludePixelData)) \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	887 (tag != DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludeBinary)))
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	888 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	889 continue;
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	890 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	891 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	892
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	893 FromDcmtkBridge::ElementToJson(parent, *element, format, flags, maxStringLength, encoding);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	894 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	895 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	896
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	897
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	898 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	899 DcmDataset& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	900 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	901 DicomToJsonFlags flags,
2131 bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	902 unsigned int maxStringLength,
bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	903 Encoding defaultEncoding)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 {
2131 bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	905 Encoding encoding = DetectEncoding(dataset, defaultEncoding);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	906
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	907 target = Json::objectValue;
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	908 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	912 void FromDcmtkBridge::ExtractHeaderAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	913 DcmMetaInfo& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	914 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	915 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	916 unsigned int maxStringLength)
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	917 {
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	918 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	919 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	920 }
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	921
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	922
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	923
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	924 static std::string GetTagNameInternal(DcmTag& tag)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	926 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	927 // Some patches for important tags because of different DICOM
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	928 // dictionaries between DCMTK versions
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	929 DicomTag tmp(tag.getGroup(), tag.getElement());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	930 std::string n = tmp.GetMainTagsName();
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	931 if (n.size() != 0)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	932 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	933 return n;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	934 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	935 // End of patches
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	936 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	937
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	938 #if 0
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	939 // This version explicitly calls the dictionary
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	943 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	951 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	952 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	953 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	954 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	955 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	956 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	957 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	958 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	959 return std::string(name);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	960 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	961 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	965 std::string FromDcmtkBridge::GetTagName(const DicomTag& t,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	966 const std::string& privateCreator)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	967 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	968 DcmTag tag(t.GetGroup(), t.GetElement());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	969
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	970 if (!privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	971 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	972 tag.setPrivateCreator(privateCreator.c_str());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	973 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	974
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	975 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	976 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	977
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	978
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	979 std::string FromDcmtkBridge::GetTagName(const DcmElement& element)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	980 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	981 // Copy the tag to ensure const-correctness of DcmElement. Note
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	982 // that the private creator information is also copied.
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	983 DcmTag tag(element.getTag());
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	984
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	985 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	986 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	987
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	988
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	989
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	990 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	992 if (strlen(name) == 9 &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	993 isxdigit(name[0]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	994 isxdigit(name[1]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	995 isxdigit(name[2]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	996 isxdigit(name[3]) &&
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	997 (name[4] == '-' \|\| name[4] == ',') &&
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	998 isxdigit(name[5]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	999 isxdigit(name[6]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1000 isxdigit(name[7]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1001 isxdigit(name[8]))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1002 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1003 uint16_t group = GetTagValue(name);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1004 uint16_t element = GetTagValue(name + 5);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1005 return DicomTag(group, element);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1006 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1007
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1008 if (strlen(name) == 8 &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1009 isxdigit(name[0]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1010 isxdigit(name[1]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1011 isxdigit(name[2]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1012 isxdigit(name[3]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1013 isxdigit(name[4]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1014 isxdigit(name[5]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1015 isxdigit(name[6]) &&
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1016 isxdigit(name[7]))
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1017 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1018 uint16_t group = GetTagValue(name);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1019 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	1020 return DicomTag(group, element);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1021 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1022
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1023 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 dcmDataDict.unlock();
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	1030 throw OrthancException(ErrorCode_UnknownDicomTag);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1039 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1040 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1041 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1042 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1043 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1044 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1045 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1046 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	1047 throw OrthancException(ErrorCode_UnknownDicomTag);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1048 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1049 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052
1655 e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1053 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	1054 {
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1055 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	1056 return tmp.isUnknownVR();
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1057 }
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1058
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1059
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 void FromDcmtkBridge::ToJson(Json::Value& result,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1061 const DicomMap& values,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1062 bool simplify)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1064 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1066 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071 for (DicomMap::Map::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	1072 it = values.map_.begin(); it != values.map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1074 // TODO Inject PrivateCreator if some is available in the DicomMap?
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1075 const std::string tagName = GetTagName(it->first, "");
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1076
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1077 if (simplify)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1078 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1079 if (it->second->IsNull())
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1080 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1081 result[tagName] = Json::nullValue;
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1082 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1083 else
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1084 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1085 // TODO IsBinary
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1086 result[tagName] = it->second->GetContent();
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1087 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1088 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1089 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1090 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1091 Json::Value value = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1092
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1093 value["Name"] = tagName;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1094
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1095 if (it->second->IsNull())
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1096 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1097 value["Type"] = "Null";
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1098 value["Value"] = Json::nullValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1099 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1100 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1101 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1102 // TODO IsBinary
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1103 value["Type"] = "String";
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1104 value["Value"] = it->second->GetContent();
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1105 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1106
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1107 result[it->first.Format()] = value;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1108 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1111
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1112
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1113 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level)
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1114 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1115 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1116
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1117 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1118 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1119 case ResourceType_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1120 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1121 // 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	1122 // as a random PatientID.
2172 84d1d392a9ab GenerateUuid() not available in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2152 diff changeset	1123 return SystemToolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1124
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1125 case ResourceType_Instance:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1126 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1127
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1128 case ResourceType_Series:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1129 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1130
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1131 case ResourceType_Study:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1132 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1133
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1134 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1135 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1136 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1137 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1138
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1139 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1140 DcmDataset& dataSet)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1141 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1142 // 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	1143 // 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	1144 // syntax, with explicit length.
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1145
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1146 // 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	1147
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	1148
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	1149 /**
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	1150 * 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	1151 * "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	1152 * 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	1153 * (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	1154 **/
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1155 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	1156 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	1157 {
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	1158 // 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	1159 // 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	1160 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	1161 }
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	1162
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1163 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1164
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	1165 // Create the meta-header information
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1166 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	1167 ff.validateMetaInfo(xfer);
1316 1c8dfedefefe Fix anonymization generating non-portable DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1307 diff changeset	1168 ff.removeInvalidGroups();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1169
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	1170 // 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	1171 {
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1172 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	1173 buffer.resize(estimatedSize);
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1174 }
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1175
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1176 DcmOutputBufferStream ob(&buffer[0], buffer.size());
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1177
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	1178 // 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	1179 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	1180 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	1181 /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	1182 /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	1183 ff.transferEnd();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1184
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1185 if (c.good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1186 {
1876 9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1187 // 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	1188 // 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	1189 ob.flush();
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1190
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1191 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	1192 if (effectiveSize < buffer.size())
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1193 {
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1194 buffer.resize(effectiveSize);
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1195 }
9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1196
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1197 return true;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1198 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1199 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1200 {
1876 9b458e4484a1 truncation of serialized DICOM buffers if calcElementLength was overestimated Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	1201 // Error
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1202 buffer.clear();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1203 return false;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1204 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1205 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1206
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1207
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1208 ValueRepresentation FromDcmtkBridge::LookupValueRepresentation(const DicomTag& tag)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1209 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1210 DcmTag t(tag.GetGroup(), tag.GetElement());
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1211 return Convert(t.getEVR());
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1212 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1213
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1214 ValueRepresentation FromDcmtkBridge::Convert(const DcmEVR vr)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1215 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1216 switch (vr)
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1217 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1218 case EVR_AE:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1219 return ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1220
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1221 case EVR_AS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1222 return ValueRepresentation_AgeString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1223
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1224 case EVR_AT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1225 return ValueRepresentation_AttributeTag;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1226
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1227 case EVR_CS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1228 return ValueRepresentation_CodeString;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1229
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1230 case EVR_DA:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1231 return ValueRepresentation_Date;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1232
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1233 case EVR_DS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1234 return ValueRepresentation_DecimalString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1235
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1236 case EVR_DT:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1237 return ValueRepresentation_DateTime;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1238
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1239 case EVR_FL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1240 return ValueRepresentation_FloatingPointSingle;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1241
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1242 case EVR_FD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1243 return ValueRepresentation_FloatingPointDouble;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1244
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1245 case EVR_IS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1246 return ValueRepresentation_IntegerString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1247
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1248 case EVR_LO:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1249 return ValueRepresentation_LongString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1250
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1251 case EVR_LT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1252 return ValueRepresentation_LongText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1253
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1254 case EVR_OB:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1255 return ValueRepresentation_OtherByte;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1256
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1257 // 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	1258 /*case EVR_OD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1259 return ValueRepresentation_OtherDouble;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1260
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1261 case EVR_OF:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1262 return ValueRepresentation_OtherFloat;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1263
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1264 // 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	1265 /*case EVR_OL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1266 return ValueRepresentation_OtherLong;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1267
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1268 case EVR_OW:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1269 return ValueRepresentation_OtherWord;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1270
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1271 case EVR_PN:
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1272 return ValueRepresentation_PersonName;
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1273
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1274 case EVR_SH:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1275 return ValueRepresentation_ShortString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1276
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1277 case EVR_SL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1278 return ValueRepresentation_SignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1279
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1280 case EVR_SQ:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1281 return ValueRepresentation_Sequence;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1282
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1283 case EVR_SS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1284 return ValueRepresentation_SignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1285
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1286 case EVR_ST:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1287 return ValueRepresentation_ShortText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1288
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1289 case EVR_TM:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1290 return ValueRepresentation_Time;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1291
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1292 // 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	1293 /*case EVR_UC:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1294 return ValueRepresentation_UnlimitedCharacters;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1295
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1296 case EVR_UI:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1297 return ValueRepresentation_UniqueIdentifier;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1298
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1299 case EVR_UL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1300 return ValueRepresentation_UnsignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1301
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1302 case EVR_UN:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1303 return ValueRepresentation_Unknown;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1304
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1305 // 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	1306 /*case EVR_UR:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1307 return ValueRepresentation_UniversalResource;*/
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1308
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1309 case EVR_US:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1310 return ValueRepresentation_UnsignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1311
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1312 case EVR_UT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1313 return ValueRepresentation_UnlimitedText;
1792 b769623c806c safety check Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	1314
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1315 default:
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1316 return ValueRepresentation_NotSupported;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1317 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1318 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1319
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1320
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1321 static bool IsBinaryTag(const DcmTag& key)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1322 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1323 return (key.isUnknownVR() \|\|
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1324 key.getEVR() == EVR_OB \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1325 key.getEVR() == EVR_OF \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1326 key.getEVR() == EVR_OW \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1327 key.getEVR() == EVR_UN \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1328 key.getEVR() == EVR_ox);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1329 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1330
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1331
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1332 DcmElement* FromDcmtkBridge::CreateElementForTag(const DicomTag& tag)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1333 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1334 DcmTag key(tag.GetGroup(), tag.GetElement());
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1335
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1336 if (tag.IsPrivate() \|\|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1337 IsBinaryTag(key))
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1338 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1339 return new DcmOtherByteOtherWord(key);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1340 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1341
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1342 switch (key.getEVR())
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 // http://support.dcmtk.org/docs/dcvr_8h-source.html
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1345
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1346 /**
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1347 * Binary types, handled above
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1348 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1349
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1350 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1351 case EVR_OF: // other float
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1352 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1353 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1354 case EVR_ox: // OB or OW depending on context
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1355 throw OrthancException(ErrorCode_InternalError);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1356
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1357
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1358 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1359 * String types.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1360 * http://support.dcmtk.org/docs/classDcmByteString.html
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1361 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1362
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1363 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1364 return new DcmAgeString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1365
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1366 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1367 return new DcmApplicationEntity(key);
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 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1370 return new DcmCodeString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1371
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1372 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1373 return new DcmDate(key);
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 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1376 return new DcmDateTime(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1377
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1378 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1379 return new DcmDecimalString(key);
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 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1382 return new DcmIntegerString(key);
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 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1385 return new DcmTime(key);
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 case EVR_UI: // unique identifier
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1388 return new DcmUniqueIdentifier(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1389
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1390 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1391 return new DcmShortText(key);
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 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1394 return new DcmLongString(key);
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 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1397 return new DcmLongText(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1398
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1399 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1400 return new DcmUnlimitedText(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1401
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1402 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1403 return new DcmShortString(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1404
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1405 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1406 return new DcmPersonName(key);
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
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 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1411 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1412
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1413 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1414 return new DcmSignedLong(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1415
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1416 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1417 return new DcmSignedShort(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1418
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1419 case EVR_UL: // unsigned long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1420 return new DcmUnsignedLong(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1421
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1422 case EVR_US: // unsigned short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1423 return new DcmUnsignedShort(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1424
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1425 case EVR_FL: // float single-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1426 return new DcmFloatingPointSingle(key);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1427
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1428 case EVR_FD: // float double-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1429 return new DcmFloatingPointDouble(key);
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 * Sequence types, should never occur at this point.
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_SQ: // sequence of items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1437 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1438
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1439
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1440 /**
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1441 * TODO
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1442 **/
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1443
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1444 case EVR_AT: // attribute tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1445 throw OrthancException(ErrorCode_NotImplemented);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1446
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1447
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1448 /**
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1449 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1450 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1451
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1452 case EVR_xs: // SS or US depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1453 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	1454 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1455 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1456 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1457 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1458 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1459 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1460 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1461 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1462 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1463 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1464 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	1465 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1466 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1467 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	1468 default:
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 throw OrthancException(ErrorCode_InternalError);
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
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 void FromDcmtkBridge::FillElementWithString(DcmElement& element,
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1478 const DicomTag& tag,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1479 const std::string& utf8Value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1480 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1481 Encoding dicomEncoding)
1689 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 std::string binary;
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1484 const std::string* decoded = &utf8Value;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1485
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1486 if (decodeDataUriScheme &&
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1487 boost::starts_with(utf8Value, "data:application/octet-stream;base64,"))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1488 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1489 std::string mime;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1490 if (!Toolbox::DecodeDataUriScheme(mime, binary, utf8Value))
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1491 {
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1492 throw OrthancException(ErrorCode_BadFileFormat);
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1493 }
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1494
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1495 decoded = &binary;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1496 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1497 else if (dicomEncoding != Encoding_Utf8)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1498 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1499 binary = Toolbox::ConvertFromUtf8(utf8Value, dicomEncoding);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1500 decoded = &binary;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1501 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1502
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1503 DcmTag key(tag.GetGroup(), tag.GetElement());
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1504
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1505 if (tag.IsPrivate() \|\|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1506 IsBinaryTag(key))
1689 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 if (element.putUint8Array((const Uint8*) decoded->c_str(), decoded->size()).good())
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1509 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1510 return;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1511 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1512 else
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 throw OrthancException(ErrorCode_InternalError);
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 }
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 bool ok = false;
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 try
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1521 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1522 switch (key.getEVR())
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1523 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1524 // http://support.dcmtk.org/docs/dcvr_8h-source.html
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 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1527 * TODO.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1528 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1529
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1530 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1531 case EVR_OF: // other float
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1532 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1533 case EVR_AT: // attribute tag
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1534 throw OrthancException(ErrorCode_NotImplemented);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1535
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1536 case EVR_UN: // unknown value representation
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1537 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1538
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1539
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1540 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1541 * String types.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1542 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1543
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1544 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1545 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1546 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1547 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1548 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1549 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1550 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1551 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1552 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1553 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1554 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1555 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1556 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1557 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1558 case EVR_UI: // unique identifier
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1559 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1560 ok = element.putString(decoded->c_str()).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1561 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1562 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1563
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 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1567 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1568
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1569 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1570 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1571 ok = element.putSint32(boost::lexical_cast<Sint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1572 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1573 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1574
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1575 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1576 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1577 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1578 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1579 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1580
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1581 case EVR_UL: // unsigned long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1582 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1583 ok = element.putUint32(boost::lexical_cast<Uint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1584 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1585 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1586
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1587 case EVR_US: // unsigned short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1588 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1589 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1590 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1591 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1592
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1593 case EVR_FL: // float single-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1594 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1595 ok = element.putFloat32(boost::lexical_cast<float>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1596 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1597 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1598
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1599 case EVR_FD: // float double-precision
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1600 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1601 ok = element.putFloat64(boost::lexical_cast<double>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1602 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1603 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1604
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1605
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1606 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1607 * Sequence types, should never occur at this point.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1608 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1609
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1610 case EVR_SQ: // sequence of items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1611 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1612 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1613 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1614 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1615
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1616
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1617 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1618 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1619 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1620
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1621 case EVR_ox: // OB or OW depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1622 case EVR_xs: // SS or US depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1623 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	1624 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1625 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1626 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1627 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1628 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1629 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1630 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1631 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1632 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1633 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1634 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	1635 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1636 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1637 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	1638 default:
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1639 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1640 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1641 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1642 catch (boost::bad_lexical_cast&)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1643 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1644 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1645 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1646
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1647 if (!ok)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1648 {
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1649 LOG(ERROR) << "While creating a DICOM instance, tag (" << tag.Format()
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1650 << ") has out-of-range value: \"" << *decoded << "\"";
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1651 throw OrthancException(ErrorCode_BadFileFormat);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1652 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1653 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1654
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1655
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1656 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag,
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1657 const Json::Value& value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1658 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1659 Encoding dicomEncoding)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1660 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1661 std::auto_ptr<DcmElement> element;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1662
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1663 switch (value.type())
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1664 {
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1665 case Json::stringValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1666 element.reset(CreateElementForTag(tag));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1667 FillElementWithString(*element, tag, value.asString(), decodeDataUriScheme, dicomEncoding);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1668 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1669
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1670 case Json::nullValue:
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1671 element.reset(CreateElementForTag(tag));
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1672 FillElementWithString(*element, tag, "", decodeDataUriScheme, dicomEncoding);
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1673 break;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1674
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1675 case Json::arrayValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1676 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1677 DcmTag key(tag.GetGroup(), tag.GetElement());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1678 if (key.getEVR() != EVR_SQ)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1679 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1680 throw OrthancException(ErrorCode_BadParameterType);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1681 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1682
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1683 DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1684 element.reset(sequence);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1685
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1686 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1687 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1688 std::auto_ptr<DcmItem> item(new DcmItem);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1689
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1690 Json::Value::Members members = value[i].getMemberNames();
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1691 for (Json::Value::ArrayIndex j = 0; j < members.size(); j++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1692 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1693 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	1694 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1695
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1696 sequence->append(item.release());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1697 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1698
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1699 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1700 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1701
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1702 default:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1703 throw OrthancException(ErrorCode_BadParameterType);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1704 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1705
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1706 return element.release();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1707 }
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1708
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1709
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	1710 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	1711 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1712 DcmElement *element = NULL;
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	1713 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	1714 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1715 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	1716 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1717
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1718 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	1719 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	1720 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	1721 (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	1722 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1723 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	1724 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1725 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	1726 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1727 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	1728 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1729 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1730
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1731
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1732 Encoding FromDcmtkBridge::ExtractEncoding(const Json::Value& json,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1733 Encoding defaultEncoding)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1734 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1735 if (json.type() != Json::objectValue)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1736 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1737 throw OrthancException(ErrorCode_BadParameterType);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1738 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1739
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1740 Encoding encoding = defaultEncoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1741
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1742 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1743
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1744 // Look for SpecificCharacterSet (0008,0005) in the JSON file
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1745 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1746 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1747 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1748 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1749 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1750 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1751 if (value.type() != Json::stringValue \|\|
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1752 (value.asString().length() != 0 &&
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1753 !GetDicomEncoding(encoding, value.asCString())))
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1754 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1755 LOG(ERROR) << "Unknown encoding while creating DICOM from JSON: " << value;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1756 throw OrthancException(ErrorCode_BadRequest);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1757 }
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1758
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1759 if (value.asString().length() == 0)
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1760 {
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1761 return defaultEncoding;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1762 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1763 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1764 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1765
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1766 return encoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1767 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1768
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1769
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1770 static void SetString(DcmDataset& target,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1771 const DcmTag& tag,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1772 const std::string& value)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1773 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1774 if (!target.putAndInsertString(tag, value.c_str()).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1775 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1776 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1777 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1778 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1779
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1780
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1781 DcmDataset* FromDcmtkBridge::FromJson(const Json::Value& json, // Encoded using UTF-8
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1782 bool generateIdentifiers,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1783 bool decodeDataUriScheme,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1784 Encoding defaultEncoding)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1785 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1786 std::auto_ptr<DcmDataset> result(new DcmDataset);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1787 Encoding encoding = ExtractEncoding(json, defaultEncoding);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1788
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1789 SetString(*result, DCM_SpecificCharacterSet, GetDicomSpecificCharacterSet(encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1790
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1791 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1792
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1793 bool hasPatientId = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1794 bool hasStudyInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1795 bool hasSeriesInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1796 bool hasSopInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1797
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1798 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1799 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1800 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1801 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1802
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1803 if (tag == DICOM_TAG_PATIENT_ID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1804 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1805 hasPatientId = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1806 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1807 else if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1808 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1809 hasStudyInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1810 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1811 else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1812 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1813 hasSeriesInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1814 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1815 else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1816 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1817 hasSopInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1818 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1819
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1820 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1821 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1822 std::auto_ptr<DcmElement> element(FromDcmtkBridge::FromJson(tag, value, decodeDataUriScheme, encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1823 const DcmTagKey& tag = element->getTag();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1824
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1825 result->findAndDeleteElement(tag);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1826
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1827 DcmElement* tmp = element.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1828 if (!result->insert(tmp, false, false).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1829 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1830 delete tmp;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1831 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1832 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1833 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1834 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1835
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1836 if (!hasPatientId &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1837 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1838 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1839 SetString(*result, DCM_PatientID, GenerateUniqueIdentifier(ResourceType_Patient));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1840 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1841
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1842 if (!hasStudyInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1843 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1844 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1845 SetString(*result, DCM_StudyInstanceUID, GenerateUniqueIdentifier(ResourceType_Study));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1846 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1847
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1848 if (!hasSeriesInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1849 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1850 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1851 SetString(*result, DCM_SeriesInstanceUID, GenerateUniqueIdentifier(ResourceType_Series));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1852 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1853
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1854 if (!hasSopInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1855 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1856 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1857 SetString(*result, DCM_SOPInstanceUID, GenerateUniqueIdentifier(ResourceType_Instance));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1858 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1859
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1860 return result.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1861 }
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1862
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1863
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1864 DcmFileFormat* FromDcmtkBridge::LoadFromMemoryBuffer(const void* buffer,
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1865 size_t size)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1866 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1867 DcmInputBufferStream is;
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1868 if (size > 0)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1869 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1870 is.setBuffer(buffer, size);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1871 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1872 is.setEos();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1873
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1874 std::auto_ptr<DcmFileFormat> result(new DcmFileFormat);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1875
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1876 result->transferInit();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1877 if (!result->read(is).good())
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1878 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1879 throw OrthancException(ErrorCode_BadFileFormat);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1880 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1881
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1882 result->loadAllDataIntoMemory();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1883 result->transferEnd();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1884
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1885 return result.release();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1886 }
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1887
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1888
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1889 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	1890 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	1891 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1892 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	1893 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1894 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	1895 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1896
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1897 target.Clear();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1898
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1899 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	1900
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1901 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	1902 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1903 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	1904
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1905 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	1906 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1907 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	1908 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1909
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1910 target.SetValue(ParseTag(members[i]), value.asString(), false);
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1911 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1912 }
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1913
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1914
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1915 void FromDcmtkBridge::ChangeStringEncoding(DcmItem& dataset,
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1916 Encoding source,
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1917 Encoding target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1918 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1919 // Recursive exploration of a dataset to change the encoding of
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1920 // each string-like element
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1921
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1922 if (source == target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1923 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1924 return;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1925 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1926
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1927 for (unsigned long i = 0; i < dataset.card(); i++)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1928 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1929 DcmElement* element = dataset.getElement(i);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1930 if (element)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1931 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1932 if (element->isLeaf())
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1933 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1934 char *c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1935 if (element->isaString() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1936 element->getString(c).good() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1937 c != NULL)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1938 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1939 std::string a = Toolbox::ConvertToUtf8(c, source);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1940 std::string b = Toolbox::ConvertFromUtf8(a, target);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1941 element->putString(b.c_str());
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1942 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1943 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1944 else
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1945 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1946 // "All subclasses of DcmElement except for DcmSequenceOfItems
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1947 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1948 // etc. are not." The following dynamic_cast is thus OK.
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1949 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1950
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1951 for (unsigned long j = 0; j < sequence.card(); j++)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1952 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1953 ChangeStringEncoding(*sequence.getItem(j), source, target);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1954 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1955 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1956 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1957 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1958 }
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1959
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1960
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1961 bool FromDcmtkBridge::LookupTransferSyntax(std::string& result,
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1962 DcmFileFormat& dicom)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1963 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1964 const char* value = NULL;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1965
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1966 if (dicom.getMetaInfo() != NULL &&
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1967 dicom.getMetaInfo()->findAndGetString(DCM_TransferSyntaxUID, value).good() &&
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1968 value != NULL)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1969 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1970 result.assign(value);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1971 return true;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1972 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1973 else
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1974 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1975 return false;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1976 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	1977 }
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1978
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1979
2232 3dd44baebc36 macro ORTHANC_ENABLE_LUA for orthanc-wsi Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	1980 #if ORTHANC_ENABLE_LUA == 1
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1981 void FromDcmtkBridge::ExecuteToDicom(DicomMap& target,
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1982 LuaFunctionCall& call)
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1983 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1984 Json::Value output;
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1985 call.ExecuteToJson(output, true /* keep strings */);
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1986
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1987 target.Clear();
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1988
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1989 if (output.type() == Json::arrayValue &&
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1990 output.size() == 0)
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1991 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1992 // This case happens for empty tables
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1993 return;
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1994 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1995
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1996 if (output.type() != Json::objectValue)
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1997 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1998 LOG(ERROR) << "Lua: IncomingFindRequestFilter must return a table";
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	1999 throw OrthancException(ErrorCode_LuaBadOutput);
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2000 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2001
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2002 Json::Value::Members members = output.getMemberNames();
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2003
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2004 for (size_t i = 0; i < members.size(); i++)
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2005 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2006 if (output[members[i]].type() != Json::stringValue)
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2007 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2008 LOG(ERROR) << "Lua: IncomingFindRequestFilter must return a table mapping names of DICOM tags to strings";
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2009 throw OrthancException(ErrorCode_LuaBadOutput);
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2010 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2011
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2012 DicomTag tag(ParseTag(members[i]));
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2013 target.SetValue(tag, output[members[i]].asString(), false);
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2014 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2216 diff changeset	2015 }
2232 3dd44baebc36 macro ORTHANC_ENABLE_LUA for orthanc-wsi Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	2016 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2017 }

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 2232:3dd44baebc36