orthanc: OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp annotate

annotate OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4136:2724977419fb

Fix DICOM SCP filters if some query tag has more than 256 characters

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 06 Aug 2020 15:55:03 +0200
parents	bf7b9edf6b81
children	6774605d4341

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
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3594 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	10 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	11 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * 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	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	15 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4105 diff changeset	19 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
448 9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	22
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	23 #include "../PrecompiledHeaders.h"
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 799 diff changeset	24
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	25 #ifndef NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	26 #define NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	27 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	29 #if !defined(ORTHANC_SANDBOXED)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	30 # error The macro ORTHANC_SANDBOXED must be defined
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	31 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	32
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	33 #if !defined(DCMTK_VERSION_NUMBER)
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	34 # error The macro DCMTK_VERSION_NUMBER must be defined
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	35 #endif
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	36
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include "FromDcmtkBridge.h"
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	38 #include "ToDcmtkBridge.h"
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	39 #include "../Compatibility.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	40 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	41 #include "../Toolbox.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	42 #include "../OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	44 #if ORTHANC_SANDBOXED == 0
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	45 # include "../TemporaryFile.h"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	46 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	47
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	48 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	49 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	50
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 #include <boost/lexical_cast.hpp>
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	52 #include <boost/filesystem.hpp>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	53 #include <boost/algorithm/string/predicate.hpp>
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	54 #include <boost/algorithm/string/join.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	56 #include <dcmtk/dcmdata/dcdeftag.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 #include <dcmtk/dcmdata/dcfilefo.h>
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	60 #include <dcmtk/dcmdata/dcistrmb.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	61 #include <dcmtk/dcmdata/dcostrmb.h>
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	62 #include <dcmtk/dcmdata/dcpixel.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	63 #include <dcmtk/dcmdata/dcuid.h>
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	64 #include <dcmtk/dcmdata/dcxfer.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	65
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	66 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcvras.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	68 #include <dcmtk/dcmdata/dcvrat.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	69 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	70 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	71 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	72 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	75 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	76 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	77 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	78 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	79 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	82 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	83 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	84 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	87 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
3209 f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	89 #if DCMTK_VERSION_NUMBER >= 361
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	90 # include <dcmtk/dcmdata/dcvruc.h>
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	91 # include <dcmtk/dcmdata/dcvrur.h>
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	92 #endif
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	93
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	94 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	95 # include <OrthancFrameworkResources.h>
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	96 #endif
682 efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 677 diff changeset	97
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	98 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	99 # include <dcmtk/dcmjpeg/djdecode.h>
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	100 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	101 # include <dcmtk/dcmjpeg/djencode.h>
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	102 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	103 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	104
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	105 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	106 # include <dcmtk/dcmjpls/djdecode.h>
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	107 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	108 # include <dcmtk/dcmjpls/djencode.h>
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	109 # endif
1930 1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	110 #endif
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	111
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	112
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	113 #include <dcmtk/dcmdata/dcrledrg.h>
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	114 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	115 # include <dcmtk/dcmdata/dcrleerg.h>
3765 4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	116 # include <dcmtk/dcmimage/diregist.h> // include to support color images
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	117 #endif
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	118
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	119
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	120 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	122 static bool IsBinaryTag(const DcmTag& key)
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	123 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	124 return (key.isUnknownVR() \|\|
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	125 key.getEVR() == EVR_OB \|\|
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	126 key.getEVR() == EVR_OW \|\|
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	127 key.getEVR() == EVR_UN \|\|
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	128 key.getEVR() == EVR_ox);
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	129 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	130
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	131
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	132 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	133 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary,
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	134 FrameworkResources::FileResourceId resource)
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	135 {
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	136 std::string content;
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	137 FrameworkResources::GetFileResource(content, resource);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	138
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	139 #if ORTHANC_SANDBOXED == 0
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	140 TemporaryFile tmp;
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	141 tmp.Write(content);
1656 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(tmp.GetPath().c_str()))
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	144 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	145 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	146 "Cannot read embedded dictionary. Under Windows, make sure that "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	147 "your TEMP directory does not contain special characters.");
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	148 }
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	149 #else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	150 if (!dictionary.loadFromMemory(content))
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	151 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	152 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	153 "Cannot read embedded dictionary. Under Windows, make sure that "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	154 "your TEMP directory does not contain special characters.");
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	155 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	156 #endif
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	157 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	158 #endif
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	159
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	160
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	161 namespace
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	162 {
4030 100fbe970762 DANGEROUS commit: removing HAS_EMBEDDED_RESOURCES Sebastien Jodogne <s.jodogne@gmail.com> parents: 4016 diff changeset	163 class DictionaryLocker : public boost::noncopyable
1657 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 private:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	166 DcmDataDictionary& dictionary_;
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 public:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	169 DictionaryLocker() : dictionary_(dcmDataDict.wrlock())
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	170 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	171 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	172
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	173 ~DictionaryLocker()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	174 {
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	175 #if DCMTK_VERSION_NUMBER >= 364
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	176 dcmDataDict.wrunlock();
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	177 #else
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	178 dcmDataDict.unlock();
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	179 #endif
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	180 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	181
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	182 DcmDataDictionary& operator*()
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 return dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	185 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	186
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	187 DcmDataDictionary* operator->()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	188 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	189 return &dictionary_;
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 };
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	192
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	193
3594 0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	194 #define DCMTK_TO_CTYPE_CONVERTER(converter, cType, dcmtkType, getter) \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	195 \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	196 struct converter \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	197 { \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	198 typedef cType CType; \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	199 \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	200 static bool Apply(CType& result, \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	201 DcmElement& element, \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	202 size_t i) \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	203 { \
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	204 return dynamic_cast<dcmtkType&>(element).getter(result, i).good(); \
3594 0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	205 } \
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	206 };
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	207
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	208 DCMTK_TO_CTYPE_CONVERTER(DcmtkToSint32Converter, Sint32, DcmSignedLong, getSint32)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	209 DCMTK_TO_CTYPE_CONVERTER(DcmtkToSint16Converter, Sint16, DcmSignedShort, getSint16)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	210 DCMTK_TO_CTYPE_CONVERTER(DcmtkToUint32Converter, Uint32, DcmUnsignedLong, getUint32)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	211 DCMTK_TO_CTYPE_CONVERTER(DcmtkToUint16Converter, Uint16, DcmUnsignedShort, getUint16)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	212 DCMTK_TO_CTYPE_CONVERTER(DcmtkToFloat32Converter, Float32, DcmFloatingPointSingle, getFloat32)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	213 DCMTK_TO_CTYPE_CONVERTER(DcmtkToFloat64Converter, Float64, DcmFloatingPointDouble, getFloat64)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	214
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	215
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	216 template <typename F>
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	217 static DicomValue* ApplyDcmtkToCTypeConverter(DcmElement& element)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	218 {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	219 F f;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	220 typename F::CType value;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	221
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	222 if (element.getLength() > sizeof(typename F::CType)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	223 && (element.getLength() % sizeof(typename F::CType)) == 0)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	224 {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	225 size_t count = element.getLength() / sizeof(typename F::CType);
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	226 std::vector<std::string> strings;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	227 for (size_t i = 0; i < count; i++) {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	228 if (f.Apply(value, element, i)) {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	229 strings.push_back(boost::lexical_cast<std::string>(value));
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	230 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	231 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	232 return new DicomValue(boost::algorithm::join(strings, "\\"), false);
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	233 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	234 else if (f.Apply(value, element, 0)) {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	235 return new DicomValue(boost::lexical_cast<std::string>(value), false);
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	236 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	237 else {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	238 return new DicomValue;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	239 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	240 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	241
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	242 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	243
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	244
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	245 void FromDcmtkBridge::InitializeDictionary(bool loadPrivateDictionary)
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	246 {
2296 17e8e8e1ff3d log dcmtk version Sebastien Jodogne <s.jodogne@gmail.com> parents: 2287 diff changeset	247 LOG(INFO) << "Using DCTMK version: " << DCMTK_VERSION_NUMBER;
17e8e8e1ff3d log dcmtk version Sebastien Jodogne <s.jodogne@gmail.com> parents: 2287 diff changeset	248
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	249 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	250 DictionaryLocker locker;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	251
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	252 locker->clear();
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	253
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	254 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
2528 832217e4e872 old warnings turned into info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2522 diff changeset	255 LOG(INFO) << "Loading the embedded dictionaries";
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	256 /**
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	257 * 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	258 * 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	259 * dictionary is not loaded by storescu.
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	260 **/
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	261 //LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICONDE);
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	262
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	263 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICOM);
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	264
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	265 if (loadPrivateDictionary)
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	266 {
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	267 LOG(INFO) << "Loading the embedded dictionary of private tags";
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	268 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_PRIVATE);
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	269 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	270 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	271 {
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	272 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	273 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	274
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	275 #else
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	276 std::vector<std::string> dictionaries;
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	277
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	278 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	279 if (env != NULL)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	280 {
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	281 // This mimics the behavior of DCMTK:
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	282 // https://support.dcmtk.org/docs/file_envvars.html
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	283 #if defined(_WIN32)
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	284 Toolbox::TokenizeString(dictionaries, std::string(env), ';');
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	285 #else
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	286 Toolbox::TokenizeString(dictionaries, std::string(env), ':');
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	287 #endif
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	288 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	289 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	290 {
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	291 boost::filesystem::path base = DCMTK_DICTIONARY_DIR;
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	292 dictionaries.push_back((base / "dicom.dic").string());
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	293 dictionaries.push_back((base / "private.dic").string());
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	294 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	295
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	296 for (size_t i = 0; i < dictionaries.size(); i++)
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	297 {
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	298 LOG(WARNING) << "Loading external DICOM dictionary: \"" << dictionaries[i] << "\"";
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	299
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	300 if (!locker->loadDictionary(dictionaries[i].c_str()))
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	301 {
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	302 throw OrthancException(ErrorCode_InexistentFile);
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	303 }
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	304 }
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	305
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	306 #endif
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	307 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	308
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	309 /* make sure data dictionary is loaded */
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	310 if (!dcmDataDict.isDictionaryLoaded())
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	311 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	312 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	313 "No DICOM dictionary loaded, check environment variable: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	314 std::string(DCM_DICT_ENVIRONMENT_VARIABLE));
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	315 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	316
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	317 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	318 // Test the dictionary with a simple DICOM tag
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	319 DcmTag key(0x0010, 0x1030); // This is PatientWeight
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	320 if (key.getEVR() != EVR_DS)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	321 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	322 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	323 "The DICOM dictionary has not been correctly read");
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	324 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	325 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	326 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	327
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	328
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	329 void FromDcmtkBridge::RegisterDictionaryTag(const DicomTag& tag,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	330 ValueRepresentation vr,
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	331 const std::string& name,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	332 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	333 unsigned int maxMultiplicity,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	334 const std::string& privateCreator)
1657 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 if (minMultiplicity < 1)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	337 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	338 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	339 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	340
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	341 bool arbitrary = false;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	342 if (maxMultiplicity == 0)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	343 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	344 maxMultiplicity = DcmVariableVM;
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	345 arbitrary = true;
1657 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 else if (maxMultiplicity < minMultiplicity)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	348 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	349 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	350 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	351
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	352 DcmEVR evr = ToDcmtkBridge::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	353
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	354 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	355 << name << " (multiplicity: " << minMultiplicity << "-"
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	356 << (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	357
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	358 std::unique_ptr<DcmDictEntry> entry;
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	359 if (privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	360 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	361 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	362 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	363 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	364 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	365 "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	366 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	367 LOG(WARNING) << buf;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	368 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	369
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	370 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	371 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	372 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	373 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	374 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	375 NULL /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	376 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	377 NULL /* private creator */));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	378 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	379 else
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	380 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	381 // "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	382 // (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	383 // (FFFF,eeee)."
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	384 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	385 tag.GetGroup() == 0x0001 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	386 tag.GetGroup() == 0x0003 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	387 tag.GetGroup() == 0x0005 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	388 tag.GetGroup() == 0x0007 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	389 tag.GetGroup() == 0xffff)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	390 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	391 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	392 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	393 tag.GetGroup(), tag.GetElement());
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	394 throw OrthancException(ErrorCode_ParameterOutOfRange, std::string(buf));
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	395 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	396
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	397 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	398 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	399 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	400 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	401 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	402 "private" /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	403 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	404 privateCreator.c_str()));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	405 }
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	406
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	407 entry->setGroupRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	408 entry->setElementRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	409
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	410 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	411 DictionaryLocker locker;
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	412
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	413 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	414 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	415 throw OrthancException(ErrorCode_AlreadyExistingTag,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	416 "Cannot register two tags with the same symbolic name \"" + name + "\"");
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	417 }
2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	418
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	419 locker->addEntry(entry.release());
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	420 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	421 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	422
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	423
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	424 Encoding FromDcmtkBridge::DetectEncoding(bool& hasCodeExtensions,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	425 DcmItem& dataset,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	426 Encoding defaultEncoding)
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	427 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	428 // http://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_C.12.html#sect_C.12.1.1.2
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	429
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	430 OFString tmp;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	431 if (dataset.findAndGetOFStringArray(DCM_SpecificCharacterSet, tmp).good())
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	432 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	433 std::vector<std::string> tokens;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	434 Toolbox::TokenizeString(tokens, std::string(tmp.c_str()), '\\');
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	435
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	436 hasCodeExtensions = (tokens.size() > 1);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	437
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	438 for (size_t i = 0; i < tokens.size(); i++)
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	439 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	440 std::string characterSet = Toolbox::StripSpaces(tokens[i]);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	441
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	442 if (!characterSet.empty())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	443 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	444 Encoding encoding;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	445
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	446 if (GetDicomEncoding(encoding, characterSet.c_str()))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	447 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	448 // The specific character set is supported by the Orthanc core
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	449 return encoding;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	450 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	451 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	452 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	453 LOG(WARNING) << "Value of Specific Character Set (0008,0005) is not supported: " << characterSet
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	454 << ", fallback to ASCII (remove all special characters)";
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	455 return Encoding_Ascii;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	456 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	457 }
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	458 }
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	459 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	460 else
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	461 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	462 hasCodeExtensions = false;
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	463 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	464
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	465 // No specific character set tag: Use the default encoding
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	466 return defaultEncoding;
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	467 }
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	468
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	469
2125 b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	470 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	471 DcmItem& dataset,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	472 unsigned int maxStringLength,
3577 33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	473 Encoding defaultEncoding,
33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	474 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	476 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	477 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	478
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	485 target.SetValueInternal(element->getTag().getGTag(),
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	486 element->getTag().getETag(),
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	487 ConvertLeafElement(*element, DicomToJsonFlags_Default,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	488 maxStringLength, encoding, hasCodeExtensions, ignoreTagLength));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	494 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	495 {
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	496 return DicomTag(tag.getGTag(), tag.getETag());
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	497 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	498
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	499
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	506 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	507 DicomToJsonFlags flags,
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	508 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	509 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	510 bool hasCodeExtensions,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	511 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	515 // This function is only applicable to leaf elements
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	516 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	519 char *c = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	520 if (element.isaString() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	521 element.getString(c).good())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	523 if (c == NULL) // This case corresponds to the empty string
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	525 return new DicomValue("", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 {
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	529 std::string s(c);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	530 std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	531
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	532 if (maxStringLength != 0 &&
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	533 utf8.size() > maxStringLength &&
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	534 ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	535 {
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	536 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	537 }
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	538 else
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	539 {
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	540 return new DicomValue(utf8, false);
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	541 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544
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	545
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	546 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	547 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	548 // 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	549 // 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	550 // "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	551 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	552
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	553 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	554 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	555 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	556 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	557 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	558 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	559
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	560 // 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	561 // 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	562 // 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	563
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	564 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	565 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	566 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	567 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	568 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	569 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	570 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	571 else if (maxStringLength != 0 &&
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	572 element.getLength() > maxStringLength &&
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	573 ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
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	574 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	575 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	576 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	577 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	578 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	579 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	580 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	581 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	582 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	583 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	584 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	585
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	586
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 /**
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	594 * Deal with binary data (including PixelData).
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	596
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	597 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	598 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	599 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	600 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	601 case EVR_ox: // OB or OW depending on context
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	602 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	603 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	604 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	605 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	606 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	607 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	608 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	609 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	610 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	611 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	612 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	613 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	614 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	615 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	616 case EVR_UI: // unique identifier
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	617 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	618 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	619 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	620 if (!(flags & DicomToJsonFlags_ConvertBinaryToNull))
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	621 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	622 Uint8* data = NULL;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	623 if (element.getUint8Array(data) == EC_Normal)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	624 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	625 return new DicomValue(reinterpret_cast<const char*>(data), element.getLength(), true);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	626 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	627 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	629 return new DicomValue;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	630 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	631
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	632 /**
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	633 * Numeric types
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	634 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	636 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	637 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	638 return ApplyDcmtkToCTypeConverter<DcmtkToSint32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	639 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	640
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	641 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	642 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	643 return ApplyDcmtkToCTypeConverter<DcmtkToSint16Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	644 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	645
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	646 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	647 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	648 return ApplyDcmtkToCTypeConverter<DcmtkToUint32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	649 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	650
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	651 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	652 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	653 return ApplyDcmtkToCTypeConverter<DcmtkToUint16Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	654 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	655
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	656 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	657 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	658 return ApplyDcmtkToCTypeConverter<DcmtkToFloat32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	659 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	660
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	661 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	662 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	663 return ApplyDcmtkToCTypeConverter<DcmtkToFloat64Converter>(element);
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	664 }
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	665
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	666
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	667 /**
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	668 * Attribute tag.
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	669 **/
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	670
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	671 case EVR_AT:
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	672 {
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	673 DcmTagKey tag;
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	674 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good())
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	675 {
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	676 DicomTag t(tag.getGroup(), tag.getElement());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	677 return new DicomValue(t.Format(), false);
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	678 }
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	679 else
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	680 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	681 return new DicomValue;
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	682 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	683 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	687 * 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	688 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	689 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	691 case EVR_SQ: // sequence of items
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	692 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	695 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	696 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	697 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	699 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	700 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	701 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	702 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	703 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	704 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	705 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	706 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	707 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	708 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	709 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	710 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	711 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	712 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	713 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	716 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	717 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	718 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	720 default:
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	721 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	724 catch (boost::bad_lexical_cast&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	726 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	728 catch (std::bad_cast&)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	729 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	730 return new DicomValue;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	731 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	735 static Json::Value& PrepareNode(Json::Value& parent,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	736 DcmElement& element,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	737 DicomToJsonFormat format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 {
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	739 assert(parent.type() == Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	741 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	742 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	743
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	744 if (format == DicomToJsonFormat_Short)
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	745 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	746 parent[formattedTag] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	747 return parent[formattedTag];
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
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	750 // 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	751 std::string tagName = FromDcmtkBridge::GetTagName(element);
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	752
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	753 switch (format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754 {
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	755 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	756 parent[tagName] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	757 return parent[tagName];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	758
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	759 case DicomToJsonFormat_Full:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	760 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	761 parent[formattedTag] = Json::objectValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	762 Json::Value& node = parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	763
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	764 if (element.isLeaf())
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	765 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	766 node["Name"] = tagName;
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	767
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	768 if (element.getTag().getPrivateCreator() != NULL)
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	769 {
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	770 node["PrivateCreator"] = element.getTag().getPrivateCreator();
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	771 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	772
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	773 return node;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	774 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	775 else
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	776 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	777 node["Name"] = tagName;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	778 node["Type"] = "Sequence";
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	779 node["Value"] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	780 return node["Value"];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	781 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	782 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	783
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	784 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	785 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	786 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	787 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	788
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	789
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	790 static void LeafValueToJson(Json::Value& target,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	791 const DicomValue& value,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	792 DicomToJsonFormat format,
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	793 DicomToJsonFlags flags,
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	794 unsigned int maxStringLength)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	795 {
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	796 Json::Value* targetValue = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	797 Json::Value* targetType = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	798
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	799 switch (format)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	800 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	801 case DicomToJsonFormat_Short:
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	802 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	803 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	804 assert(target.type() == Json::nullValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	805 targetValue = &target;
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	806 break;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	807 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	808
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	809 case DicomToJsonFormat_Full:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	811 assert(target.type() == Json::objectValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	812 target["Value"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	813 target["Type"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	814 targetType = &target["Type"];
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	815 targetValue = &target["Value"];
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	816 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817 }
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	818
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	819 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	820 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	821 }
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	822
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	823 assert(targetValue != NULL);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	824 assert(targetValue->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	825 assert(targetType == NULL \|\| targetType->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	826
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	827 if (value.IsNull())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	828 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	829 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	830 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	831 *targetType = "Null";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	832 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	833 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	834 else if (value.IsBinary())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	835 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	836 if (flags & DicomToJsonFlags_ConvertBinaryToAscii)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	837 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	838 *targetValue = Toolbox::ConvertToAscii(value.GetContent());
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	839 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	840 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	841 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	842 std::string s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	843 value.FormatDataUriScheme(s);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	844 *targetValue = s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	845 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	846
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	847 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	848 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	849 *targetType = "Binary";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	850 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	851 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	852 else if (maxStringLength == 0 \|\|
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	853 value.GetContent().size() <= maxStringLength)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	854 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	855 *targetValue = value.GetContent();
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	856
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	857 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	858 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	859 *targetType = "String";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	860 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	861 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	862 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	863 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	864 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	865 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	866 *targetType = "TooLong";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	867 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	868 }
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	869 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	870
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	871
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	872 void FromDcmtkBridge::ElementToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	873 DcmElement& element,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	874 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	875 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	876 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	877 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	878 bool hasCodeExtensions,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	879 const std::set<DicomTag>& ignoreTagLength)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	880 {
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	881 if (parent.type() == Json::nullValue)
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	882 {
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	883 parent = Json::objectValue;
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	884 }
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	885
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	886 assert(parent.type() == Json::objectValue);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	887 Json::Value& target = PrepareNode(parent, element, format);
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	888
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	889 if (element.isLeaf())
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	890 {
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	891 // The "0" below lets "LeafValueToJson()" take care of "TooLong" values
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	892 std::unique_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	893 (element, flags, 0, encoding, hasCodeExtensions, ignoreTagLength));
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	894
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	895 if (ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	896 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	897 LeafValueToJson(target, *v, format, flags, maxStringLength);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	898 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	899 else
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	900 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	901 LeafValueToJson(target, *v, format, flags, 0);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	902 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	906 assert(target.type() == Json::nullValue);
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	907 target = Json::arrayValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	911 // etc. are not." The following dynamic_cast is thus OK.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 DcmItem* child = sequence.getItem(i);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	917 Json::Value& v = target.append(Json::objectValue);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	918 DatasetToJson(v, *child, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	919 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	924 void FromDcmtkBridge::DatasetToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	925 DcmItem& item,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	926 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	927 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	928 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	929 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	930 bool hasCodeExtensions,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	931 const std::set<DicomTag>& ignoreTagLength)
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	932 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	933 assert(parent.type() == Json::objectValue);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	934
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	935 for (unsigned long i = 0; i < item.card(); i++)
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	936 {
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	937 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	938 if (element == NULL)
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	939 {
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	940 throw OrthancException(ErrorCode_InternalError);
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	941 }
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	942
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	943 DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	944
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	945 /element->getTag().isPrivate()/
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	946 if (tag.IsPrivate() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	947 !(flags & DicomToJsonFlags_IncludePrivateTags))
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	948 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	949 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	950 }
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	951
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	952 if (!(flags & DicomToJsonFlags_IncludeUnknownTags))
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	953 {
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	954 DictionaryLocker locker;
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	955 if (locker->findEntry(element->getTag(), element->getTag().getPrivateCreator()) == NULL)
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	956 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	957 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	958 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	959 }
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	960
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	961 if (IsBinaryTag(element->getTag()))
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	962 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	963 // This is a binary tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	964 if ((tag == DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludePixelData)) \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	965 (tag != DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludeBinary)))
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	966 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	967 continue;
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	968 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	969 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	970
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	971 FromDcmtkBridge::ElementToJson(parent, *element, format, flags,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	972 maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	973 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	974 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	975
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	976
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	977 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	978 DcmDataset& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	979 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	980 DicomToJsonFlags flags,
2131 bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	981 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	982 Encoding defaultEncoding,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	983 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	985 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	986 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	987
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	988 target = Json::objectValue;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	989 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	990 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	992
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	993 void FromDcmtkBridge::ExtractHeaderAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	994 DcmMetaInfo& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	995 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	996 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	997 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	998 {
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	999 std::set<DicomTag> ignoreTagLength;
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1000 target = Json::objectValue;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1001 DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii, false, ignoreTagLength);
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1002 }
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1003
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1004
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1005
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1006 static std::string GetTagNameInternal(DcmTag& tag)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1007 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1008 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1009 // 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	1010 // 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	1011 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	1012 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	1013 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	1014 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1015 return n;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1016 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1017 // End of patches
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1018 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1019
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1020 #if 0
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1021 // This version explicitly calls the dictionary
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1025 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1033 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1034 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1035 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1036 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1037 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1038 }
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 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1041 return std::string(name);
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 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1047 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	1048 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	1049 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1050 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	1051
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1052 if (!privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1053 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1054 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	1055 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1056
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1057 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1058 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1059
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1060
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1061 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	1062 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1063 // 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	1064 // 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	1065 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	1066
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1067 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1068 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1069
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1070
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1071
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1072 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1074 DicomTag parsed(0, 0);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1075 if (DicomTag::ParseHexadecimal(parsed, name))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1076 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1077 return parsed;
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1078 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1079
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1080 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1083
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 dcmDataDict.unlock();
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	1087 throw OrthancException(ErrorCode_UnknownDicomTag);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1090 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1092 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1093 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1096 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1097 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1098 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1099 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1100 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1101 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1102 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1103 {
2470 45de30d4f362 log Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1104 LOG(INFO) << "Unknown DICOM tag: \"" << name << "\"";
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	1105 throw OrthancException(ErrorCode_UnknownDicomTag);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1106 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1107 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 }
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
1655 e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1111 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	1112 {
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1113 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	1114 return tmp.isUnknownVR();
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1115 }
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1116
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1117
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1118 void FromDcmtkBridge::ToJson(Json::Value& result,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1119 const DicomMap& values,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1120 bool simplify)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1121 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1124 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1129 for (DicomMap::Content::const_iterator
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1130 it = values.content_.begin(); it != values.content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1131 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1132 // 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	1133 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	1134
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1135 if (simplify)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1136 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1137 if (it->second->IsNull())
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1138 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1139 result[tagName] = Json::nullValue;
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1140 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1141 else
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1142 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1143 // TODO IsBinary
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1144 result[tagName] = it->second->GetContent();
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1145 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1146 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1147 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1148 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1149 Json::Value value = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1150
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1151 value["Name"] = tagName;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1152
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1153 if (it->second->IsNull())
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1154 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1155 value["Type"] = "Null";
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1156 value["Value"] = Json::nullValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1157 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1158 else
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1159 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1160 // TODO IsBinary
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1161 value["Type"] = "String";
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	1162 value["Value"] = it->second->GetContent();
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1163 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1164
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1165 result[it->first.Format()] = value;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1166 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1169
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1170
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1171 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level)
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1172 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1173 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1174
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1175 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1176 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1177 case ResourceType_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1178 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1179 // 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	1180 // as a random PatientID.
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	1181 return Toolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1182
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1183 case ResourceType_Instance:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1184 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1185
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1186 case ResourceType_Series:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1187 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1188
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1189 case ResourceType_Study:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1190 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1191
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1192 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1193 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1194 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1195 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1196
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1197
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1198
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1199 static bool SaveToMemoryBufferInternal(std::string& buffer,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1200 DcmFileFormat& dicom,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1201 E_TransferSyntax xfer)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1202 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1203 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1204
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1205 // Create a memory buffer with the proper size
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1206 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1207 const uint32_t estimatedSize = dicom.calcElementLength(xfer, encodingType); // (*)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1208 buffer.resize(estimatedSize);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1209 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1210
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1211 DcmOutputBufferStream ob(&buffer[0], buffer.size());
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1212
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1213 // Fill the memory buffer with the meta-header and the dataset
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1214 dicom.transferInit();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1215 OFCondition c = dicom.write(ob, xfer, encodingType, NULL,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1216 /opt_groupLength/ EGL_recalcGL,
3765 4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1217 /opt_paddingType/ EPD_noChange,
4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1218 /padlen/ 0, /subPadlen/ 0, /instanceLength/ 0,
4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1219 EWM_updateMeta /* creates new SOP instance UID on lossy */);
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1220 dicom.transferEnd();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1221
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1222 if (c.good())
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1223 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1224 // The DICOM file is successfully written, truncate the target
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1225 // buffer if its size was overestimated by (*)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1226 ob.flush();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1227
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1228 size_t effectiveSize = static_cast<size_t>(ob.tell());
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1229 if (effectiveSize < buffer.size())
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1230 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1231 buffer.resize(effectiveSize);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1232 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1233
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1234 return true;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1235 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1236 else
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1237 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1238 // Error
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1239 buffer.clear();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1240 return false;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1241 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1242 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1243
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1244
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1245 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1246 DcmDataset& dataSet)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1247 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1248 // Determine the transfer syntax which shall be used to write the
3811 890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1249 // information to the file. If not possible, switch to the Little
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1250 // Endian syntax, with explicit length.
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1251
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1252 // 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	1253
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	1254
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	1255 /**
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	1256 * 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	1257 * "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	1258 * 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	1259 * (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	1260 **/
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1261 E_TransferSyntax xfer = dataSet.getCurrentXfer();
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	1262 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	1263 {
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	1264 // 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	1265 // 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	1266 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	1267 }
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	1268
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	1269 // Create the meta-header information
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1270 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	1271 ff.validateMetaInfo(xfer);
1316 1c8dfedefefe Fix anonymization generating non-portable DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1307 diff changeset	1272 ff.removeInvalidGroups();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1273
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1274 return SaveToMemoryBufferInternal(buffer, ff, xfer);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1275 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1276
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1277
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1278 bool FromDcmtkBridge::Transcode(DcmFileFormat& dicom,
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1279 DicomTransferSyntax syntax,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1280 const DcmRepresentationParameter* representation)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1281 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1282 E_TransferSyntax xfer;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1283 if (!LookupDcmtkTransferSyntax(xfer, syntax))
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1284 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1285 throw OrthancException(ErrorCode_InternalError);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1286 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1287 else
3885 e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1288 {
e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1289 DicomTransferSyntax sourceSyntax;
e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1290 bool known = LookupOrthancTransferSyntax(sourceSyntax, dicom);
3922 74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1291
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1292 if (!dicom.chooseRepresentation(xfer, representation).good() \|\|
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1293 !dicom.canWriteXfer(xfer) \|\|
3811 890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1294 !dicom.validateMetaInfo(xfer, EWM_updateMeta).good())
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1295 {
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1296 return false;
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1297 }
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1298 else
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1299 {
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1300 dicom.removeInvalidGroups();
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1301
3885 e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1302 if (known)
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1303 {
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1304 LOG(INFO) << "Transcoded an image from transfer syntax "
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1305 << GetTransferSyntaxUid(sourceSyntax) << " to "
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1306 << GetTransferSyntaxUid(syntax);
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1307 }
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1308 else
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1309 {
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1310 LOG(INFO) << "Transcoded an image from unknown transfer syntax to "
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1311 << GetTransferSyntaxUid(syntax);
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1312 }
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1313
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1314 return true;
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1315 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1316 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1317 }
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
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1320 ValueRepresentation FromDcmtkBridge::LookupValueRepresentation(const DicomTag& tag)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1321 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1322 DcmTag t(tag.GetGroup(), tag.GetElement());
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1323 return Convert(t.getEVR());
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1324 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1325
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1326 ValueRepresentation FromDcmtkBridge::Convert(const DcmEVR vr)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1327 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1328 switch (vr)
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1329 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1330 case EVR_AE:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1331 return ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1332
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1333 case EVR_AS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1334 return ValueRepresentation_AgeString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1335
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1336 case EVR_AT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1337 return ValueRepresentation_AttributeTag;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1338
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1339 case EVR_CS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1340 return ValueRepresentation_CodeString;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1341
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1342 case EVR_DA:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1343 return ValueRepresentation_Date;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1344
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1345 case EVR_DS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1346 return ValueRepresentation_DecimalString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1347
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1348 case EVR_DT:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1349 return ValueRepresentation_DateTime;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1350
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1351 case EVR_FL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1352 return ValueRepresentation_FloatingPointSingle;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1353
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1354 case EVR_FD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1355 return ValueRepresentation_FloatingPointDouble;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1356
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1357 case EVR_IS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1358 return ValueRepresentation_IntegerString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1359
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1360 case EVR_LO:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1361 return ValueRepresentation_LongString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1362
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1363 case EVR_LT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1364 return ValueRepresentation_LongText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1365
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1366 case EVR_OB:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1367 return ValueRepresentation_OtherByte;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1368
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1369 #if DCMTK_VERSION_NUMBER >= 361
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1370 case EVR_OD:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1371 return ValueRepresentation_OtherDouble;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1372 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1373
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1374 case EVR_OF:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1375 return ValueRepresentation_OtherFloat;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1376
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1377 #if DCMTK_VERSION_NUMBER >= 362
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1378 case EVR_OL:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1379 return ValueRepresentation_OtherLong;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1380 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1381
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1382 case EVR_OW:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1383 return ValueRepresentation_OtherWord;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1384
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1385 case EVR_PN:
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1386 return ValueRepresentation_PersonName;
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1387
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1388 case EVR_SH:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1389 return ValueRepresentation_ShortString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1390
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1391 case EVR_SL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1392 return ValueRepresentation_SignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1393
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1394 case EVR_SQ:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1395 return ValueRepresentation_Sequence;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1396
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1397 case EVR_SS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1398 return ValueRepresentation_SignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1399
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1400 case EVR_ST:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1401 return ValueRepresentation_ShortText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1402
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1403 case EVR_TM:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1404 return ValueRepresentation_Time;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1405
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1406 #if DCMTK_VERSION_NUMBER >= 361
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1407 case EVR_UC:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1408 return ValueRepresentation_UnlimitedCharacters;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1409 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1410
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1411 case EVR_UI:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1412 return ValueRepresentation_UniqueIdentifier;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1413
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1414 case EVR_UL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1415 return ValueRepresentation_UnsignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1416
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1417 case EVR_UN:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1418 return ValueRepresentation_Unknown;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1419
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1420 #if DCMTK_VERSION_NUMBER >= 361
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1421 case EVR_UR:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1422 return ValueRepresentation_UniversalResource;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1423 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1424
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1425 case EVR_US:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1426 return ValueRepresentation_UnsignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1427
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1428 case EVR_UT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1429 return ValueRepresentation_UnlimitedText;
1792 b769623c806c safety check Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	1430
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1431 default:
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1432 return ValueRepresentation_NotSupported;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1433 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1434 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1435
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1436
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1437 DcmElement* FromDcmtkBridge::CreateElementForTag(const DicomTag& tag,
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1438 const std::string& privateCreator)
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1439 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1440 if (tag.IsPrivate() &&
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1441 privateCreator.empty())
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1442 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1443 // This solves issue 140 (Modifying private tags with REST API
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1444 // changes VR from LO to UN)
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1445 // https://bitbucket.org/sjodogne/orthanc/issues/140
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1446 LOG(WARNING) << "Private creator should not be empty while creating a private tag: " << tag.Format();
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1447 }
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1448
3692 fd302ec6a502 fix for ubuntu 16.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1449 #if DCMTK_VERSION_NUMBER >= 362
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1450 DcmTag key(tag.GetGroup(), tag.GetElement());
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1451 if (tag.IsPrivate())
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1452 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1453 return DcmItem::newDicomElement(key, privateCreator.c_str());
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1454 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1455 else
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1456 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1457 return DcmItem::newDicomElement(key, NULL);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1458 }
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1459
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1460 #else
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1461 DcmTag key(tag.GetGroup(), tag.GetElement());
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1462 if (tag.IsPrivate())
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1463 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1464 // https://forum.dcmtk.org/viewtopic.php?t=4527
3708 bc25deb40302 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 3692 diff changeset	1465 LOG(WARNING) << "You are using DCMTK <= 3.6.1: All the private tags "
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1466 "are considered as having a binary value representation";
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1467 key.setPrivateCreator(privateCreator.c_str());
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1468 return new DcmOtherByteOtherWord(key);
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1469 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1470 else
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1471 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1472 return newDicomElement(key);
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1473 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1474 #endif
1689 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
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1478
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1479 void FromDcmtkBridge::FillElementWithString(DcmElement& element,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1480 const std::string& utf8Value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1481 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1482 Encoding dicomEncoding)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1483 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1484 std::string binary;
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1485 const std::string* decoded = &utf8Value;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1486
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1487 if (decodeDataUriScheme &&
2905 ae20fccdd867 refactoring mime types Sebastien Jodogne <s.jodogne@gmail.com> parents: 2831 diff changeset	1488 boost::starts_with(utf8Value, URI_SCHEME_PREFIX_BINARY))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1489 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1490 std::string mime;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1491 if (!Toolbox::DecodeDataUriScheme(mime, binary, utf8Value))
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1492 {
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1493 throw OrthancException(ErrorCode_BadFileFormat);
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1494 }
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1495
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1496 decoded = &binary;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1497 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1498 else if (dicomEncoding != Encoding_Utf8)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1499 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1500 binary = Toolbox::ConvertFromUtf8(utf8Value, dicomEncoding);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1501 decoded = &binary;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1502 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1503
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1504 if (IsBinaryTag(element.getTag()))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1505 {
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1506 bool ok;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1507
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1508 switch (element.getTag().getEVR())
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1509 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1510 case EVR_OW:
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1511 if (decoded->size() % sizeof(Uint16) != 0)
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1512 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1513 LOG(ERROR) << "A tag with OW VR must have an even number of bytes";
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1514 ok = false;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1515 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1516 else
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1517 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1518 ok = element.putUint16Array((const Uint16*) decoded->c_str(), decoded->size() / sizeof(Uint16)).good();
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1519 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1520
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1521 break;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1522
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1523 default:
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1524 ok = element.putUint8Array((const Uint8*) decoded->c_str(), decoded->size()).good();
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1525 break;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1526 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1527
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1528 if (ok)
1689 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 return;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1531 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1532 else
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1533 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1534 throw OrthancException(ErrorCode_InternalError);
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 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1537
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1538 bool ok = false;
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 try
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1541 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1542 switch (element.getTag().getEVR())
1689 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 // http://support.dcmtk.org/docs/dcvr_8h-source.html
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1545
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1546 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1547 * TODO.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1548 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1549
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1550 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1551 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1552 case EVR_AT: // attribute tag
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1553 throw OrthancException(ErrorCode_NotImplemented);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1554
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1555 case EVR_UN: // unknown value representation
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1556 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1557
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1558
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 * String types.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1561 **/
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 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1564 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1565 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1566 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1567 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1568 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1569 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1570 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1571 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1572 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1573 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1574 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1575 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1576 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1577 case EVR_UI: // unique identifier
3209 f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	1578 #if DCMTK_VERSION_NUMBER >= 361
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1579 case EVR_UC: // unlimited characters
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1580 case EVR_UR: // URI/URL
3209 f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	1581 #endif
1689 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.putString(decoded->c_str()).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
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 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1590 **/
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 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1593 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1594 ok = element.putSint32(boost::lexical_cast<Sint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1595 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1596 }
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 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1599 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1600 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1601 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1602 }
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 case EVR_UL: // unsigned long
3692 fd302ec6a502 fix for ubuntu 16.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1605 #if DCMTK_VERSION_NUMBER >= 362
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1606 case EVR_OL: // other long (requires byte-swapping)
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1607 #endif
1689 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 ok = element.putUint32(boost::lexical_cast<Uint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1610 break;
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
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1613 case EVR_US: // unsigned short
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 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1616 break;
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
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1619 case EVR_FL: // float single-precision
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1620 case EVR_OF: // other float (requires byte swapping)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1621 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1622 ok = element.putFloat32(boost::lexical_cast<float>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1623 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1624 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1625
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1626 case EVR_FD: // float double-precision
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1627 #if DCMTK_VERSION_NUMBER >= 361
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1628 case EVR_OD: // other double (requires byte-swapping)
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1629 #endif
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1630 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1631 ok = element.putFloat64(boost::lexical_cast<double>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1632 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1633 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1634
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1635
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1636 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1637 * Sequence types, should never occur at this point.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1638 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1639
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1640 case EVR_SQ: // sequence of items
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 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1643 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1644 }
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 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1648 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1649 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1650
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1651 case EVR_ox: // OB or OW depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1652 case EVR_xs: // SS or US depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1653 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	1654 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1655 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1656 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1657 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1658 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1659 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1660 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1661 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1662 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1663 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1664 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	1665 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1666 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1667 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	1668 default:
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1669 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1670 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1671 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1672 catch (boost::bad_lexical_cast&)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1673 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1674 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1675 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1676
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1677 if (!ok)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1678 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1679 DicomTag tag(element.getTag().getGroup(), element.getTag().getElement());
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1680 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1681 "While creating a DICOM instance, tag (" + tag.Format() +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1682 ") has out-of-range value: \"" + (*decoded) + "\"");
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1683 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1684 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1685
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1686
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1687 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag,
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1688 const Json::Value& value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1689 bool decodeDataUriScheme,
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1690 Encoding dicomEncoding,
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1691 const std::string& privateCreator)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1692 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	1693 std::unique_ptr<DcmElement> element;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1694
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1695 switch (value.type())
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1696 {
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1697 case Json::stringValue:
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1698 element.reset(CreateElementForTag(tag, privateCreator));
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1699 FillElementWithString(*element, value.asString(), decodeDataUriScheme, dicomEncoding);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1700 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1701
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1702 case Json::nullValue:
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1703 element.reset(CreateElementForTag(tag, privateCreator));
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1704 FillElementWithString(*element, "", decodeDataUriScheme, dicomEncoding);
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1705 break;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1706
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1707 case Json::arrayValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1708 {
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1709 const char* p = NULL;
4016 c675d77b82ab fix creation of sequence in private tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 4007 diff changeset	1710 if (tag.IsPrivate() &&
c675d77b82ab fix creation of sequence in private tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 4007 diff changeset	1711 !privateCreator.empty())
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1712 {
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1713 p = privateCreator.c_str();
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1714 }
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1715
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1716 DcmTag key(tag.GetGroup(), tag.GetElement(), p);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1717 if (key.getEVR() != EVR_SQ)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1718 {
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1719 throw OrthancException(ErrorCode_BadParameterType,
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	1720 "Bad Parameter type for tag " + tag.Format());
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1721 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1722
2287 9f3414878c02 Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2275 diff changeset	1723 DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1724 element.reset(sequence);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1725
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1726 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1727 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	1728 std::unique_ptr<DcmItem> item(new DcmItem);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1729
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1730 switch (value[i].type())
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1731 {
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1732 case Json::objectValue:
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1733 {
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1734 Json::Value::Members members = value[i].getMemberNames();
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1735 for (Json::Value::ArrayIndex j = 0; j < members.size(); j++)
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1736 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1737 item->insert(FromJson(ParseTag(members[j]), value[i][members[j]], decodeDataUriScheme, dicomEncoding, privateCreator));
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1738 }
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	1739 break;
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1740 }
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1741
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1742 case Json::arrayValue:
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	1743 {
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1744 // Lua cannot disambiguate between an empty dictionary
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1745 // and an empty array
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1746 if (value[i].size() != 0)
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1747 {
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1748 throw OrthancException(ErrorCode_BadParameterType);
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1749 }
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1750 break;
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	1751 }
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1752
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1753 default:
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1754 throw OrthancException(ErrorCode_BadParameterType);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1755 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1756
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1757 sequence->append(item.release());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1758 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1759
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1760 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1761 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1762
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	1763 default:
3895 37cf1889667a more explicit error message Alain Mazy <alain@mazy.be> parents: 3811 diff changeset	1764 throw OrthancException(ErrorCode_BadParameterType, "Bad Parameter type for tag " + tag.Format());
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1765 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1766
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1767 return element.release();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1768 }
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1769
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	1770
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	1771 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	1772 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1773 DcmElement *element = NULL;
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	1774 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	1775 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1776 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	1777 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1778
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1779 DcmPixelData& pixelData = dynamic_cast<DcmPixelData&>(*element);
3922 74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1780
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1781 E_TransferSyntax repType;
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1782 const DcmRepresentationParameter *repParam = NULL;
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1783 pixelData.getCurrentRepresentationKey(repType, repParam);
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1784
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	1785 DcmPixelSequence* pixelSequence = NULL;
3922 74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1786 if (!pixelData.getEncapsulatedRepresentation(repType, repParam, pixelSequence).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	1787 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1788 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	1789 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1790 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	1791 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1792 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	1793 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1794 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1795
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1796
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1797 Encoding FromDcmtkBridge::ExtractEncoding(const Json::Value& json,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1798 Encoding defaultEncoding)
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 if (json.type() != Json::objectValue)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1801 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1802 throw OrthancException(ErrorCode_BadParameterType);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1803 }
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 Encoding encoding = defaultEncoding;
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 const Json::Value::Members tags = json.getMemberNames();
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 // Look for SpecificCharacterSet (0008,0005) in the JSON file
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1810 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1811 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1812 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1813 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
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 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1816 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	1817 (value.asString().length() != 0 &&
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1818 !GetDicomEncoding(encoding, value.asCString())))
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1819 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1820 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1821 "Unknown encoding while creating DICOM from JSON: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1822 value.toStyledString());
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1823 }
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1824
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1825 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	1826 {
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1827 return defaultEncoding;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	1828 }
1934 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 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1831
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1832 return encoding;
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 static void SetString(DcmDataset& target,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1837 const DcmTag& tag,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1838 const std::string& value)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1839 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1840 if (!target.putAndInsertString(tag, value.c_str()).good())
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 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1843 }
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
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 DcmDataset* FromDcmtkBridge::FromJson(const Json::Value& json, // Encoded using UTF-8
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1848 bool generateIdentifiers,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1849 bool decodeDataUriScheme,
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1850 Encoding defaultEncoding,
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1851 const std::string& privateCreator)
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1852 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	1853 std::unique_ptr<DcmDataset> result(new DcmDataset);
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1854 Encoding encoding = ExtractEncoding(json, defaultEncoding);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1855
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1856 SetString(*result, DCM_SpecificCharacterSet, GetDicomSpecificCharacterSet(encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1857
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1858 const Json::Value::Members tags = json.getMemberNames();
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 bool hasPatientId = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1861 bool hasStudyInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1862 bool hasSeriesInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1863 bool hasSopInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1864
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1865 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1866 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1867 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1868 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1869
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1870 if (tag == DICOM_TAG_PATIENT_ID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1871 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1872 hasPatientId = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1873 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1874 else if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1875 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1876 hasStudyInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1877 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1878 else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1879 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1880 hasSeriesInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1881 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1882 else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1883 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1884 hasSopInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1885 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1886
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1887 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1888 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	1889 std::unique_ptr<DcmElement> element(FromDcmtkBridge::FromJson(tag, value, decodeDataUriScheme, encoding, privateCreator));
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1890 const DcmTagKey& tag = element->getTag();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1891
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1892 result->findAndDeleteElement(tag);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1893
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1894 DcmElement* tmp = element.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1895 if (!result->insert(tmp, false, false).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1896 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1897 delete tmp;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1898 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1899 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1900 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1901 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1902
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1903 if (!hasPatientId &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1904 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1905 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1906 SetString(*result, DCM_PatientID, GenerateUniqueIdentifier(ResourceType_Patient));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1907 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1908
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1909 if (!hasStudyInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1910 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1911 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1912 SetString(*result, DCM_StudyInstanceUID, GenerateUniqueIdentifier(ResourceType_Study));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1913 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1914
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1915 if (!hasSeriesInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1916 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1917 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1918 SetString(*result, DCM_SeriesInstanceUID, GenerateUniqueIdentifier(ResourceType_Series));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1919 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1920
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1921 if (!hasSopInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1922 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1923 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1924 SetString(*result, DCM_SOPInstanceUID, GenerateUniqueIdentifier(ResourceType_Instance));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1925 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1926
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1927 return result.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	1928 }
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1929
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1930
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1931 DcmFileFormat* FromDcmtkBridge::LoadFromMemoryBuffer(const void* buffer,
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1932 size_t size)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1933 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1934 DcmInputBufferStream is;
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1935 if (size > 0)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1936 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1937 is.setBuffer(buffer, size);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1938 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1939 is.setEos();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1940
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	1941 std::unique_ptr<DcmFileFormat> result(new DcmFileFormat);
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1942
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1943 result->transferInit();
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1944
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1945 /**
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1946 * New in Orthanc 1.6.0: The "size" is given as an argument to the
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1947 * "read()" method. This can avoid huge memory consumption if
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1948 * parsing an invalid DICOM file, which can notably been observed
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1949 * by executing the integration test "test_upload_compressed" on
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1950 * valgrind running Orthanc.
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1951 **/
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	1952 if (!result->read(is, EXS_Unknown, EGL_noChange, size).good())
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1953 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1954 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1955 "Cannot parse an invalid DICOM file (size: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1956 boost::lexical_cast<std::string>(size) + " bytes)");
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1957 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1958
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1959 result->loadAllDataIntoMemory();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1960 result->transferEnd();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1961
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1962 return result.release();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	1963 }
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1964
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1965
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1966 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	1967 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	1968 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1969 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	1970 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1971 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	1972 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1973
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1974 target.Clear();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1975
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1976 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	1977
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1978 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	1979 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1980 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	1981
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1982 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	1983 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1984 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	1985 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1986
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1987 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	1988 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1989 }
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1990
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1991
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1992 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	1993 Encoding source,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1994 bool hasSourceCodeExtensions,
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1995 Encoding target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1996 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1997 // 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	1998 // each string-like element
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	1999
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2000 if (source == target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2001 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2002 return;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2003 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2004
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2005 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	2006 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2007 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	2008 if (element)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2009 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2010 if (element->isLeaf())
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2011 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2012 char *c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2013 if (element->isaString() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2014 element->getString(c).good() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2015 c != NULL)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2016 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2017 std::string a = Toolbox::ConvertToUtf8(c, source, hasSourceCodeExtensions);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2018 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	2019 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	2020 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2021 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2022 else
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2023 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2024 // "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	2025 // 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	2026 // 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	2027 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	2028
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2029 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	2030 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2031 ChangeStringEncoding(*sequence.getItem(j), source, hasSourceCodeExtensions, target);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2032 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2033 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2034 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2035 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2036 }
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	2037
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	2038
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2039 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
3577 33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	2040 DcmItem& dataset,
4136 2724977419fb Fix DICOM SCP filters if some query tag has more than 256 characters Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2041 unsigned int maxStringLength,
3577 33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	2042 const std::set<DicomTag>& ignoreTagLength)
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2043 {
4136 2724977419fb Fix DICOM SCP filters if some query tag has more than 256 characters Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2044 ExtractDicomSummary(target, dataset, maxStringLength,
3577 33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	2045 GetDefaultDicomEncoding(), ignoreTagLength);
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2046 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2047
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2048
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2049 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	2050 DcmDataset& dataset,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	2051 const std::set<DicomTag>& ignoreTagLength)
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2052 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2053 ExtractDicomAsJson(target, dataset,
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2054 DicomToJsonFormat_Full,
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2055 DicomToJsonFlags_Default,
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2056 ORTHANC_MAXIMUM_TAG_LENGTH,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	2057 GetDefaultDicomEncoding(),
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	2058 ignoreTagLength);
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2059 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2060
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2061
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2062 void FromDcmtkBridge::InitializeCodecs()
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2063 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2064 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
2528 832217e4e872 old warnings turned into info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2522 diff changeset	2065 LOG(INFO) << "Registering JPEG Lossless codecs in DCMTK";
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2066 DJLSDecoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2067 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2068 DJLSEncoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2069 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2070 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2071
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2072 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
2528 832217e4e872 old warnings turned into info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2522 diff changeset	2073 LOG(INFO) << "Registering JPEG codecs in DCMTK";
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2074 DJDecoderRegistration::registerCodecs();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2075 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2076 DJEncoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2077 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2078 #endif
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2079
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2080 LOG(INFO) << "Registering RLE codecs in DCMTK";
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2081 DcmRLEDecoderRegistration::registerCodecs();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2082 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2083 DcmRLEEncoderRegistration::registerCodecs();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2084 #endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2085 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2086
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2087
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2088 void FromDcmtkBridge::FinalizeCodecs()
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2089 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2090 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2091 // Unregister JPEG-LS codecs
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2092 DJLSDecoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2093 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2094 DJLSEncoderRegistration::cleanup();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2095 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2096 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2097
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2098 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2099 // Unregister JPEG codecs
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2100 DJDecoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2101 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
3743 33c19a6643e1 creating IDicomTranscoder abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 3730 diff changeset	2102 DJEncoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2103 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2104 #endif
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2105
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2106 DcmRLEDecoderRegistration::cleanup();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2107 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2108 DcmRLEEncoderRegistration::cleanup();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2109 #endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2110 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2111
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2112
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2113
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2114 // Forward declaration
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2115 static void ApplyVisitorToElement(DcmElement& element,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2116 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2117 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2118 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2119 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2120 bool hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2121
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2122 static void ApplyVisitorToDataset(DcmItem& dataset,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2123 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2124 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2125 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2126 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2127 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2128 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2129 assert(parentTags.size() == parentIndexes.size());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2130
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2131 for (unsigned long i = 0; i < dataset.card(); i++)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2132 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2133 DcmElement* element = dataset.getElement(i);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2134 if (element == NULL)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2135 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2136 throw OrthancException(ErrorCode_InternalError);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2137 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2138 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2139 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2140 ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2141 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2142 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2143 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2144
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2145
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2146 static void ApplyVisitorToLeaf(DcmElement& element,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2147 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2148 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2149 const std::vector<size_t>& parentIndexes,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2150 const DicomTag& tag,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2151 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2152 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2153 {
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2154 // TODO - Merge this function, that is more recent, with ConvertLeafElement()
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2155
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2156 assert(element.isLeaf());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2157
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2158 DcmEVR evr = element.getTag().getEVR();
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2159
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2160
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2161 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2162 * Fix the EVR for types internal to DCMTK
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2163 **/
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2164
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2165 if (evr == EVR_ox) // OB or OW depending on context
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2166 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2167 evr = EVR_OB;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2168 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2169
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2170 if (evr == EVR_UNKNOWN \|\| // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2171 evr == EVR_UNKNOWN2B) // used internally for elements with unknown VR with 2-byte length field in explicit VR
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2172 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2173 evr = EVR_UN;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2174 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2175
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2176 const ValueRepresentation vr = FromDcmtkBridge::Convert(evr);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2177
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2178
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2179 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2180 * Deal with binary data (including PixelData).
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2181 **/
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2182
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2183 if (evr == EVR_OB \|\| // other byte
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2184 evr == EVR_OW \|\| // other word
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2185 evr == EVR_UN) // unknown value representation
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2186 {
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2187 Uint16* data16 = NULL;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2188 Uint8* data = NULL;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2189
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2190 if (evr == EVR_OW &&
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2191 element.getUint16Array(data16) == EC_Normal)
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2192 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2193 visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data16, element.getLength());
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2194 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2195 else if (evr != EVR_OW &&
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2196 element.getUint8Array(data) == EC_Normal)
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2197 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2198 visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data, element.getLength());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2199 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2200 else
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2201 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2202 visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2203 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2204
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2205 return; // We're done
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2206 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2207
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2208
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2209 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2210 * Deal with plain strings (and convert them to UTF-8)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2211 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2212
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2213 char *c = NULL;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2214 if (element.isaString() &&
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2215 element.getString(c).good())
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2216 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2217 std::string utf8;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2218
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2219 if (c != NULL) // This case corresponds to the empty string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2220 {
3448 b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2221 if (element.getTag() == DCM_SpecificCharacterSet)
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2222 {
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2223 utf8.assign(c);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2224 }
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2225 else
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2226 {
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2227 std::string s(c);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2228 utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2229 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2230 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2231
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2232 std::string newValue;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2233 ITagVisitor::Action action = visitor.VisitString
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2234 (newValue, parentTags, parentIndexes, tag, vr, utf8);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2235
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2236 switch (action)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2237 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2238 case ITagVisitor::Action_None:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2239 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2240
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2241 case ITagVisitor::Action_Replace:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2242 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2243 std::string s = Toolbox::ConvertFromUtf8(newValue, encoding);
2522 ce2dfba9417c fix build with dcmtk 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	2244 if (element.putString(s.c_str()) != EC_Normal)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2245 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2246 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2247 "Cannot replace value of tag: " + tag.Format());
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2248 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2249
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2250 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2251 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2252
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2253 default:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2254 throw OrthancException(ErrorCode_InternalError);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2255 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2256
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2257 return; // We're done
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2258 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2259
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2260
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2261 try
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2262 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2263 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2264 switch (evr)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2265 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2266
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2267 /**
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2268 * Plain string values.
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2269 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2270
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2271 case EVR_DS: // decimal string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2272 case EVR_IS: // integer string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2273 case EVR_AS: // age string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2274 case EVR_DA: // date string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2275 case EVR_DT: // date time string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2276 case EVR_TM: // time string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2277 case EVR_AE: // application entity title
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2278 case EVR_CS: // code string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2279 case EVR_SH: // short string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2280 case EVR_LO: // long string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2281 case EVR_ST: // short text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2282 case EVR_LT: // long text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2283 case EVR_UT: // unlimited text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2284 case EVR_PN: // person name
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2285 case EVR_UI: // unique identifier
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2286 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2287 Uint8* data = NULL;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2288
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2289 if (element.getUint8Array(data) == EC_Normal)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2290 {
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2291 const Uint32 length = element.getLength();
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2292 Uint32 l = 0;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2293 while (l < length &&
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2294 data[l] != 0)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2295 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2296 l++;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2297 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2298
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2299 if (l == length)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2300 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2301 // Not a null-terminated plain string
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2302 visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2303 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2304 else
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2305 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2306 std::string ignored;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2307 std::string s(reinterpret_cast<const char*>(data), l);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2308 ITagVisitor::Action action = visitor.VisitString
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2309 (ignored, parentTags, parentIndexes, tag, vr,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2310 Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions));
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2311
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2312 if (action != ITagVisitor::Action_None)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2313 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2314 LOG(WARNING) << "Cannot replace this string tag: "
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2315 << FromDcmtkBridge::GetTagName(element)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2316 << " (" << tag.Format() << ")";
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2317 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2318 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2319 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2320 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2321 {
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2322 visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2323 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2324
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2325 return;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2326 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2327
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2328 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2329 * Numeric types
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2330 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2331
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2332 case EVR_SL: // signed long
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2333 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2334 DcmSignedLong& content = dynamic_cast<DcmSignedLong&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2335
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2336 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2337 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2338
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2339 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2340 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2341 Sint32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2342 if (content.getSint32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2343 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2344 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2345 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2346 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2347
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2348 visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2349 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2350 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2351
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2352 case EVR_SS: // signed short
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2353 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2354 DcmSignedShort& content = dynamic_cast<DcmSignedShort&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2355
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2356 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2357 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2358
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2359 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2360 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2361 Sint16 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2362 if (content.getSint16(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2363 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2364 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2365 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2366 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2367
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2368 visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2369 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2370 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2371
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2372 case EVR_UL: // unsigned long
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2373 #if DCMTK_VERSION_NUMBER >= 362
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2374 case EVR_OL:
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2375 #endif
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2376 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2377 DcmUnsignedLong& content = dynamic_cast<DcmUnsignedLong&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2378
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2379 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2380 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2381
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2382 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2383 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2384 Uint32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2385 if (content.getUint32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2386 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2387 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2388 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2389 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2390
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2391 visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2392 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2393 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2394
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2395 case EVR_US: // unsigned short
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2396 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2397 DcmUnsignedShort& content = dynamic_cast<DcmUnsignedShort&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2398
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2399 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2400 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2401
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2402 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2403 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2404 Uint16 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2405 if (content.getUint16(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2406 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2407 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2408 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2409 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2410
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2411 visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2412 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2413 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2414
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2415 case EVR_FL: // float single-precision
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2416 case EVR_OF:
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2417 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2418 DcmFloatingPointSingle& content = dynamic_cast<DcmFloatingPointSingle&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2419
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2420 std::vector<double> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2421 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2422
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2423 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2424 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2425 Float32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2426 if (content.getFloat32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2427 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2428 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2429 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2430 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2431
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2432 visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2433 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2434 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2435
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2436 case EVR_FD: // float double-precision
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2437 #if DCMTK_VERSION_NUMBER >= 361
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2438 case EVR_OD:
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	2439 #endif
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2440 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2441 DcmFloatingPointDouble& content = dynamic_cast<DcmFloatingPointDouble&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2442
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2443 std::vector<double> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2444 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2445
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2446 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2447 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2448 Float64 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2449 if (content.getFloat64(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2450 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2451 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2452 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2453 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2454
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2455 visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2456 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2457 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2458
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2459
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2460 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2461 * Attribute tag.
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2462 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2463
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2464 case EVR_AT:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2465 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2466 DcmAttributeTag& content = dynamic_cast<DcmAttributeTag&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2467
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2468 std::vector<DicomTag> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2469 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2470
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2471 for (unsigned long i = 0; i < content.getVM(); i++)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2472 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2473 DcmTagKey f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2474 if (content.getTagVal(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2475 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2476 DicomTag t(f.getGroup(), f.getElement());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2477 values.push_back(t);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2478 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2479 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2480
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2481 assert(vr == ValueRepresentation_AttributeTag);
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2482 visitor.VisitAttributes(parentTags, parentIndexes, tag, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2483 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2484 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2485
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2486
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2487 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2488 * Sequence types, should never occur at this point because of
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2489 * "element.isLeaf()".
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2490 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2491
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2492 case EVR_SQ: // sequence of items
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2493 {
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2494 return;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2495 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2496
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2497
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2498 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2499 * Internal to DCMTK.
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2500 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2501
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2502 case EVR_xs: // SS or US depending on context
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2503 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2504 case EVR_na: // na="not applicable", for data which has no VR
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2505 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2506 case EVR_item: // used internally for items
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2507 case EVR_metainfo: // used internally for meta info datasets
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2508 case EVR_dataset: // used internally for datasets
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2509 case EVR_fileFormat: // used internally for DICOM files
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2510 case EVR_dicomDir: // used internally for DICOMDIR objects
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2511 case EVR_dirRecord: // used internally for DICOMDIR records
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2512 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2513 case EVR_pixelItem: // used internally for pixel items in a compressed image
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2514 case EVR_PixelData: // used internally for uncompressed pixeld data
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2515 case EVR_OverlayData: // used internally for overlay data
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2516 {
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2517 visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2518 return;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2519 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2520
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2521
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2522 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2523 * Default case.
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2524 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2525
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2526 default:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2527 return;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2528 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2529 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2530 catch (boost::bad_lexical_cast&)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2531 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2532 return;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2533 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2534 catch (std::bad_cast&)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2535 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2536 return;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2537 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2538 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2539
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2540
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2541 static void ApplyVisitorToElement(DcmElement& element,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2542 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2543 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2544 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2545 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2546 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2547 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2548 assert(parentTags.size() == parentIndexes.size());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2549
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2550 DicomTag tag(FromDcmtkBridge::Convert(element.getTag()));
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2551
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2552 if (element.isLeaf())
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2553 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2554 ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding, hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2555 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2556 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2557 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2558 // "All subclasses of DcmElement except for DcmSequenceOfItems
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2559 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2560 // etc. are not." The following dynamic_cast is thus OK.
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2561 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2562
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2563 if (sequence.card() == 0)
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2564 {
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2565 visitor.VisitEmptySequence(parentTags, parentIndexes, tag);
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2566 }
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2567 else
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2568 {
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2569 std::vector<DicomTag> tags = parentTags;
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2570 std::vector<size_t> indexes = parentIndexes;
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2571 tags.push_back(tag);
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2572 indexes.push_back(0);
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2573
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2574 for (unsigned long i = 0; i < sequence.card(); i++)
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2575 {
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2576 indexes.back() = static_cast<size_t>(i);
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2577 DcmItem* child = sequence.getItem(i);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2578 ApplyVisitorToDataset(*child, visitor, tags, indexes, encoding, hasCodeExtensions);
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2579 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2580 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2581 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2582 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2583
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2584
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2585 void FromDcmtkBridge::Apply(DcmItem& dataset,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2586 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2587 Encoding defaultEncoding)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2588 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2589 std::vector<DicomTag> parentTags;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2590 std::vector<size_t> parentIndexes;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2591 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2592 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2593 ApplyVisitorToDataset(dataset, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2594 }
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2595
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2596
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2597
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2598 bool FromDcmtkBridge::LookupOrthancTransferSyntax(DicomTransferSyntax& target,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2599 DcmFileFormat& dicom)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2600 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2601 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2602 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2603 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2604 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2605
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2606 DcmDataset& dataset = *dicom.getDataset();
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2607
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	2608 E_TransferSyntax xfer = dataset.getCurrentXfer();
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2609 if (xfer == EXS_Unknown)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2610 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2611 dataset.updateOriginalXfer();
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2612 xfer = dataset.getOriginalXfer();
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2613 if (xfer == EXS_Unknown)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2614 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2615 throw OrthancException(ErrorCode_BadFileFormat,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2616 "Cannot determine the transfer syntax of the DICOM instance");
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2617 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2618 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2619
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2620 return FromDcmtkBridge::LookupOrthancTransferSyntax(target, xfer);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	2621 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2622 }
3730 ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	2623
ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	2624
ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	2625 #include "./FromDcmtkBridge_TransferSyntaxes.impl.h"

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4136:2724977419fb