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

annotate OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 5287:c04230962098 am-experimental

wip: 'dicomWeb' json format + 'include' get arguments

author	Alain Mazy <am@osimis.io>
date	Fri, 28 Apr 2023 10:42:27 +0200
parents	7cb1b851f5c8
children	79fa77e9fa0d

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
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5173 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5173 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * 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	9 * 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	10 * 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	11 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	12 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * 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	16 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
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	18 * 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	19 * 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	20 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
448 9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	23
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	24 #include "../PrecompiledHeaders.h"
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 799 diff changeset	25
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	26 #ifndef NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	27 #define NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	28 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	30 #if !defined(ORTHANC_SANDBOXED)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	31 # 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	32 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	33
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	34 #if !defined(DCMTK_VERSION_NUMBER)
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	35 # error The macro DCMTK_VERSION_NUMBER must be defined
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	36 #endif
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	37
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include "FromDcmtkBridge.h"
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	39 #include "ToDcmtkBridge.h"
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	40 #include "../Compatibility.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	41 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	42 #include "../Toolbox.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	43 #include "../OrthancException.h"
5287 c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	44 #include "DicomWebJsonVisitor.h"
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	45 #include "ParsedDicomFile.h"
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	46 #include <boost/date_time/posix_time/posix_time.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	48 #if ORTHANC_SANDBOXED == 0
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	49 # include "../TemporaryFile.h"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	50 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	51
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	52 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	53 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	54
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 #include <boost/lexical_cast.hpp>
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	56 #include <boost/filesystem.hpp>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	57 #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	58 #include <boost/algorithm/string/join.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	60 #include <dcmtk/dcmdata/dcdeftag.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 #include <dcmtk/dcmdata/dcfilefo.h>
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	64 #include <dcmtk/dcmdata/dcistrmb.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	65 #include <dcmtk/dcmdata/dcostrmb.h>
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	66 #include <dcmtk/dcmdata/dcpixel.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	67 #include <dcmtk/dcmdata/dcuid.h>
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	68 #include <dcmtk/dcmdata/dcxfer.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	69
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	70 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	71 #include <dcmtk/dcmdata/dcvras.h>
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	72 #include <dcmtk/dcmdata/dcvrat.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	73 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	74 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	75 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	76 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	79 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	80 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	81 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	82 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	83 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	86 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	87 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	88 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	91 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92
3209 f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	93 #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	94 # 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	95 # 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	96 #endif
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3199 diff changeset	97
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	98 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
5273 7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	99 # if !defined(ORTHANC_FRAMEWORK_INCLUDE_RESOURCES) \|\| (ORTHANC_FRAMEWORK_INCLUDE_RESOURCES == 1)
7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	100 # include <OrthancFrameworkResources.h>
7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	101 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	102 #endif
682 efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 677 diff changeset	103
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	104 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	105 # 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	106 # 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	107 # include <dcmtk/dcmjpeg/djencode.h>
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	108 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	109 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	110
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	111 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	112 # 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	113 # 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	114 # include <dcmtk/dcmjpls/djencode.h>
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	115 # endif
1930 1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	116 #endif
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	117
1c147c3c3121 fix static builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	118
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	119 #include <dcmtk/dcmdata/dcrledrg.h>
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	120 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	121 # include <dcmtk/dcmdata/dcrleerg.h>
3765 4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	122 # 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	123 #endif
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	124
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	125
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	126 static bool hasExternalDictionaries_ = false;
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	127
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	128
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	129 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 {
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	131 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	132 {
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	133 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	134 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	135 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	136 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	137 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	138 }
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	139
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	140
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	141 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	142 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary,
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	143 FrameworkResources::FileResourceId resource)
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	144 {
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	145 std::string content;
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	146 FrameworkResources::GetFileResource(content, resource);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	147
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	148 #if ORTHANC_SANDBOXED == 0
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	149 TemporaryFile tmp;
2017 08ce34cfacad refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	150 tmp.Write(content);
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	151
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	152 if (!dictionary.loadDictionary(tmp.GetPath().c_str()))
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	153 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	154 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	155 "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	156 "your TEMP directory does not contain special characters.");
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	157 }
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	158 #else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	159 if (!dictionary.loadFromMemory(content))
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	160 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	161 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	162 "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	163 "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	164 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	165 #endif
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	166 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	167 #endif
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	168
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	169
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	170 namespace
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	171 {
4030 100fbe970762 DANGEROUS commit: removing HAS_EMBEDDED_RESOURCES Sebastien Jodogne <s.jodogne@gmail.com> parents: 4016 diff changeset	172 class DictionaryLocker : public boost::noncopyable
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	173 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	174 private:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	175 DcmDataDictionary& dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	176
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	177 public:
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	178 DictionaryLocker() : dictionary_(dcmDataDict.wrlock())
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	179 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	180 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	181
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	182 ~DictionaryLocker()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	183 {
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	184 #if DCMTK_VERSION_NUMBER >= 364
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	185 dcmDataDict.wrunlock();
c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	186 #else
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	187 dcmDataDict.unlock();
3117 c8b75e207a82 working on dcmtk 3.6.4 compatibility jodogne parents: 3060 diff changeset	188 #endif
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	189 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	190
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	191 DcmDataDictionary& operator*()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	192 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	193 return dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	194 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	195
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	196 DcmDataDictionary* operator->()
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	197 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	198 return &dictionary_;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	199 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	200 };
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	201
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	202
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	203 ORTHANC_FORCE_INLINE
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	204 static std::string FloatToString(float v)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	205 {
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	206 /**
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	207 * From "boost::lexical_cast" documentation: "For more involved
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	208 * conversions, such as where precision or formatting need tighter
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	209 * control than is offered by the default behavior of
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	210 * lexical_cast, the conventional stringstream approach is
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	211 * recommended."
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	212 * https://www.boost.org/doc/libs/1_65_0/doc/html/boost_lexical_cast.html
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	213 * http://www.gotw.ca/publications/mill19.htm
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	214 *
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	215 * The precision of 17 corresponds to "defaultRealPrecision" in JsonCpp:
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	216 * https://github.com/open-source-parsers/jsoncpp/blob/master/include/json/value.h
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	217 **/
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	218
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	219 //return boost::lexical_cast<std::string>(v); // This was used in Orthanc <= 1.9.0
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	220
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	221 std::ostringstream ss;
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	222 ss << std::setprecision(17) << v;
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	223 return ss.str();
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	224 }
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	225
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	226
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	227 ORTHANC_FORCE_INLINE
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	228 static std::string DoubleToString(double v)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	229 {
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	230 //return boost::lexical_cast<std::string>(v); // This was used in Orthanc <= 1.9.0
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	231
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	232 std::ostringstream ss;
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	233 ss << std::setprecision(17) << v;
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	234 return ss.str();
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	235 }
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	236
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	237
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	238 #define DCMTK_TO_CTYPE_CONVERTER(converter, cType, dcmtkType, getter, toStringFunction) \
3594 0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	239 \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	240 struct converter \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	241 { \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	242 typedef cType CType; \
0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	243 \
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	244 ORTHANC_FORCE_INLINE \
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	245 static bool Apply(CType& result, \
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	246 DcmElement& element, \
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	247 size_t i) \
3594 0654d0838de8 disable thread support in DCMTK if wasm/asm.js Sebastien Jodogne <s.jodogne@gmail.com> parents: 3577 diff changeset	248 { \
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	249 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	250 } \
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	251 \
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	252 ORTHANC_FORCE_INLINE \
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	253 static std::string ToString(CType value) \
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	254 { \
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	255 return toStringFunction(value); \
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	256 } \
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	257 };
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	258
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	259 DCMTK_TO_CTYPE_CONVERTER(DcmtkToSint32Converter, Sint32, DcmSignedLong, getSint32, boost::lexical_cast<std::string>)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	260 DCMTK_TO_CTYPE_CONVERTER(DcmtkToSint16Converter, Sint16, DcmSignedShort, getSint16, boost::lexical_cast<std::string>)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	261 DCMTK_TO_CTYPE_CONVERTER(DcmtkToUint32Converter, Uint32, DcmUnsignedLong, getUint32, boost::lexical_cast<std::string>)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	262 DCMTK_TO_CTYPE_CONVERTER(DcmtkToUint16Converter, Uint16, DcmUnsignedShort, getUint16, boost::lexical_cast<std::string>)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	263 DCMTK_TO_CTYPE_CONVERTER(DcmtkToFloat32Converter, Float32, DcmFloatingPointSingle, getFloat32, FloatToString)
8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	264 DCMTK_TO_CTYPE_CONVERTER(DcmtkToFloat64Converter, Float64, DcmFloatingPointDouble, getFloat64, DoubleToString)
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	265
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	266
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	267 template <typename F>
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	268 static DicomValue* ApplyDcmtkToCTypeConverter(DcmElement& element)
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	269 {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	270 F f;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	271 typename F::CType value;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	272
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	273 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	274 && (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	275 {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	276 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	277 std::vector<std::string> strings;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	278 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	279 if (f.Apply(value, element, i)) {
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	280 strings.push_back(F::ToString(value));
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	281 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	282 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	283 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	284 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	285 else if (f.Apply(value, element, 0)) {
4515 8734caa12448 Improved precision of floating-point numbers in DICOM-as-JSON and DICOM summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	286 return new DicomValue(F::ToString(value), false);
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	287 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	288 else {
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	289 return new DicomValue;
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	290 }
ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	291 }
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	292 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	293
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	294
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	295 void FromDcmtkBridge::InitializeDictionary(bool loadPrivateDictionary)
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	296 {
5105 9fd4e12efabc typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 5050 diff changeset	297 CLOG(INFO, DICOM) << "Using DCMTK version: " << DCMTK_VERSION_NUMBER;
2296 17e8e8e1ff3d log dcmtk version Sebastien Jodogne <s.jodogne@gmail.com> parents: 2287 diff changeset	298
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	299 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	300 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	301 DictionaryLocker locker;
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	302
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	303 locker->clear();
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	304
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	305 CLOG(INFO, DICOM) << "Loading the embedded dictionaries";
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	306 /**
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	307 * 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	308 * 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	309 * dictionary is not loaded by storescu.
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	310 **/
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	311 //LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICONDE);
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	312
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	313 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICOM);
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	314
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	315 if (loadPrivateDictionary)
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	316 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	317 CLOG(INFO, DICOM) << "Loading the embedded dictionary of private tags";
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	318 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_PRIVATE);
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	319 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	320 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	321 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	322 CLOG(INFO, DICOM) << "The dictionary of private tags has not been loaded";
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	323 }
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	324 }
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	325 #else
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	326 {
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	327 std::vector<std::string> dictionaries;
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	328
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	329 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	330 if (env != NULL)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	331 {
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	332 // This mimics the behavior of DCMTK:
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	333 // 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	334 #if defined(_WIN32)
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	335 Toolbox::TokenizeString(dictionaries, std::string(env), ';');
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	336 #else
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	337 Toolbox::TokenizeString(dictionaries, std::string(env), ':');
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	338 #endif
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	339 }
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	340 else
8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	341 {
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	342 boost::filesystem::path base = DCMTK_DICTIONARY_DIR;
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	343 dictionaries.push_back((base / "dicom.dic").string());
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	344
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	345 if (loadPrivateDictionary)
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	346 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	347 dictionaries.push_back((base / "private.dic").string());
3302 8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	348 }
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	349 }
8ed445e94486 Fix issue #126 (Orthanc and DCMDICTPATH) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	350
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	351 LoadExternalDictionaries(dictionaries);
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	352 hasExternalDictionaries_ = false; // Fix the side-effect of "LoadExternalDictionaries()"
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	353 }
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	354 #endif
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	355
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	356 /* make sure data dictionary is loaded */
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	357 if (!dcmDataDict.isDictionaryLoaded())
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	358 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	359 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	360 "No DICOM dictionary loaded, check environment variable: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	361 std::string(DCM_DICT_ENVIRONMENT_VARIABLE));
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	362 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	363
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	364 {
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	365 // Test the dictionary with a simple DICOM tag
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	366 DcmTag key(0x0010, 0x1030); // This is PatientWeight
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	367 if (key.getEVR() != EVR_DS)
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	368 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	369 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	370 "The DICOM dictionary has not been correctly read");
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	371 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	372 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	373 }
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	374
d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1655 diff changeset	375
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	376 void FromDcmtkBridge::LoadExternalDictionaries(const std::vector<std::string>& dictionaries)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	377 {
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	378 DictionaryLocker locker;
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	379
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	380 CLOG(INFO, DICOM) << "Clearing the DICOM dictionary";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	381 locker->clear();
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	382
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	383 for (size_t i = 0; i < dictionaries.size(); i++)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	384 {
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	385 LOG(WARNING) << "Loading external DICOM dictionary: \"" << dictionaries[i] << "\"";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	386
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	387 if (!locker->loadDictionary(dictionaries[i].c_str()))
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	388 {
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	389 throw OrthancException(ErrorCode_InexistentFile);
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	390 }
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	391 }
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	392
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	393 hasExternalDictionaries_ = true;
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	394 }
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	395
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	396
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	397 void FromDcmtkBridge::RegisterDictionaryTag(const DicomTag& tag,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	398 ValueRepresentation vr,
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	399 const std::string& name,
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	400 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	401 unsigned int maxMultiplicity,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	402 const std::string& privateCreator)
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	403 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	404 if (minMultiplicity < 1)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	405 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	406 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	407 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	408
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	409 bool arbitrary = false;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	410 if (maxMultiplicity == 0)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	411 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	412 maxMultiplicity = DcmVariableVM;
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	413 arbitrary = true;
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	414 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	415 else if (maxMultiplicity < minMultiplicity)
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	416 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	417 throw OrthancException(ErrorCode_ParameterOutOfRange);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	418 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	419
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	420 DcmEVR evr = ToDcmtkBridge::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	421
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	422 CLOG(INFO, DICOM) << "Registering tag in dictionary: (" << tag.Format() << ") "
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	423 << (DcmVR(evr).getValidVRName()) << " "
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	424 << name << " (multiplicity: " << minMultiplicity << "-"
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	425 << (arbitrary ? "n" : boost::lexical_cast<std::string>(maxMultiplicity)) << ")";
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	426
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	427 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	428 if (privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	429 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	430 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	431 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	432 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	433 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	434 "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	435 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	436 LOG(WARNING) << buf;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	437 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	438
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	439 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	440 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	441 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	442 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	443 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	444 NULL /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	445 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	446 NULL /* private creator */));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	447 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	448 else
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	449 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	450 // "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	451 // (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	452 // (FFFF,eeee)."
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	453 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	454 tag.GetGroup() == 0x0001 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	455 tag.GetGroup() == 0x0003 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	456 tag.GetGroup() == 0x0005 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	457 tag.GetGroup() == 0x0007 \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	458 tag.GetGroup() == 0xffff)
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	459 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	460 char buf[128];
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	461 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	462 tag.GetGroup(), tag.GetElement());
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	463 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	464 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	465
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	466 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	467 tag.GetElement(),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	468 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	469 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	470 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	471 "private" /* version */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	472 OFTrue /* doCopyString */,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	473 privateCreator.c_str()));
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	474 }
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	475
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	476 entry->setGroupRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	477 entry->setElementRangeRestriction(DcmDictRange_Unspecified);
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	478
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	479 {
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	480 DictionaryLocker locker;
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	481
4695 651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	482 if (locker->findEntry(DcmTagKey(tag.GetGroup(), tag.GetElement()),
651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	483 privateCreator.empty() ? NULL : privateCreator.c_str()))
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	484 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	485 throw OrthancException(ErrorCode_AlreadyExistingTag,
4695 651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	486 "Cannot register twice the tag (" + tag.Format() +
651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	487 "), whose symbolic name is \"" + name + "\"");
2116 2fabd1073728 prevent registering two tags with the same symbolic name Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	488 }
4695 651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	489 else
651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	490 {
651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	491 locker->addEntry(entry.release());
651f069c7f77 fix error if overriding existing tag in the DICOM dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	492 }
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	493 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	494 }
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	495
5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	496
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	497 Encoding FromDcmtkBridge::DetectEncoding(bool& hasCodeExtensions,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	498 DcmItem& dataset,
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	499 Encoding defaultEncoding)
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	500 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	501 // 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	502
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	503 OFString tmp;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	504 if (dataset.findAndGetOFStringArray(DCM_SpecificCharacterSet, tmp).good())
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	505 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	506 std::vector<std::string> tokens;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	507 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	508
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	509 hasCodeExtensions = (tokens.size() > 1);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	510
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	511 for (size_t i = 0; i < tokens.size(); i++)
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	512 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	513 std::string characterSet = Toolbox::StripSpaces(tokens[i]);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	514
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	515 if (!characterSet.empty())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	516 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	517 Encoding encoding;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	518
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	519 if (GetDicomEncoding(encoding, characterSet.c_str()))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	520 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	521 // 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	522 return encoding;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	523 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	524 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	525 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	526 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	527 << ", fallback to ASCII (remove all special characters)";
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	528 return Encoding_Ascii;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	529 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	530 }
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	531 }
63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	532 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	533 else
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	534 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	535 hasCodeExtensions = false;
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	536 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	537
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	538 // 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	539 return defaultEncoding;
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	540 }
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	541
2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	542
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	543 Encoding FromDcmtkBridge::DetectEncoding(DcmItem &dataset,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	544 Encoding defaultEncoding)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	545 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	546 bool hasCodeExtensions; // ignored
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	547 return DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	548 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	549
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	550
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	551 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
2125 b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	552 DcmItem& dataset,
b9bd52c72ba2 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2116 diff changeset	553 unsigned int maxStringLength,
3577 33cfcc74d1b1 argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3448 diff changeset	554 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 {
4137 6774605d4341 keep only one signature for FromDcmtkBridge::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4136 diff changeset	556 const Encoding defaultEncoding = GetDefaultDicomEncoding();
6774605d4341 keep only one signature for FromDcmtkBridge::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4136 diff changeset	557
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	558 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	559 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	560
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	567 target.SetValueInternal(element->getTag().getGTag(),
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	568 element->getTag().getETag(),
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	569 ConvertLeafElement(*element, DicomToJsonFlags_Default,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	570 maxStringLength, encoding, hasCodeExtensions, ignoreTagLength));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 }
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	572 else
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	573 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	574 DcmSequenceOfItems* sequence = dynamic_cast<DcmSequenceOfItems*>(element);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	575
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	576 if (sequence)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	577 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	578 Json::Value jsonSequence = Json::arrayValue;
5050 ea9e2680da6f CPP check and cleanup Alain Mazy <am@osimis.io> parents: 5044 diff changeset	579 for (unsigned long s = 0; s < sequence->card(); s++)
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	580 {
5050 ea9e2680da6f CPP check and cleanup Alain Mazy <am@osimis.io> parents: 5044 diff changeset	581 DcmItem* child = sequence->getItem(s);
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	582 Json::Value& v = jsonSequence.append(Json::objectValue);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	583 DatasetToJson(v, *child, DicomToJsonFormat_Full, DicomToJsonFlags_Default,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	584 maxStringLength, encoding, hasCodeExtensions,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	585 ignoreTagLength, 1);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	586 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	587
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	588 target.SetValue(DicomTag(element->getTag().getGTag(), element->getTag().getETag()),
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	589 jsonSequence);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	590 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	591 }
0 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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	596 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	597 {
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	598 return DicomTag(tag.getGTag(), tag.getETag());
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	599 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	600
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	601
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	608 static DicomValue* CreateValueFromUtf8String(const DicomTag& tag,
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	609 const std::string& utf8,
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	610 unsigned int maxStringLength,
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	611 const std::set<DicomTag>& ignoreTagLength)
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	612 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	613 if (maxStringLength != 0 &&
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	614 utf8.size() > maxStringLength &&
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	615 ignoreTagLength.find(tag) == ignoreTagLength.end())
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	616 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	617 return new DicomValue; // Too long, create a NULL value
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	618 }
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	619 else
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	620 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	621 return new DicomValue(utf8, false);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	622 }
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	623 }
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	624
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	625
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 949 diff changeset	626 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	627 DicomToJsonFlags flags,
1929 cda5b0ab4ce5 ORTHANC_MAXIMUM_TAG_LENGTH made explicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	628 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	629 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	630 bool hasCodeExtensions,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	631 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	635 // This function is only applicable to leaf elements
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	636 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	640 char *c = NULL;
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	641 if (element.isaString() &&
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	642 element.getString(c).good())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	644 if (c == NULL) // This case corresponds to the empty string
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	645 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	646 return new DicomValue("", false);
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	647 }
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	648 else
e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	649 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	650 const std::string s(c);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	651 const std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	652 return CreateValueFromUtf8String(GetTag(element), utf8, maxStringLength, ignoreTagLength);
1854 e2c3d752ee1a prevent too long tags to be inserted Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	653 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656
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	657
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	658 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	659 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	660 /**
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	661 * Unknown value representation: Lookup in the dictionary. This
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	662 * is notably the case for private tags registered with the
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	663 * "Dictionary" configuration option, or for public tags with
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	664 * "EVR_UN" in the case of Little Endian Implicit transfer
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	665 * syntax (cf. DICOM CP 246).
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	666 * ftp://medical.nema.org/medical/dicom/final/cp246_ft.pdf
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	667 **/
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	668 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	669
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	670 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	671 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	672 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	673 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	674 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	675 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	676
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	677 if (element.getUint8Array(data) == EC_Normal)
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	678 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	679 Uint32 length = element.getLength();
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	680
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	681 if (data == NULL \|\|
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	682 length == 0)
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	683 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	684 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	685 }
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	686
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	687 // Remove the trailing padding, if any
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	688 if (length > 0 &&
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	689 length % 2 == 0 &&
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	690 data[length - 1] == '\0')
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	691 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	692 length = length - 1;
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	693 }
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	694
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	695 if (element.getTag().isPrivate())
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	696 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	697 // For private tags, we do not try and convert to UTF-8,
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	698 // as nothing ensures that the encoding of the private tag
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	699 // is the same as that of the remaining of the DICOM
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	700 // dataset. Only go for ASCII strings.
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	701 if (Toolbox::IsAsciiString(data, length))
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	702 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	703 const std::string s(reinterpret_cast<const char*>(data), length);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	704 return CreateValueFromUtf8String(GetTag(element), s, maxStringLength, ignoreTagLength);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	705 }
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	706 else
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	707 {
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	708 // Not a plain ASCII string: Consider it as a binary
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	709 // value that is handled in the switch-case below
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	710 }
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	711 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	712 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	713 {
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	714 // For public tags, convert to UTF-8 by using the
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	715 // "SpecificCharacterSet" tag, if present. This branch is
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	716 // new in Orthanc 1.9.1 (cf. DICOM CP 246).
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	717 const std::string s(reinterpret_cast<const char*>(data), length);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	718 const std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4516 diff changeset	719 return CreateValueFromUtf8String(GetTag(element), utf8, maxStringLength, ignoreTagLength);
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	720 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	721 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	722 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	723 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	724
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	725
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 /**
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	733 * Deal with binary data (including PixelData).
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	735
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	736 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	737 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	738 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	739 case EVR_UN: // unknown value representation
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	740 case EVR_ox: // OB or OW depending on context
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	741 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	742 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	743 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	744 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	745 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	746 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	747 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	748 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	749 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	750 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	751 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	752 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	753 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	754 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	755 case EVR_UI: // unique identifier
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	756 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	757 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	758 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	759 if (!(flags & DicomToJsonFlags_ConvertBinaryToNull))
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	760 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	761 Uint8* data = NULL;
4845 02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	762 Uint16* data16 = NULL;
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	763 if (element.getUint8Array(data) == EC_Normal)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	764 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	765 return new DicomValue(reinterpret_cast<const char*>(data), element.getLength(), true);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	766 }
4845 02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	767 else if (element.getUint16Array(data16) == EC_Normal)
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	768 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	769 return new DicomValue(reinterpret_cast<const char*>(data16), element.getLength(), true);
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	770 }
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	771 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	773 return new DicomValue;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	774 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	775
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	776 /**
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	777 * Numeric types
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	778 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	780 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	781 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	782 return ApplyDcmtkToCTypeConverter<DcmtkToSint32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	783 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	784
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	785 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	786 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	787 return ApplyDcmtkToCTypeConverter<DcmtkToSint16Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	788 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	789
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	790 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	791 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	792 return ApplyDcmtkToCTypeConverter<DcmtkToUint32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	793 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	794
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	795 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	796 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	797 return ApplyDcmtkToCTypeConverter<DcmtkToUint16Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	798 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	799
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	800 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	801 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	802 return ApplyDcmtkToCTypeConverter<DcmtkToFloat32Converter>(element);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	803 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	804
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	805 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	806 {
2554 ea63d9f90377 /tags now returns multiple numerical values in a \ separated string am@osimis.io parents: 2528 diff changeset	807 return ApplyDcmtkToCTypeConverter<DcmtkToFloat64Converter>(element);
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	808 }
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	809
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	810
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	811 /**
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	812 * Attribute tag.
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	813 **/
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	814
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	815 case EVR_AT:
ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	816 {
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	817 DcmTagKey tag;
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	818 if (dynamic_cast<DcmAttributeTag&>(element).getTagVal(tag, 0).good())
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	819 {
ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	820 DicomTag t(tag.getGroup(), tag.getElement());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	821 return new DicomValue(t.Format(), false);
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	822 }
1131 ac6bd50a8c83 fix issue 16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1093 diff changeset	823 else
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	824 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	825 return new DicomValue;
1147 ae9a83a6fa47 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 1131 diff changeset	826 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	827 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	831 * 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	832 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	833 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	835 case EVR_SQ: // sequence of items
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	836 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	839 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	840 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	841 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	843 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	844 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	845 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	846 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	847 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	848 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	849 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	850 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	851 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	852 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	853 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	854 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	855 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	856 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	857 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	860 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	861 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	862 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	864 default:
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	865 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	868 catch (boost::bad_lexical_cast&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	870 return new DicomValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	872 catch (std::bad_cast&)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	873 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	874 return new DicomValue;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	875 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	879 static Json::Value& PrepareNode(Json::Value& parent,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	880 DcmElement& element,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	881 DicomToJsonFormat format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882 {
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	883 assert(parent.type() == Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	885 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	886 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	887
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	888 if (format == DicomToJsonFormat_Short)
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	889 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	890 parent[formattedTag] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	891 return parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	892 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	893
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	894 // 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	895 std::string tagName = FromDcmtkBridge::GetTagName(element);
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	896
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	897 switch (format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 {
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	899 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	900 parent[tagName] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	901 return parent[tagName];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	902
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	903 case DicomToJsonFormat_Full:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	904 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	905 parent[formattedTag] = Json::objectValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	906 Json::Value& node = parent[formattedTag];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	907
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	908 if (element.isLeaf())
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	909 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	910 node["Name"] = tagName;
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	911
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	912 if (element.getTag().getPrivateCreator() != NULL)
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	913 {
2076 ec2ad6ac741e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2074 diff changeset	914 node["PrivateCreator"] = element.getTag().getPrivateCreator();
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	915 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	916
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	917 return node;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	918 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	919 else
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	920 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	921 node["Name"] = tagName;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	922 node["Type"] = "Sequence";
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	923 node["Value"] = Json::nullValue;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	924 return node["Value"];
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	925 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	926 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	927
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	928 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	929 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	930 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	931 }
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	932
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	933
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	934 static void LeafValueToJson(Json::Value& target,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	935 const DicomValue& value,
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	936 DicomToJsonFormat format,
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	937 DicomToJsonFlags flags,
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	938 unsigned int maxStringLength)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	939 {
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	940 Json::Value* targetValue = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	941 Json::Value* targetType = NULL;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	942
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	943 switch (format)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	944 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	945 case DicomToJsonFormat_Short:
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1854 diff changeset	946 case DicomToJsonFormat_Human:
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	947 {
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	948 assert(target.type() == Json::nullValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	949 targetValue = &target;
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	950 break;
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	951 }
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	952
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	953 case DicomToJsonFormat_Full:
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	955 assert(target.type() == Json::objectValue);
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	956 target["Value"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	957 target["Type"] = Json::nullValue;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	958 targetType = &target["Type"];
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	959 targetValue = &target["Value"];
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	960 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 }
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	962
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	963 default:
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	964 throw OrthancException(ErrorCode_ParameterOutOfRange);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	965 }
1738 15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	966
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	967 assert(targetValue != NULL);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	968 assert(targetValue->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	969 assert(targetType == NULL \|\| targetType->type() == Json::nullValue);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	970
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	971 if (value.IsNull())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	972 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	973 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	974 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	975 *targetType = "Null";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	976 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	977 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	978 else if (value.IsBinary())
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	979 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	980 if (flags & DicomToJsonFlags_ConvertBinaryToAscii)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	981 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	982 *targetValue = Toolbox::ConvertToAscii(value.GetContent());
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	983 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	984 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	985 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	986 std::string s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	987 value.FormatDataUriScheme(s);
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	988 *targetValue = s;
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	989 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	990
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	991 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	992 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	993 *targetType = "Binary";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	994 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	995 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	996 else if (maxStringLength == 0 \|\|
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	997 value.GetContent().size() <= maxStringLength)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	998 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	999 *targetValue = value.GetContent();
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1000
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1001 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1002 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1003 *targetType = "String";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1004 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1005 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1006 else
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1007 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1008 if (targetType != NULL)
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1009 {
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1010 *targetType = "TooLong";
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1011 }
15a788a63846 DicomToJsonFlags_IncludeBinary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	1012 }
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1013 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1014
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1015
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1016 void FromDcmtkBridge::ElementToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1017 DcmElement& element,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1018 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1019 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1020 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1021 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1022 bool hasCodeExtensions,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1023 const std::set<DicomTag>& ignoreTagLength,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1024 unsigned int depth)
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1025 {
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1026 if (parent.type() == Json::nullValue)
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1027 {
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1028 parent = Json::objectValue;
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1029 }
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1030
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	1031 assert(parent.type() == Json::objectValue);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1032 Json::Value& target = PrepareNode(parent, element, format);
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1033
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1034 if (element.isLeaf())
4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1035 {
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	1036 // 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	1037 std::unique_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1038 (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	1039
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1040 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	1041 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1042 LeafValueToJson(target, *v, format, flags, maxStringLength);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1043 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1044 else
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1045 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1046 LeafValueToJson(target, *v, format, flags, 0);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1047 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	1051 assert(target.type() == Json::nullValue);
27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	1052 target = Json::arrayValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1056 // etc. are not." The following dynamic_cast is thus OK.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 DcmItem* child = sequence.getItem(i);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1062 Json::Value& v = target.append(Json::objectValue);
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1063 DatasetToJson(v, *child, format, flags, maxStringLength, encoding, hasCodeExtensions,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1064 ignoreTagLength, depth + 1);
1687 4d80fc990dae refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1686 diff changeset	1065 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1070 void FromDcmtkBridge::DatasetToJson(Json::Value& parent,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1071 DcmItem& item,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1072 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1073 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1074 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1075 Encoding encoding,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1076 bool hasCodeExtensions,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1077 const std::set<DicomTag>& ignoreTagLength,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1078 unsigned int depth)
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1079 {
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	1080 assert(parent.type() == Json::objectValue);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1081
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1082 for (unsigned long i = 0; i < item.card(); i++)
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1083 {
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1084 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	1085 if (element == NULL)
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1086 {
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1087 throw OrthancException(ErrorCode_InternalError);
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1088 }
a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1089
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1090 DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1091
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1092 // New flag in Orthanc 1.9.1
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1093 if (depth == 0 &&
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1094 (flags & DicomToJsonFlags_StopAfterPixelData) &&
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1095 tag > DICOM_TAG_PIXEL_DATA)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1096 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1097 continue;
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1098 }
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1099
4516 671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1100 // New flag in Orthanc 1.9.1
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1101 if ((flags & DicomToJsonFlags_SkipGroupLengths) &&
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1102 tag.GetElement() == 0x0000)
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1103 {
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1104 continue;
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1105 }
671ee7c1fd46 added DicomToJsonFlags_SkipGroupLengths Sebastien Jodogne <s.jodogne@gmail.com> parents: 4515 diff changeset	1106
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1107 /element->getTag().isPrivate()/
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1108 if (tag.IsPrivate() &&
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1109 !(flags & DicomToJsonFlags_IncludePrivateTags))
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1110 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1111 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1112 }
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1113
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1114 if (!(flags & DicomToJsonFlags_IncludeUnknownTags))
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1115 {
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1116 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	1117 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	1118 {
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1119 continue;
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1120 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	1121 }
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	1122
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	1123 if (IsBinaryTag(element->getTag()))
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1124 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1125 // This is a binary tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1126 if ((tag == DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludePixelData)) \|\|
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1127 (tag != DICOM_TAG_PIXEL_DATA && !(flags & DicomToJsonFlags_IncludeBinary)))
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1128 {
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1129 continue;
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1130 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1131 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1738 diff changeset	1132
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1133 FromDcmtkBridge::ElementToJson(parent, *element, format, flags, maxStringLength, encoding,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1134 hasCodeExtensions, ignoreTagLength, depth);
1686 14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1135 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1136 }
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1137
14a32b2fa63e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1657 diff changeset	1138
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1139 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1140 DcmDataset& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1141 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1142 DicomToJsonFlags flags,
2131 bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	1143 unsigned int maxStringLength,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1144 const std::set<DicomTag>& ignoreTagLength)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 {
4140 0ddc5297a8ab centralization of default parameters for JSON/DicomMap conversions from DCMTK Sebastien Jodogne <s.jodogne@gmail.com> parents: 4137 diff changeset	1146 const Encoding defaultEncoding = GetDefaultDicomEncoding();
0ddc5297a8ab centralization of default parameters for JSON/DicomMap conversions from DCMTK Sebastien Jodogne <s.jodogne@gmail.com> parents: 4137 diff changeset	1147
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1148 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1149 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1150
1688 27d70e9ee2e4 DicomToJsonFormat enumeration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1687 diff changeset	1151 target = Json::objectValue;
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1152 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1153 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1154
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1155
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1156 void FromDcmtkBridge::ExtractHeaderAsJson(Json::Value& target,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1157 DcmMetaInfo& dataset,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1158 DicomToJsonFormat format,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1159 DicomToJsonFlags flags,
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2125 diff changeset	1160 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	1161 {
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1162 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	1163 target = Json::objectValue;
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4501 diff changeset	1164 DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii, false, ignoreTagLength, 0);
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1165 }
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1166
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	1167
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1168 static std::string GetTagNameInternal(DcmTag& tag)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1170 if (!hasExternalDictionaries_)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1171 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1172 /**
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1173 * Some patches for important tags because of different DICOM
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1174 * dictionaries between DCMTK versions. Since Orthanc 1.9.4, we
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1175 * don't apply these patches if external dictionaries are
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1176 * loaded, notably for compatibility with DICONDE. In Orthanc <=
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1177 * 1.9.3, this was done by method "DicomTag::GetMainTagsName()".
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1178 **/
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1179
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1180 DicomTag tmp(tag.getGroup(), tag.getElement());
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1181
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1182 if (tmp == DICOM_TAG_ACCESSION_NUMBER)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1183 return "AccessionNumber";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1184
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1185 if (tmp == DICOM_TAG_SOP_INSTANCE_UID)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1186 return "SOPInstanceUID";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1187
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1188 if (tmp == DICOM_TAG_PATIENT_ID)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1189 return "PatientID";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1190
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1191 if (tmp == DICOM_TAG_SERIES_INSTANCE_UID)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1192 return "SeriesInstanceUID";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1193
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1194 if (tmp == DICOM_TAG_STUDY_INSTANCE_UID)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1195 return "StudyInstanceUID";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1196
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1197 if (tmp == DICOM_TAG_PIXEL_DATA)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1198 return "PixelData";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1199
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1200 if (tmp == DICOM_TAG_IMAGE_INDEX)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1201 return "ImageIndex";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1202
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1203 if (tmp == DICOM_TAG_INSTANCE_NUMBER)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1204 return "InstanceNumber";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1205
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1206 if (tmp == DICOM_TAG_NUMBER_OF_SLICES)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1207 return "NumberOfSlices";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1208
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1209 if (tmp == DICOM_TAG_NUMBER_OF_FRAMES)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1210 return "NumberOfFrames";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1211
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1212 if (tmp == DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1213 return "CardiacNumberOfImages";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1214
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1215 if (tmp == DICOM_TAG_IMAGES_IN_ACQUISITION)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1216 return "ImagesInAcquisition";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1217
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1218 if (tmp == DICOM_TAG_PATIENT_NAME)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1219 return "PatientName";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1220
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1221 if (tmp == DICOM_TAG_IMAGE_POSITION_PATIENT)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1222 return "ImagePositionPatient";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1223
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1224 if (tmp == DICOM_TAG_IMAGE_ORIENTATION_PATIENT)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1225 return "ImageOrientationPatient";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1226
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1227 // New in Orthanc 1.6.0, as tagged as "RETIRED_" since DCMTK 3.6.4
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1228 if (tmp == DICOM_TAG_OTHER_PATIENT_IDS)
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1229 return "OtherPatientIDs";
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1230
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1231 // End of patches
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1232 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1233
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1234 #if 0
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1235 // This version explicitly calls the dictionary
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1238
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1239 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1240 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1241 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1247 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1248 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1249 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1250 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1251 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1252 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1253 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1254 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1255 return std::string(name);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1256 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1257 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260
5151 a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1261 static bool GetTagFromNameInternal(DicomTag& tag, const std::string& tagName)
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1262 {
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1263 // conversion from old tag names (ex: RETIRED_OtherPatientIDs is the new name for OtherPatientIDs that is still a valid name for DICOM_TAG_OTHER_PATIENT_IDS)
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1264 if (tagName == "OtherPatientIDs")
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1265 {
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1266 tag = DICOM_TAG_OTHER_PATIENT_IDS;
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1267 return true;
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1268 }
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1269
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1270 return false;
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1271 }
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1272
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1273 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	1274 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	1275 {
5151 a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1276
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1277 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	1278
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1279 if (!privateCreator.empty())
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1280 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1281 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	1282 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1283
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1284 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1285 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1286
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1287
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1288 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	1289 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1290 // 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	1291 // 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	1292 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	1293
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1294 return GetTagNameInternal(tag);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1295 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1296
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1297 std::string FromDcmtkBridge::GetTagName(const DicomElement &element)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1298 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1299 return GetTagName(element.GetTag(), "");
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1300 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1301
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1302
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2076 diff changeset	1303
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1304 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1305 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1306 DicomTag parsed(0, 0);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1307 if (DicomTag::ParseHexadecimal(parsed, name))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1308 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2554 diff changeset	1309 return parsed;
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1310 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	1311
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1312 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1313 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1316 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1317 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1318 dcmDataDict.unlock();
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	1319 throw OrthancException(ErrorCode_UnknownDicomTag);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1322 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1323 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1324 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1326 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1327 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1328 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1329 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1330 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1331 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1332 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1333 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1334 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1335 {
5151 a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1336 DicomTag dcmTag(0, 0);
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1337 if (GetTagFromNameInternal(dcmTag, name))
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1338 {
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1339 return dcmTag;
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1340 }
a72e00a23191 allow OtherPatientIDs as a valid tag name as an input since this name is still used in outputs Alain Mazy <am@osimis.io> parents: 5105 diff changeset	1341
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1342 CLOG(INFO, DICOM) << "Unknown DICOM tag: \"" << name << "\"";
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1343 throw OrthancException(ErrorCode_UnknownDicomTag, name, false);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1344 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1345 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1348 DicomTag FromDcmtkBridge::ParseTag(const std::string &name)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1349 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1350 return ParseTag(name.c_str());
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1351 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1352
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1353 bool FromDcmtkBridge::HasTag(const DicomMap &fields, const std::string &tagName)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1354 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1355 return fields.HasTag(ParseTag(tagName));
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1356 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1357
4941 96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1358 void FromDcmtkBridge::FormatListOfTags(std::string& output, const std::set<DicomTag>& tags)
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1359 {
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1360 std::set<std::string> values;
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1361 for (std::set<DicomTag>::const_iterator it = tags.begin();
4981 d0c34145320c cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4954 diff changeset	1362 it != tags.end(); ++it)
4941 96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1363 {
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1364 values.insert(it->Format());
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1365 }
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1366
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1367 Toolbox::JoinStrings(output, values, ";");
96a3e81eba90 performance warning Alain Mazy <am@osimis.io> parents: 4936 diff changeset	1368 }
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1369
4950 3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1370 void FromDcmtkBridge::FormatListOfTags(Json::Value& output, const std::set<DicomTag>& tags)
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1371 {
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1372 output = Json::arrayValue;
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1373 for (std::set<DicomTag>::const_iterator it = tags.begin();
4981 d0c34145320c cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4954 diff changeset	1374 it != tags.end(); ++it)
4950 3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1375 {
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1376 output.append(it->Format());
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1377 }
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1378 }
3778a0433dd3 new field 'MainDicomTags' in the /system response Alain Mazy <am@osimis.io> parents: 4941 diff changeset	1379
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1380 // parses a list like "0010,0010;PatientBirthDate;0020,0020"
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1381 void FromDcmtkBridge::ParseListOfTags(std::set<DicomTag>& result, const std::string& source)
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1382 {
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1383 result.clear();
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1384
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1385 std::vector<std::string> tokens;
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1386 Toolbox::TokenizeString(tokens, source, ';');
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1387
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1388 for (std::vector<std::string>::const_iterator it = tokens.begin();
4981 d0c34145320c cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4954 diff changeset	1389 it != tokens.end(); ++it)
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1390 {
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1391 if (it->size() > 0)
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1392 {
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1393 DicomTag tag = FromDcmtkBridge::ParseTag(*it);
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1394 result.insert(tag);
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1395 }
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1396 }
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1397 }
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1398
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1399
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1400 void FromDcmtkBridge::ParseListOfTags(std::set<DicomTag>& result, const Json::Value& source)
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1401 {
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1402 result.clear();
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1403
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1404 if (!source.isArray())
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1405 {
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1406 throw OrthancException(ErrorCode_BadRequest, "List of tags is not an array");
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1407 }
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1408
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1409 for (Json::ArrayIndex i = 0; i < source.size(); i++)
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1410 {
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1411 const std::string& value = source[i].asString();
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1412 DicomTag tag = FromDcmtkBridge::ParseTag(value);
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1413 result.insert(tag);
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1414 }
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1415 }
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	1416
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1417 const DicomValue &FromDcmtkBridge::GetValue(const DicomMap &fields,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1418 const std::string &tagName)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1419 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1420 return fields.GetValue(ParseTag(tagName));
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1421 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1422
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1423 void FromDcmtkBridge::SetValue(DicomMap &target,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1424 const std::string &tagName,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1425 DicomValue *value)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1426 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1427 const DicomTag tag = ParseTag(tagName);
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1428 target.SetValueInternal(tag.GetGroup(), tag.GetElement(), value);
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1429 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4200 diff changeset	1430
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1431
1655 e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1432 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	1433 {
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1434 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	1435 return tmp.isUnknownVR();
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1436 }
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1437
e40fd0d925c5 /tools/create-dicom can create tags with unknown VR Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	1438
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1439 void FromDcmtkBridge::ToJson(Json::Value& result,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1440 const DicomMap& values,
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1441 DicomToJsonFormat format)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1442 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1443 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1444 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1445 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1446 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1447
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1448 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1449
5287 c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1450 if (format == DicomToJsonFormat_DicomWeb)
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1451 {
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1452 DicomWebJsonVisitor visitor;
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1453
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1454 ParsedDicomFile dicom(values, Encoding_Utf8, true);
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1455 dicom.Apply(visitor);
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1456 result = visitor.GetResult();
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1457 return;
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1458 }
c04230962098 wip: 'dicomWeb' json format + 'include' get arguments Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1459
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1460 for (DicomMap::Content::const_iterator
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1461 it = values.content_.begin(); it != values.content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1462 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1463 switch (format)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1464 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1465 case DicomToJsonFormat_Human:
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1466 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1467 // TODO Inject PrivateCreator if some is available in the DicomMap?
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1468 const std::string tagName = GetTagName(it->first, "");
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1469
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1470 if (it->second->IsNull())
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1471 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1472 result[tagName] = Json::nullValue;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1473 }
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1474 else if (it->second->IsSequence())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1475 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1476 result[tagName] = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1477 const Json::Value& jsonSequence = it->second->GetSequenceContent();
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1478
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1479 for (Json::Value::ArrayIndex i = 0; i < jsonSequence.size(); ++i)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1480 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1481 Json::Value target = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1482 Toolbox::SimplifyDicomAsJson(target, jsonSequence[i], DicomToJsonFormat_Human);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1483 result[tagName].append(target);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1484 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1485 }
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1486 else
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1487 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1488 // TODO IsBinary
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1489 result[tagName] = it->second->GetContent();
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1490 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1491 break;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1492 }
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1493
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1494 case DicomToJsonFormat_Full:
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1495 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1496 // TODO Inject PrivateCreator if some is available in the DicomMap?
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1497 const std::string tagName = GetTagName(it->first, "");
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1498
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1499 Json::Value value = Json::objectValue;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1500
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1501 value["Name"] = tagName;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1502
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1503 if (it->second->IsNull())
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1504 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1505 value["Type"] = "Null";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1506 value["Value"] = Json::nullValue;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1507 }
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1508 else if (it->second->IsSequence())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1509 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1510 value["Type"] = "Sequence";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1511 value["Value"] = it->second->GetSequenceContent();
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1512 }
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1513 else
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1514 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1515 // TODO IsBinary
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1516 value["Type"] = "String";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1517 value["Value"] = it->second->GetContent();
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1518 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1519
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1520 result[it->first.Format()] = value;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1521 break;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1522 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1523
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1524 case DicomToJsonFormat_Short:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1525 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1526 const std::string hex = it->first.Format();
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1527
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1528 if (it->second->IsNull())
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1529 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1530 result[hex] = Json::nullValue;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1531 }
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1532 else if (it->second->IsSequence())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1533 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1534 result[hex] = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1535 const Json::Value& jsonSequence = it->second->GetSequenceContent();
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1536
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1537 for (Json::Value::ArrayIndex i = 0; i < jsonSequence.size(); ++i)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1538 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1539 Json::Value target = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1540 Toolbox::SimplifyDicomAsJson(target, jsonSequence[i], DicomToJsonFormat_Short);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1541 result[hex].append(target);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1542 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5011 diff changeset	1543 }
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1544 else
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1545 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1546 // TODO IsBinary
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1547 result[hex] = it->second->GetContent();
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1548 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1549
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1550 break;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1551 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1552
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1553 default:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4696 diff changeset	1554 throw OrthancException(ErrorCode_ParameterOutOfRange);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	1555 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1556 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1557 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1558
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1559
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1560 std::string FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType level)
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1561 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1562 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1563
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1564 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1565 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1566 case ResourceType_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1567 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1568 // 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	1569 // as a random PatientID.
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2499 diff changeset	1570 return Toolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1571
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1572 case ResourceType_Instance:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1573 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1574
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1575 case ResourceType_Series:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1576 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1577
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 784 diff changeset	1578 case ResourceType_Study:
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1579 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1580
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1581 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1582 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1583 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1584 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1585
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1586
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1587
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1588 static bool SaveToMemoryBufferInternal(std::string& buffer,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1589 DcmFileFormat& dicom,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1590 E_TransferSyntax xfer)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1591 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1592 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1593
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1594 // Create a memory buffer with the proper size
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1595 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1596 const uint32_t estimatedSize = dicom.calcElementLength(xfer, encodingType); // (*)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1597 buffer.resize(estimatedSize);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1598 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1599
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1600 DcmOutputBufferStream ob(&buffer[0], buffer.size());
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1601
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1602 // 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	1603 dicom.transferInit();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1604 OFCondition c = dicom.write(ob, xfer, encodingType, NULL,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1605 /opt_groupLength/ EGL_recalcGL,
3765 4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1606 /opt_paddingType/ EPD_noChange,
4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1607 /padlen/ 0, /subPadlen/ 0, /instanceLength/ 0,
4a25727401cd first transcoding to jpeg 8bpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3748 diff changeset	1608 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	1609 dicom.transferEnd();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1610
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1611 if (c.good())
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1612 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1613 // 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	1614 // buffer if its size was overestimated by (*)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1615 ob.flush();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1616
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1617 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	1618 if (effectiveSize < buffer.size())
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1619 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1620 buffer.resize(effectiveSize);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1621 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1622
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1623 return true;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1624 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1625 else
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1626 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1627 // Error
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1628 buffer.clear();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1629 return false;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1630 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1631 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1632
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1633
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1634 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1635 DcmDataset& dataSet)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1636 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1637 // 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	1638 // 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	1639 // Endian syntax, with explicit length.
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1640
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1641 // 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	1642
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	1643
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	1644 /**
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	1645 * 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	1646 * "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	1647 * 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	1648 * (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	1649 **/
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1650 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	1651 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	1652 {
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	1653 // 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	1654 // 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	1655 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	1656 }
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	1657
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	1658 // Create the meta-header information
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	1659 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	1660 ff.validateMetaInfo(xfer);
1316 1c8dfedefefe Fix anonymization generating non-portable DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1307 diff changeset	1661 ff.removeInvalidGroups();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1662
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1663 return SaveToMemoryBufferInternal(buffer, ff, xfer);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1664 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1665
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1666
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1667 bool FromDcmtkBridge::Transcode(DcmFileFormat& dicom,
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1668 DicomTransferSyntax syntax,
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1669 const DcmRepresentationParameter* representation)
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1670 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1671 E_TransferSyntax xfer;
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1672 if (!LookupDcmtkTransferSyntax(xfer, syntax))
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1673 {
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1674 throw OrthancException(ErrorCode_InternalError);
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1675 }
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	1676 else
3885 e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1677 {
e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1678 DicomTransferSyntax sourceSyntax;
e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1679 bool known = LookupOrthancTransferSyntax(sourceSyntax, dicom);
3922 74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1680
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1681 if (!dicom.chooseRepresentation(xfer, representation).good() \|\|
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	1682 !dicom.canWriteXfer(xfer) \|\|
3811 890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1683 !dicom.validateMetaInfo(xfer, EWM_updateMeta).good())
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1684 {
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1685 return false;
890af7156f19 fix transcoding to jpeg baseline Sebastien Jodogne <s.jodogne@gmail.com> parents: 3772 diff changeset	1686 }
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1687 else
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1688 {
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1689 dicom.removeInvalidGroups();
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1690
3885 e23026566536 removed unused functions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3883 diff changeset	1691 if (known)
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1692 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1693 CLOG(INFO, DICOM) << "Transcoded an image from transfer syntax "
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1694 << GetTransferSyntaxUid(sourceSyntax) << " to "
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1695 << GetTransferSyntaxUid(syntax);
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1696 }
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1697 else
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1698 {
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1699 CLOG(INFO, DICOM) << "Transcoded an image from unknown transfer syntax to "
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1700 << GetTransferSyntaxUid(syntax);
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1701 }
795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	1702
3872 b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1703 return true;
b40dfa6dc8da working on a simpler abstraction for transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3811 diff changeset	1704 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1705 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1706 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1707
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1708
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1709 ValueRepresentation FromDcmtkBridge::LookupValueRepresentation(const DicomTag& tag)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1710 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1711 DcmTag t(tag.GetGroup(), tag.GetElement());
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1712 return Convert(t.getEVR());
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1713 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1714
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1715 ValueRepresentation FromDcmtkBridge::Convert(const DcmEVR vr)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1716 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1717 switch (vr)
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1718 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1719 case EVR_AE:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1720 return ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1721
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1722 case EVR_AS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1723 return ValueRepresentation_AgeString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1724
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1725 case EVR_AT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1726 return ValueRepresentation_AttributeTag;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1727
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1728 case EVR_CS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1729 return ValueRepresentation_CodeString;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1730
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1731 case EVR_DA:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1732 return ValueRepresentation_Date;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1733
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1734 case EVR_DS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1735 return ValueRepresentation_DecimalString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1736
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1737 case EVR_DT:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1738 return ValueRepresentation_DateTime;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1739
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1740 case EVR_FL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1741 return ValueRepresentation_FloatingPointSingle;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1742
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1743 case EVR_FD:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1744 return ValueRepresentation_FloatingPointDouble;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1745
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1746 case EVR_IS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1747 return ValueRepresentation_IntegerString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1748
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1749 case EVR_LO:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1750 return ValueRepresentation_LongString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1751
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1752 case EVR_LT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1753 return ValueRepresentation_LongText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1754
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1755 case EVR_OB:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1756 return ValueRepresentation_OtherByte;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1757
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1758 #if DCMTK_VERSION_NUMBER >= 361
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1759 case EVR_OD:
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1760 return ValueRepresentation_OtherDouble;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1761 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1762
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1763 case EVR_OF:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1764 return ValueRepresentation_OtherFloat;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1765
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1766 #if DCMTK_VERSION_NUMBER >= 362
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1767 case EVR_OL:
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1768 return ValueRepresentation_OtherLong;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1769 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1770
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1771 case EVR_OW:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1772 return ValueRepresentation_OtherWord;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1773
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1774 case EVR_PN:
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1775 return ValueRepresentation_PersonName;
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1776
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1777 case EVR_SH:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1778 return ValueRepresentation_ShortString;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1779
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1780 case EVR_SL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1781 return ValueRepresentation_SignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1782
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1783 case EVR_SQ:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1784 return ValueRepresentation_Sequence;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1785
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1786 case EVR_SS:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1787 return ValueRepresentation_SignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1788
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1789 case EVR_ST:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1790 return ValueRepresentation_ShortText;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1791
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1792 case EVR_TM:
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1793 return ValueRepresentation_Time;
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1794
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1795 #if DCMTK_VERSION_NUMBER >= 361
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1796 case EVR_UC:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1797 return ValueRepresentation_UnlimitedCharacters;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1798 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1799
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1800 case EVR_UI:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1801 return ValueRepresentation_UniqueIdentifier;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1802
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1803 case EVR_UL:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1804 return ValueRepresentation_UnsignedLong;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1805
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1806 case EVR_UN:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1807 return ValueRepresentation_Unknown;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1808
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1809 #if DCMTK_VERSION_NUMBER >= 361
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1810 case EVR_UR:
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1811 return ValueRepresentation_UniversalResource;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	1812 #endif
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1813
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1814 case EVR_US:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1815 return ValueRepresentation_UnsignedShort;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1816
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1817 case EVR_UT:
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1818 return ValueRepresentation_UnlimitedText;
1792 b769623c806c safety check Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	1819
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1820 default:
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	1821 return ValueRepresentation_NotSupported;
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1822 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1823 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1316 diff changeset	1824
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1825
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	1826 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	1827 const std::string& privateCreator)
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1828 {
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	1829 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	1830 privateCreator.empty())
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	1831 {
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	1832 // 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	1833 // changes VR from LO to UN)
4476 c1f36fd13730 migrate remaining links to issues in bitbucket to mercurial server Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1834 // https://bugs.orthanc-server.com/show_bug.cgi?id=140
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	1835 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	1836 }
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1837
3692 fd302ec6a502 fix for ubuntu 16.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1838 #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	1839 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	1840 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	1841 {
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	1842 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	1843 }
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	1844 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	1845 {
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	1846 return DcmItem::newDicomElement(key, NULL);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1847 }
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	1848
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	1849 #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	1850 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	1851 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	1852 {
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	1853 // https://forum.dcmtk.org/viewtopic.php?t=4527
3708 bc25deb40302 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 3692 diff changeset	1854 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	1855 "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	1856 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	1857 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	1858 }
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	1859 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	1860 {
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	1861 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	1862 }
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	1863 #endif
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1864 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1865
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1866
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1867
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1868 void FromDcmtkBridge::FillElementWithString(DcmElement& element,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1869 const std::string& utf8Value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1870 bool decodeDataUriScheme,
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1871 Encoding dicomEncoding)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1872 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1873 std::string binary;
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1874 const std::string* decoded = &utf8Value;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1875
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	1876 if (decodeDataUriScheme &&
2905 ae20fccdd867 refactoring mime types Sebastien Jodogne <s.jodogne@gmail.com> parents: 2831 diff changeset	1877 boost::starts_with(utf8Value, URI_SCHEME_PREFIX_BINARY))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1878 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1879 std::string mime;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1880 if (!Toolbox::DecodeDataUriScheme(mime, binary, utf8Value))
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1881 {
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1882 throw OrthancException(ErrorCode_BadFileFormat);
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1883 }
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	1884
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1885 decoded = &binary;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1886 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1887 else if (dicomEncoding != Encoding_Utf8)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1888 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1694 diff changeset	1889 binary = Toolbox::ConvertFromUtf8(utf8Value, dicomEncoding);
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1890 decoded = &binary;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1891 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1892
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	1893 if (IsBinaryTag(element.getTag()))
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1894 {
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1895 bool ok;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1896
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	1897 switch (element.getTag().getEVR())
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1898 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1899 case EVR_OW:
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1900 if (decoded->size() % sizeof(Uint16) != 0)
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1901 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1902 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	1903 ok = false;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1904 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1905 else
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1906 {
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1907 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	1908 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1909
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1910 break;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1911
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1912 default:
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1913 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	1914 break;
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1915 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1916
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1917 if (ok)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1918 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1919 return;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1920 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1921 else
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1922 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1923 throw OrthancException(ErrorCode_InternalError);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1924 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1925 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1926
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1927 bool ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1928
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1929 try
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1930 {
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	1931 switch (element.getTag().getEVR())
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1932 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1933 // http://support.dcmtk.org/docs/dcvr_8h-source.html
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1934
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1935 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1936 * TODO.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1937 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1938
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1939 case EVR_OB: // other byte
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1940 case EVR_OW: // other word
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1941 throw OrthancException(ErrorCode_NotImplemented);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1942
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1943 case EVR_UN: // unknown value representation
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1944 throw OrthancException(ErrorCode_ParameterOutOfRange);
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1945
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1946
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1947 /**
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1948 * String types.
dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	1949 **/
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1950
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1951 case EVR_DS: // decimal string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1952 case EVR_IS: // integer string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1953 case EVR_AS: // age string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1954 case EVR_DA: // date string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1955 case EVR_DT: // date time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1956 case EVR_TM: // time string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1957 case EVR_AE: // application entity title
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1958 case EVR_CS: // code string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1959 case EVR_SH: // short string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1960 case EVR_LO: // long string
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1961 case EVR_ST: // short text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1962 case EVR_LT: // long text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1963 case EVR_UT: // unlimited text
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1964 case EVR_PN: // person name
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1965 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	1966 #if DCMTK_VERSION_NUMBER >= 361
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1967 case EVR_UC: // unlimited characters
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	1968 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	1969 #endif
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1970 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1971 ok = element.putString(decoded->c_str()).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1972 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1973 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1974
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1975
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1976 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1977 * Numerical types
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1978 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1979
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1980 case EVR_SL: // signed long
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1981 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1982 ok = element.putSint32(boost::lexical_cast<Sint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1983 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1984 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1985
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1986 case EVR_SS: // signed short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1987 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1988 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1989 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1990 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1991
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1992 case EVR_UL: // unsigned long
3692 fd302ec6a502 fix for ubuntu 16.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1993 #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	1994 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	1995 #endif
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1996 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1997 ok = element.putUint32(boost::lexical_cast<Uint32>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1998 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	1999 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2000
4845 02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2001 case EVR_xs: // unsigned short, signed short or multiple values
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2002 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2003 if (decoded->find('\\') != std::string::npos)
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2004 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2005 ok = element.putString(decoded->c_str()).good();
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2006 }
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2007 else if (decoded->find('-') != std::string::npos)
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2008 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2009 ok = element.putSint16(boost::lexical_cast<Sint16>(*decoded)).good();
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2010 }
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2011 else
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2012 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2013 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good();
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2014 }
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2015 break;
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2016 }
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	2017
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2018 case EVR_US: // unsigned short
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2019 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2020 ok = element.putUint16(boost::lexical_cast<Uint16>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2021 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2022 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2023
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2024 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	2025 case EVR_OF: // other float (requires byte swapping)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2026 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2027 ok = element.putFloat32(boost::lexical_cast<float>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2028 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2029 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2030
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2031 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	2032 #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	2033 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	2034 #endif
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2035 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2036 ok = element.putFloat64(boost::lexical_cast<double>(*decoded)).good();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2037 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2038 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2039
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2040
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2041 /**
4663 72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2042 * Other types
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2043 **/
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2044
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2045 case EVR_AT: // attribute tag, new in Orthanc 1.9.4
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2046 {
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2047 DicomTag value = ParseTag(utf8Value);
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2048 ok = element.putTagVal(DcmTagKey(value.GetGroup(), value.GetElement())).good();
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2049 break;
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2050 }
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2051
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2052
72af097bb92b "Replace" tags in "/modify" and "/anonymize" now supports value representation AT Sebastien Jodogne <s.jodogne@gmail.com> parents: 4528 diff changeset	2053 /**
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2054 * Sequence types, should never occur at this point.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2055 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2056
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2057 case EVR_SQ: // sequence of items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2058 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2059 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2060 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2061 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2062
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2063
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2064 /**
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2065 * Internal to DCMTK.
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2066 **/
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2067
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2068 case EVR_ox: // OB or OW depending on context
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2069 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	2070 case EVR_na: // na="not applicable", for data which has no VR
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2071 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2072 case EVR_item: // used internally for items
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2073 case EVR_metainfo: // used internally for meta info datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2074 case EVR_dataset: // used internally for datasets
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2075 case EVR_fileFormat: // used internally for DICOM files
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2076 case EVR_dicomDir: // used internally for DICOMDIR objects
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2077 case EVR_dirRecord: // used internally for DICOMDIR records
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2078 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2079 case EVR_pixelItem: // used internally for pixel items in a compressed image
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2080 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	2081 case EVR_PixelData: // used internally for uncompressed pixeld data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2082 case EVR_OverlayData: // used internally for overlay data
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2083 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	2084 default:
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2085 break;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2086 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2087 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2088 catch (boost::bad_lexical_cast&)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2089 {
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2090 ok = false;
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2091 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2092
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2093 if (!ok)
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2094 {
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	2095 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	2096 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2097 "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	2098 ") has out-of-range value: \"" + (*decoded) + "\"");
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2099 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2100 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2101
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2102
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	2103 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag,
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	2104 const Json::Value& value,
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1792 diff changeset	2105 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	2106 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	2107 const std::string& privateCreator)
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2108 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	2109 std::unique_ptr<DcmElement> element;
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2110
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2111 switch (value.type())
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2112 {
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2113 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	2114 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	2115 FillElementWithString(*element, value.asString(), decodeDataUriScheme, dicomEncoding);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2116 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2117
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2118 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	2119 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	2120 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	2121 break;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2122
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2123 case Json::arrayValue:
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2124 {
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2125 const char* p = NULL;
4016 c675d77b82ab fix creation of sequence in private tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 4007 diff changeset	2126 if (tag.IsPrivate() &&
c675d77b82ab fix creation of sequence in private tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 4007 diff changeset	2127 !privateCreator.empty())
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2128 {
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2129 p = privateCreator.c_str();
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2130 }
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2131
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2132 DcmTag key(tag.GetGroup(), tag.GetElement(), p);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2133 if (key.getEVR() != EVR_SQ)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2134 {
4007 884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2135 throw OrthancException(ErrorCode_BadParameterType,
884b55ce01f6 Private tags returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3922 diff changeset	2136 "Bad Parameter type for tag " + tag.Format());
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2137 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2138
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	2139 DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2140 element.reset(sequence);
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2141
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2142 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2143 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	2144 std::unique_ptr<DcmItem> item(new DcmItem);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2145
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2146 switch (value[i].type())
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2147 {
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2148 case Json::objectValue:
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2149 {
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2150 Json::Value::Members members = value[i].getMemberNames();
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2151 for (Json::Value::ArrayIndex j = 0; j < members.size(); j++)
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2152 {
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	2153 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	2154 }
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	2155 break;
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2156 }
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2157
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2158 case Json::arrayValue:
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	2159 {
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2160 // Lua cannot disambiguate between an empty dictionary
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2161 // and an empty array
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2162 if (value[i].size() != 0)
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2163 {
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2164 throw OrthancException(ErrorCode_BadParameterType);
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2165 }
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2166 break;
2831 b51233f03e7e missing break Sebastien Jodogne <s.jodogne@gmail.com> parents: 2830 diff changeset	2167 }
2830 ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2168
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2169 default:
ab0fd5923c1d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	2170 throw OrthancException(ErrorCode_BadParameterType);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2171 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2172
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2173 sequence->append(item.release());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2174 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2175
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2176 break;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2177 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2178
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1689 diff changeset	2179 default:
3895 37cf1889667a more explicit error message Alain Mazy <alain@mazy.be> parents: 3811 diff changeset	2180 throw OrthancException(ErrorCode_BadParameterType, "Bad Parameter type for tag " + tag.Format());
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2181 }
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2182
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2183 return element.release();
26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1688 diff changeset	2184 }
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	2185
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	2186
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	2187 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	2188 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2189 DcmElement *element = NULL;
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1924 diff changeset	2190 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	2191 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2192 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	2193 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2194
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2195 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	2196
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	2197 E_TransferSyntax repType;
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	2198 const DcmRepresentationParameter *repParam = NULL;
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	2199 pixelData.getCurrentRepresentationKey(repType, repParam);
74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	2200
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	2201 DcmPixelSequence* pixelSequence = NULL;
3922 74eeadf5d51d fix access to compressed frames after transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3896 diff changeset	2202 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	2203 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2204 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	2205 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2206 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	2207 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2208 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	2209 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2210 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2211
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2212
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2213 Encoding FromDcmtkBridge::ExtractEncoding(const Json::Value& json,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2214 Encoding defaultEncoding)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2215 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2216 if (json.type() != Json::objectValue)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2217 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2218 throw OrthancException(ErrorCode_BadParameterType);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2219 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2220
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2221 Encoding encoding = defaultEncoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2222
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2223 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2224
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2225 // Look for SpecificCharacterSet (0008,0005) in the JSON file
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2226 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2227 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2228 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2229 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2230 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2231 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2232 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	2233 (value.asString().length() != 0 &&
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2234 !GetDicomEncoding(encoding, value.asCString())))
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2235 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2236 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2237 "Unknown encoding while creating DICOM from JSON: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2238 value.toStyledString());
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2239 }
2216 9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2240
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2241 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	2242 {
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2243 return defaultEncoding;
9a8fab016145 sample worklist plugin fine-tuning the C-Find query Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	2244 }
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2245 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2246 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2247
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2248 return encoding;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2249 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2250
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2251
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2252 static void SetString(DcmDataset& target,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2253 const DcmTag& tag,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2254 const std::string& value)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2255 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2256 if (!target.putAndInsertString(tag, value.c_str()).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2257 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2258 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2259 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2260 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2261
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2262
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2263 DcmDataset* FromDcmtkBridge::FromJson(const Json::Value& json, // Encoded using UTF-8
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2264 bool generateIdentifiers,
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2265 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	2266 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	2267 const std::string& privateCreator)
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2268 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	2269 std::unique_ptr<DcmDataset> result(new DcmDataset);
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2270 Encoding encoding = ExtractEncoding(json, defaultEncoding);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2271
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2272 SetString(*result, DCM_SpecificCharacterSet, GetDicomSpecificCharacterSet(encoding));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2273
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2274 const Json::Value::Members tags = json.getMemberNames();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2275
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2276 bool hasPatientId = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2277 bool hasStudyInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2278 bool hasSeriesInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2279 bool hasSopInstanceUid = false;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2280
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2281 for (size_t i = 0; i < tags.size(); i++)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2282 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2283 DicomTag tag = FromDcmtkBridge::ParseTag(tags[i]);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2284 const Json::Value& value = json[tags[i]];
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2285
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2286 if (tag == DICOM_TAG_PATIENT_ID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2287 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2288 hasPatientId = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2289 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2290 else if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2291 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2292 hasStudyInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2293 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2294 else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2295 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2296 hasSeriesInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2297 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2298 else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2299 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2300 hasSopInstanceUid = true;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2301 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2302
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2303 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2304 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	2305 std::unique_ptr<DcmElement> element(FromDcmtkBridge::FromJson(tag, value, decodeDataUriScheme, encoding, privateCreator));
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	2306
7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	2307 result->findAndDeleteElement(element->getTag());
1934 72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2308
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2309 DcmElement* tmp = element.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2310 if (!result->insert(tmp, false, false).good())
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2311 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2312 delete tmp;
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2313 throw OrthancException(ErrorCode_InternalError);
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2314 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2315 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2316 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2317
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2318 if (!hasPatientId &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2319 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2320 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2321 SetString(*result, DCM_PatientID, GenerateUniqueIdentifier(ResourceType_Patient));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2322 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2323
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2324 if (!hasStudyInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2325 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2326 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2327 SetString(*result, DCM_StudyInstanceUID, GenerateUniqueIdentifier(ResourceType_Study));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2328 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2329
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2330 if (!hasSeriesInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2331 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2332 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2333 SetString(*result, DCM_SeriesInstanceUID, GenerateUniqueIdentifier(ResourceType_Series));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2334 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2335
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2336 if (!hasSopInstanceUid &&
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2337 generateIdentifiers)
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2338 {
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2339 SetString(*result, DCM_SOPInstanceUID, GenerateUniqueIdentifier(ResourceType_Instance));
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2340 }
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2341
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2342 return result.release();
72a2fd7fed8b FromDcmtkBridge::FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1930 diff changeset	2343 }
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2344
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2345
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2346 DcmFileFormat* FromDcmtkBridge::LoadFromMemoryBuffer(const void* buffer,
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2347 size_t size)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2348 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2349 DcmInputBufferStream is;
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2350 if (size > 0)
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2351 {
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2352 is.setBuffer(buffer, size);
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2353 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2354 is.setEos();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2355
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3708 diff changeset	2356 std::unique_ptr<DcmFileFormat> result(new DcmFileFormat);
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2357
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2358 result->transferInit();
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	2359
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	2360 /**
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	2361 * 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	2362 * "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	2363 * 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	2364 * 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	2365 * valgrind running Orthanc.
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	2366 **/
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3769 diff changeset	2367 if (!result->read(is, EXS_Unknown, EGL_noChange, size).good())
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2368 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2369 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2370 "Cannot parse an invalid DICOM file (size: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2371 boost::lexical_cast<std::string>(size) + " bytes)");
1935 e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2372 }
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2373
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2374 result->loadAllDataIntoMemory();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2375 result->transferEnd();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2376
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2377 return result.release();
e251606c1433 FromDcmtkBridge::LoadFromMemoryBuffer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	2378 }
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2379
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2380
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2381 void FromDcmtkBridge::FromJson(DicomMap& target,
5011 c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2382 const Json::Value& source,
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2383 const char* fieldName)
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2384 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2385 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	2386 {
5011 c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2387 if (fieldName != NULL)
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2388 {
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2389 throw OrthancException(ErrorCode_BadFileFormat, std::string("Expecting an object in field '") + std::string(fieldName) + std::string("'"));
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2390 }
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2391 else
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2392 {
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2393 throw OrthancException(ErrorCode_BadFileFormat, "Expecting an object");
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2394 }
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2395 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2396
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2397 target.Clear();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2398
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2399 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	2400
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2401 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	2402 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2403 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	2404
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2405 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	2406 {
5011 c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2407 throw OrthancException(ErrorCode_BadFileFormat, std::string("Expecting a string in field '") + members[i] + std::string("'"));
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2408 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2409
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	2410 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	2411 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	2412 }
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2413
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2414
5011 c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2415
c014ab79fca5 fixed /move documentation + improved error reporting Alain Mazy <am@osimis.io> parents: 4981 diff changeset	2416
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2417 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	2418 Encoding source,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2419 bool hasSourceCodeExtensions,
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2420 Encoding target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2421 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2422 // 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	2423 // each string-like element
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2424
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2425 if (source == target)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2426 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2427 return;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2428 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2429
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2430 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	2431 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2432 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	2433 if (element)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2434 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2435 if (element->isLeaf())
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2436 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2437 char *c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2438 if (element->isaString() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2439 element->getString(c).good() &&
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2440 c != NULL)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2441 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2442 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	2443 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	2444 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	2445 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2446 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2447 else
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2448 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2449 // "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	2450 // 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	2451 // 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	2452 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	2453
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2454 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	2455 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2456 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	2457 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2458 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2459 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2460 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2461 }
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	2462
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	2463
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2464 void FromDcmtkBridge::InitializeCodecs()
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2465 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2466 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	2467 CLOG(INFO, DICOM) << "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	2468 DJLSDecoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2469 # 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	2470 DJLSEncoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2471 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2472 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2473
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2474 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	2475 CLOG(INFO, DICOM) << "Registering JPEG codecs in DCMTK";
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2476 DJDecoderRegistration::registerCodecs();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2477 # 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	2478 DJEncoderRegistration::registerCodecs();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2479 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2480 #endif
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2481
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4695 diff changeset	2482 CLOG(INFO, DICOM) << "Registering RLE codecs in DCMTK";
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2483 DcmRLEDecoderRegistration::registerCodecs();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2484 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2485 DcmRLEEncoderRegistration::registerCodecs();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2486 #endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2487 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2488
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2489
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2490 void FromDcmtkBridge::FinalizeCodecs()
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2491 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2492 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2493 // Unregister JPEG-LS codecs
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2494 DJLSDecoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2495 # 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	2496 DJLSEncoderRegistration::cleanup();
090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2497 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2498 #endif
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2499
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2500 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2501 // Unregister JPEG codecs
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2502 DJDecoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2503 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
3743 33c19a6643e1 creating IDicomTranscoder abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 3730 diff changeset	2504 DJEncoderRegistration::cleanup();
3727 090022f1b5e1 auto-generation of primitives to handle transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	2505 # endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2506 #endif
3748 ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2507
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2508 DcmRLEDecoderRegistration::cleanup();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2509 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2510 DcmRLEEncoderRegistration::cleanup();
ca36e3f1112c transcoding to uncompressed transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3743 diff changeset	2511 #endif
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2364 diff changeset	2512 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2513
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2514
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2515
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2516 // Forward declaration
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2517 static bool ApplyVisitorToElement(DcmElement& element,
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2518 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2519 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2520 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2521 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2522 bool hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2523
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2524 static void ApplyVisitorToDataset(DcmItem& dataset,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2525 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2526 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2527 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2528 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2529 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2530 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2531 assert(parentTags.size() == parentIndexes.size());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2532
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2533 std::set<DcmTagKey> toRemove;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2534
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2535 for (unsigned long i = 0; i < dataset.card(); i++)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2536 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2537 DcmElement* element = dataset.getElement(i);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2538 if (element == NULL)
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 throw OrthancException(ErrorCode_InternalError);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2541 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2542 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2543 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2544 if (!ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions))
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2545 {
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2546 toRemove.insert(element->getTag());
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2547 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2548 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2549 }
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2550
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2551 // Remove all the tags that were planned for removal (cf. ITagVisitor::Action_Remove)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2552 for (std::set<DcmTagKey>::const_iterator
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2553 it = toRemove.begin(); it != toRemove.end(); ++it)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2554 {
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2555 std::unique_ptr<DcmElement> tmp(dataset.remove(*it));
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2556 }
2499 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
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2559
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2560 // Returns "true" iff the element must be kept. If "false" is
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2561 // returned, the element will be removed.
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2562 static bool ApplyVisitorToLeaf(DcmElement& element,
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2563 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2564 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2565 const std::vector<size_t>& parentIndexes,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2566 const DicomTag& tag,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2567 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2568 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2569 {
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2570 // 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	2571
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2572 assert(element.isLeaf());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2573
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2574 DcmEVR evr = element.getTag().getEVR();
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2575
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2576
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2577 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2578 * Fix the EVR for types internal to DCMTK
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2579 **/
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2580
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2581 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	2582 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2583 evr = EVR_OB;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2584 }
5173 f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2585 else if (evr == EVR_xs) // SS or US depending on context
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2586 {
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2587 // So far we assume that it's alway US (as a best guess: https://forum.dcmtk.org/viewtopic.php?t=932)
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2588 // However, e.g. in a LUTDescriptor (3 values), the middle value can be a SS depending on other tag values while first and third value are always US.
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2589 // This patch, although not perfect fixes https://bugs.orthanc-server.com/show_bug.cgi?id=214.
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2590 // It might need some rework once we encounter a LUTDescriptor with a SS value. ref: https://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_C.11.2.html#sect_C.11.2.1.1
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2591 evr = EVR_US;
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2592 }
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2593 else if (evr == EVR_lt) // US, SS or OW depending on context, used for LUT Data (thus the name)
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2594 {
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2595 // best guess is OW: final user should be able to interpret it correctly depending on the context
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2596 evr = EVR_OW;
f9ab3aec3bed Fix issue 214: VOILUTSequence is not returned in Wado-RS Alain Mazy <am@osimis.io> parents: 5151 diff changeset	2597 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2598
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2599 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	2600 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	2601 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2602 evr = EVR_UN;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2603 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2604
4737 979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2605 if (evr == EVR_UN)
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2606 {
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2607 // New in Orthanc 1.9.5
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2608 DictionaryLocker locker;
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2609
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2610 const DcmDictEntry* entry = locker->findEntry(element.getTag().getXTag(),
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2611 element.getTag().getPrivateCreator());
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2612
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2613 if (entry != NULL)
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2614 {
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2615 evr = entry->getEVR();
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2616 }
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2617 }
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	2618
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2619 const ValueRepresentation vr = FromDcmtkBridge::Convert(evr);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2620
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2621
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2622 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2623 * Deal with binary data (including PixelData).
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2624 **/
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2625
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2626 if (evr == EVR_OB \|\| // other byte
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2627 evr == EVR_OW \|\| // other word
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2628 evr == EVR_UN) // unknown value representation
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2629 {
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2630 Uint16* data16 = NULL;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2631 Uint8* data = NULL;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2632
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2633 ITagVisitor::Action action;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2634
4528 93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2635 if ((element.getTag() == DCM_PixelData \|\| // (*) New in Orthanc 1.9.1
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2636 evr == EVR_OW) &&
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2637 element.getUint16Array(data16) == EC_Normal)
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2638 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2639 action = visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data16, element.getLength());
3199 9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2640 }
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2641 else if (evr != EVR_OW &&
9316f341e40f unit testing json for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3198 diff changeset	2642 element.getUint8Array(data) == EC_Normal)
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2643 {
4528 93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2644 /**
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2645 * WARNING: The call to "getUint8Array()" crashes
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2646 * (segmentation fault) on big-endian architectures if applied
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2647 * to pixel data, during the call to "swapIfNecessary()" in
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2648 * "DcmPolymorphOBOW::getUint8Array()" (this method is not
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2649 * reimplemented in derived class "DcmPixelData"). However,
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2650 * "getUint16Array()" works correctly, hence (*).
93a51d228d80 fix segmentation fault during anonymization on big-endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2651 **/
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2652 action = visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data, element.getLength());
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2653 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2654 else
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2655 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2656 action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2657 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2658
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2659 switch (action)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2660 {
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2661 case ITagVisitor::Action_None:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2662 return true; // We're done
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2663
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2664 case ITagVisitor::Action_Remove:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2665 return false;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2666
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2667 case ITagVisitor::Action_Replace:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2668 throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace binary data");
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2669
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2670 default:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2671 throw OrthancException(ErrorCode_ParameterOutOfRange);
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2672 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2673 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2674
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2675
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2676 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2677 * 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	2678 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2679
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2680 char *c = NULL;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2681 if (element.isaString() &&
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2682 element.getString(c).good())
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2683 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2684 std::string utf8;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2685
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2686 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	2687 {
3448 b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2688 if (element.getTag() == DCM_SpecificCharacterSet)
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2689 {
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2690 utf8.assign(c);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2691 }
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2692 else
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2693 {
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2694 std::string s(c);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2695 utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
b3bdd6dc10f2 don't change encoding of SpecificCharacterSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 3302 diff changeset	2696 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2697 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2698
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2699 std::string newValue;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2700 ITagVisitor::Action action = visitor.VisitString
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2701 (newValue, parentTags, parentIndexes, tag, vr, utf8);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2702
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2703 switch (action)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2704 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2705 case ITagVisitor::Action_None:
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2706 return true;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2707
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2708 case ITagVisitor::Action_Remove:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2709 return false;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2710
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2711 case ITagVisitor::Action_Replace:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2712 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2713 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	2714 if (element.putString(s.c_str()) != EC_Normal)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2715 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2716 throw OrthancException(ErrorCode_InternalError,
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2717 "Iterator cannot replace value of tag: " + tag.Format());
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2718 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2719
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2720 return true;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2721 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2722
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2723 default:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2724 throw OrthancException(ErrorCode_InternalError);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2725 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2726 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2727
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2728
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2729 ITagVisitor::Action action;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2730
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2731 try
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2732 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2733 // 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	2734 switch (evr)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2735 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2736
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2737 /**
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2738 * Plain string values.
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2739 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2740
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2741 case EVR_DS: // decimal string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2742 case EVR_IS: // integer string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2743 case EVR_AS: // age string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2744 case EVR_DA: // date string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2745 case EVR_DT: // date time string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2746 case EVR_TM: // time string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2747 case EVR_AE: // application entity title
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2748 case EVR_CS: // code string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2749 case EVR_SH: // short string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2750 case EVR_LO: // long string
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2751 case EVR_ST: // short text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2752 case EVR_LT: // long text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2753 case EVR_UT: // unlimited text
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2754 case EVR_PN: // person name
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2755 case EVR_UI: // unique identifier
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2756 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2757 Uint8* data = NULL;
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2758
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2759 if (element.getUint8Array(data) == EC_Normal)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2760 {
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2761 const Uint32 length = element.getLength();
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2762 Uint32 l = 0;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2763 while (l < length &&
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2764 data[l] != 0)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2765 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2766 l++;
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2767 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2768
4951 e100fd9db29b enlarged support of tags with UN value representation in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	2769 std::string ignored;
e100fd9db29b enlarged support of tags with UN value representation in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	2770 std::string s(reinterpret_cast<const char*>(data), l);
e100fd9db29b enlarged support of tags with UN value representation in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	2771 action = visitor.VisitString(ignored, parentTags, parentIndexes, tag, vr,
e100fd9db29b enlarged support of tags with UN value representation in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	2772 Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions));
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2773 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2774 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2775 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2776 action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2777 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2778
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2779 if (action == ITagVisitor::Action_Replace)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2780 {
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2781 LOG(WARNING) << "Iterator cannot replace this string tag: "
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2782 << FromDcmtkBridge::GetTagName(element)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2783 << " (" << tag.Format() << ")";
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2784 return true;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2785 }
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2786
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2787 break;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2788 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2789
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2790 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2791 * Numeric types
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2792 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2793
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2794 case EVR_SL: // signed long
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2795 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2796 DcmSignedLong& content = dynamic_cast<DcmSignedLong&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2797
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2798 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2799 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2800
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2801 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	2802 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2803 Sint32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2804 if (content.getSint32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2805 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2806 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2807 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2808 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2809
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2810 action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2811 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2812 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2813
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2814 case EVR_SS: // signed short
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2815 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2816 DcmSignedShort& content = dynamic_cast<DcmSignedShort&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2817
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2818 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2819 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2820
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2821 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	2822 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2823 Sint16 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2824 if (content.getSint16(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2825 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2826 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2827 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2828 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2829
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2830 action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2831 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2832 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2833
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2834 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	2835 #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	2836 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	2837 #endif
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2838 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2839 DcmUnsignedLong& content = dynamic_cast<DcmUnsignedLong&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2840
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2841 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2842 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2843
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2844 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	2845 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2846 Uint32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2847 if (content.getUint32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2848 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2849 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2850 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2851 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2852
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2853 action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2854 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2855 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2856
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2857 case EVR_US: // unsigned short
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2858 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2859 DcmUnsignedShort& content = dynamic_cast<DcmUnsignedShort&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2860
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2861 std::vector<int64_t> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2862 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2863
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2864 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	2865 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2866 Uint16 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2867 if (content.getUint16(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2868 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2869 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2870 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2871 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2872
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2873 action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2874 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2875 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2876
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2877 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	2878 case EVR_OF:
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2879 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2880 DcmFloatingPointSingle& content = dynamic_cast<DcmFloatingPointSingle&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2881
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2882 std::vector<double> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2883 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2884
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2885 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	2886 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2887 Float32 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2888 if (content.getFloat32(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2889 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2890 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2891 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2892 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2893
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2894 action = visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2895 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2896 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2897
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2898 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	2899 #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	2900 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	2901 #endif
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2902 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2903 DcmFloatingPointDouble& content = dynamic_cast<DcmFloatingPointDouble&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2904
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2905 std::vector<double> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2906 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2907
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2908 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	2909 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2910 Float64 f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2911 if (content.getFloat64(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2912 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2913 values.push_back(f);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2914 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2915 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2916
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2917 action = visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2918 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2919 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2920
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2921
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2922 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2923 * Attribute tag.
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2924 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2925
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2926 case EVR_AT:
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2927 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2928 DcmAttributeTag& content = dynamic_cast<DcmAttributeTag&>(element);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2929
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2930 std::vector<DicomTag> values;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2931 values.reserve(content.getVM());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2932
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2933 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	2934 {
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2935 DcmTagKey f;
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2936 if (content.getTagVal(f, i).good())
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2937 {
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2938 DicomTag t(f.getGroup(), f.getElement());
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2939 values.push_back(t);
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3156 diff changeset	2940 }
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2941 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2942
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	2943 assert(vr == ValueRepresentation_AttributeTag);
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2944 action = visitor.VisitAttributes(parentTags, parentIndexes, tag, values);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2945 break;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2946 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2947
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2948
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2949 /**
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2950 * 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	2951 * "element.isLeaf()".
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2952 **/
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2953
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2954 case EVR_SQ: // sequence of items
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2955 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2956 return true;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2957 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2958
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2959
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2960 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2961 * Internal to DCMTK.
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2962 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2963
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2964 case EVR_xs: // SS or US depending on context
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2965 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	2966 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	2967 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	2968 case EVR_item: // used internally for items
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2969 case EVR_metainfo: // used internally for meta info datasets
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2970 case EVR_dataset: // used internally for datasets
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2971 case EVR_fileFormat: // used internally for DICOM files
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2972 case EVR_dicomDir: // used internally for DICOMDIR objects
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2973 case EVR_dirRecord: // used internally for DICOMDIR records
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2974 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	2975 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	2976 case EVR_PixelData: // used internally for uncompressed pixeld data
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2977 case EVR_OverlayData: // used internally for overlay data
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2978 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2979 action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2980 break;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2981 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2982
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2983
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2984 /**
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2985 * Default case.
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	2986 **/
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2987
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	2988 default:
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2989 return true;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2990 }
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2991
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2992 switch (action)
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2993 {
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2994 case ITagVisitor::Action_None:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2995 return true; // We're done
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2996
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2997 case ITagVisitor::Action_Remove:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2998 return false;
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	2999
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3000 case ITagVisitor::Action_Replace:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3001 throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace non-string-like data");
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3002
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3003 default:
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3004 throw OrthancException(ErrorCode_ParameterOutOfRange);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3005 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3006 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3007 catch (boost::bad_lexical_cast&)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3008 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3009 return true;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3010 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3011 catch (std::bad_cast&)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3012 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3013 return true;
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3014 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3015 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3016
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3017
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3018 // Returns "true" iff the element must be kept. If "false" is
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3019 // returned, the element will be removed.
b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3020 static bool ApplyVisitorToElement(DcmElement& element,
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3021 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3022 const std::vector<DicomTag>& parentTags,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3023 const std::vector<size_t>& parentIndexes,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3024 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3025 bool hasCodeExtensions)
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3026 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3027 assert(parentTags.size() == parentIndexes.size());
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3028
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3029 DicomTag tag(FromDcmtkBridge::Convert(element.getTag()));
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3030
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3031 if (element.isLeaf())
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3032 {
4734 b51c08bd5c38 added ITagVisitor::Action_Remove Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3033 return ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding, hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3034 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3035 else
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3036 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3037 // "All subclasses of DcmElement except for DcmSequenceOfItems
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3038 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3039 // 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	3040 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3041
4737 979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3042 ITagVisitor::Action action = visitor.VisitSequence(parentTags, parentIndexes, tag, sequence.card());
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3043
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3044 switch (action)
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	3045 {
4737 979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3046 case ITagVisitor::Action_None:
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3047 if (sequence.card() != 0) // Minor optimization to avoid creating "tags" and "indexes" if not needed
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3048 {
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3049 std::vector<DicomTag> tags = parentTags;
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3050 std::vector<size_t> indexes = parentIndexes;
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3051 tags.push_back(tag);
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3052 indexes.push_back(0);
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3053
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3054 for (unsigned long i = 0; i < sequence.card(); i++)
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3055 {
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3056 indexes.back() = static_cast<size_t>(i);
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3057 DcmItem* child = sequence.getItem(i);
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3058 ApplyVisitorToDataset(*child, visitor, tags, indexes, encoding, hasCodeExtensions);
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3059 }
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3060 }
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3061
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3062 return true; // Keep
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3063
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3064 case ITagVisitor::Action_Remove:
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3065 return false;
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3066
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3067 case ITagVisitor::Action_Replace:
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3068 throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace sequences");
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3069
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3070 default:
979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3071 throw OrthancException(ErrorCode_ParameterOutOfRange);
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	3072 }
4737 979ae3ea3381 DANGEROUS commit: Anonymization is now also applied to nested sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4734 diff changeset	3073
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3074 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3075 }
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3076
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3077
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3078 void FromDcmtkBridge::Apply(DcmItem& dataset,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3079 ITagVisitor& visitor,
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3080 Encoding defaultEncoding)
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3081 {
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3082 std::vector<DicomTag> parentTags;
83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3083 std::vector<size_t> parentIndexes;
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3084 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3085 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3086 ApplyVisitorToDataset(dataset, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
2499 83b8b6743531 ITagVisitor - for anonymization relationships Sebastien Jodogne <s.jodogne@gmail.com> parents: 2470 diff changeset	3087 }
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3088
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3089
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3090
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3091 bool FromDcmtkBridge::LookupOrthancTransferSyntax(DicomTransferSyntax& target,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3092 DcmFileFormat& dicom)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3093 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3094 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3095 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3096 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3097 }
4334 b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3098 else
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3099 {
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3100 return LookupOrthancTransferSyntax(target, *dicom.getDataset());
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3101 }
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3102 }
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3103
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3104
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3105 bool FromDcmtkBridge::LookupOrthancTransferSyntax(DicomTransferSyntax& target,
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3106 DcmDataset& dataset)
b2366bc023f8 Fix access to videos as a single raw frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	3107 {
3883 795c9ca5eb91 DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	3108 E_TransferSyntax xfer = dataset.getCurrentXfer();
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3109 if (xfer == EXS_Unknown)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3110 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3111 dataset.updateOriginalXfer();
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3112 xfer = dataset.getOriginalXfer();
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3113 if (xfer == EXS_Unknown)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3114 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3115 throw OrthancException(ErrorCode_BadFileFormat,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3116 "Cannot determine the transfer syntax of the DICOM instance");
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3117 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3118 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3119
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3120 return FromDcmtkBridge::LookupOrthancTransferSyntax(target, xfer);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	3121 }
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3122
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3123
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3124 void FromDcmtkBridge::LogMissingTagsForStore(DcmDataset& dicom)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3125 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3126 std::string patientId, studyInstanceUid, seriesInstanceUid, sopInstanceUid;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3127
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3128 const char* c = NULL;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3129 if (dicom.findAndGetString(DCM_PatientID, c).good() &&
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3130 c != NULL)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3131 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3132 patientId.assign(c);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3133 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3134
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3135 c = NULL;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3136 if (dicom.findAndGetString(DCM_StudyInstanceUID, c).good() &&
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3137 c != NULL)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3138 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3139 studyInstanceUid.assign(c);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3140 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3141
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3142 c = NULL;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3143 if (dicom.findAndGetString(DCM_SeriesInstanceUID, c).good() &&
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3144 c != NULL)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3145 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3146 seriesInstanceUid.assign(c);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3147 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3148
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3149 c = NULL;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3150 if (dicom.findAndGetString(DCM_SOPInstanceUID, c).good() &&
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3151 c != NULL)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3152 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3153 sopInstanceUid.assign(c);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3154 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3155
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3156 DicomMap::LogMissingTagsForStore(patientId, studyInstanceUid, seriesInstanceUid, sopInstanceUid);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	3157 }
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3158
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3159
4770 248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3160 void FromDcmtkBridge::IDicomPathVisitor::ApplyInternal(FromDcmtkBridge::IDicomPathVisitor& visitor,
248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3161 DcmItem& item,
248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3162 const DicomPath& pattern,
248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3163 const DicomPath& actualPath)
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3164 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3165 const size_t level = actualPath.GetPrefixLength();
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3166
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3167 if (level == pattern.GetPrefixLength())
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3168 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3169 visitor.Visit(item, actualPath);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3170 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3171 else
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3172 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3173 assert(level < pattern.GetPrefixLength());
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3174
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3175 const DicomTag& tmp = pattern.GetPrefixTag(level);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3176 DcmTagKey tag(tmp.GetGroup(), tmp.GetElement());
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3177
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3178 DcmSequenceOfItems *sequence = NULL;
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3179 if (item.findAndGetSequence(tag, sequence).good() &&
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3180 sequence != NULL)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3181 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3182 for (unsigned long i = 0; i < sequence->card(); i++)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3183 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3184 if (pattern.IsPrefixUniversal(level) \|\|
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3185 pattern.GetPrefixIndex(level) == static_cast<size_t>(i))
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3186 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3187 DcmItem *child = sequence->getItem(i);
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3188 if (child != NULL)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3189 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3190 DicomPath childPath = actualPath;
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3191 childPath.AddIndexedTagToPrefix(pattern.GetPrefixTag(level), static_cast<size_t>(i));
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3192
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3193 ApplyInternal(visitor, *child, pattern, childPath);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3194 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3195 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3196 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3197 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3198 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3199 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3200
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3201
4770 248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3202 void FromDcmtkBridge::IDicomPathVisitor::Apply(IDicomPathVisitor& visitor,
248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3203 DcmDataset& dataset,
248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3204 const DicomPath& path)
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3205 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3206 DicomPath actualPath(path.GetFinalTag());
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3207 ApplyInternal(visitor, dataset, path, actualPath);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3208 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3209
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3210
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3211 void FromDcmtkBridge::RemovePath(DcmDataset& dataset,
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3212 const DicomPath& path)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3213 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3214 class Visitor : public FromDcmtkBridge::IDicomPathVisitor
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3215 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3216 public:
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3217 virtual void Visit(DcmItem& item,
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3218 const DicomPath& path) ORTHANC_OVERRIDE
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3219 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3220 DcmTagKey key(path.GetFinalTag().GetGroup(), path.GetFinalTag().GetElement());
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3221 std::unique_ptr<DcmElement> removed(item.remove(key));
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3222 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3223 };
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3224
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3225 Visitor visitor;
4770 248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3226 IDicomPathVisitor::Apply(visitor, dataset, path);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3227 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3228
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3229
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3230 void FromDcmtkBridge::ClearPath(DcmDataset& dataset,
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3231 const DicomPath& path,
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3232 bool onlyIfExists)
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3233 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3234 class Visitor : public FromDcmtkBridge::IDicomPathVisitor
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3235 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3236 public:
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3237 bool onlyIfExists_;
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3238
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3239 public:
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4683 diff changeset	3240 explicit Visitor(bool onlyIfExists) :
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3241 onlyIfExists_(onlyIfExists)
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3242 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3243 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3244
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3245 virtual void Visit(DcmItem& item,
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3246 const DicomPath& path) ORTHANC_OVERRIDE
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3247 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3248 DcmTagKey key(path.GetFinalTag().GetGroup(), path.GetFinalTag().GetElement());
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3249
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3250 if (onlyIfExists_ &&
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3251 !item.tagExists(key))
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3252 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3253 // The tag is non-existing, do not clear it
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3254 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3255 else
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3256 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3257 if (!item.insertEmptyElement(key, OFTrue /* replace old value */).good())
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3258 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3259 throw OrthancException(ErrorCode_InternalError);
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3260 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3261 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3262 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3263 };
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3264
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3265 Visitor visitor(onlyIfExists);
4770 248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3266 IDicomPathVisitor::Apply(visitor, dataset, path);
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3267 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3268
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3269
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3270 void FromDcmtkBridge::ReplacePath(DcmDataset& dataset,
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3271 const DicomPath& path,
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3272 const DcmElement& element,
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3273 DicomReplaceMode mode)
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3274 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3275 class Visitor : public FromDcmtkBridge::IDicomPathVisitor
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3276 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3277 private:
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3278 std::unique_ptr<DcmElement> element_;
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3279 DicomReplaceMode mode_;
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3280
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3281 public:
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3282 Visitor(const DcmElement& element,
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3283 DicomReplaceMode mode) :
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3284 element_(dynamic_cast<DcmElement*>(element.clone())),
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3285 mode_(mode)
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3286 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3287 if (element_.get() == NULL)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3288 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3289 throw OrthancException(ErrorCode_InternalError, "Cannot clone DcmElement");
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3290 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3291 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3292
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3293 virtual void Visit(DcmItem& item,
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3294 const DicomPath& path) ORTHANC_OVERRIDE
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3295 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3296 std::unique_ptr<DcmElement> cloned(dynamic_cast<DcmElement*>(element_->clone()));
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3297 if (cloned.get() == NULL)
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3298 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3299 throw OrthancException(ErrorCode_InternalError, "Cannot clone DcmElement");
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3300 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3301 else
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3302 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3303 DcmTagKey key(path.GetFinalTag().GetGroup(), path.GetFinalTag().GetElement());
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3304
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3305 if (!item.tagExists(key))
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3306 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3307 switch (mode_)
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3308 {
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3309 case DicomReplaceMode_InsertIfAbsent:
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3310 break; // Fine, we can proceed with insertion
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3311
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3312 case DicomReplaceMode_ThrowIfAbsent:
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3313 throw OrthancException(ErrorCode_InexistentItem, "Cannot replace inexistent tag: " + GetTagName(*element_));
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3314
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3315 case DicomReplaceMode_IgnoreIfAbsent:
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3316 return; // Don't proceed with insertion
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3317
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3318 default:
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3319 throw OrthancException(ErrorCode_ParameterOutOfRange);
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3320 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3321 }
7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3322
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3323 if (!item.insert(cloned.release(), OFTrue /* replace old */).good())
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3324 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3325 throw OrthancException(ErrorCode_InternalError, "Cannot replace an element: " + GetTagName(*element_));
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3326 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3327 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3328 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3329 };
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3330
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3331 DcmTagKey key(path.GetFinalTag().GetGroup(), path.GetFinalTag().GetElement());
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3332
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3333 if (element.getTag() != key)
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3334 {
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3335 throw OrthancException(ErrorCode_ParameterOutOfRange,
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3336 "The final tag must be the same as the tag of the element during a replacement");
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3337 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3338 else
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3339 {
4683 7182f5732480 use of DicomPath in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4682 diff changeset	3340 Visitor visitor(element, mode);
4770 248408d2b336 hiding FromDcmtkBridge::Apply() on IDicomPathVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 4737 diff changeset	3341 IDicomPathVisitor::Apply(visitor, dataset, path);
4682 d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3342 }
d38a7040474a FromDcmtkBridge::RemovePath() and FromDcmtkBridge::ReplacePath() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4663 diff changeset	3343 }
4771 9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3344
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3345
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4771 diff changeset	3346 bool FromDcmtkBridge::LookupSequenceItem(DicomMap& target,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4771 diff changeset	3347 DcmDataset& dataset,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4771 diff changeset	3348 const DicomPath& path,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4771 diff changeset	3349 size_t sequenceIndex)
4771 9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3350 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3351 class Visitor : public FromDcmtkBridge::IDicomPathVisitor
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3352 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3353 private:
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3354 bool found_;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3355 DicomMap& target_;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3356 size_t sequenceIndex_;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3357
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3358 public:
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3359 Visitor(DicomMap& target,
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3360 size_t sequenceIndex) :
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3361 found_(false),
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3362 target_(target),
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3363 sequenceIndex_(sequenceIndex)
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3364 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3365 }
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3366
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3367 virtual void Visit(DcmItem& item,
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3368 const DicomPath& path) ORTHANC_OVERRIDE
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3369 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3370 DcmTagKey tag(path.GetFinalTag().GetGroup(), path.GetFinalTag().GetElement());
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3371
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3372 DcmSequenceOfItems *sequence = NULL;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3373
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3374 if (item.findAndGetSequence(tag, sequence).good() &&
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3375 sequence != NULL &&
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3376 sequenceIndex_ < sequence->card())
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3377 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3378 std::set<DicomTag> ignoreTagLength;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3379 ExtractDicomSummary(target_, *sequence->getItem(sequenceIndex_), 0, ignoreTagLength);
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3380 found_ = true;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3381 }
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3382 }
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3383
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3384 bool HasFound() const
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3385 {
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3386 return found_;
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3387 }
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3388 };
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3389
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3390 Visitor visitor(target, sequenceIndex);
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3391 IDicomPathVisitor::Apply(visitor, dataset, path);
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3392 return visitor.HasFound();
9f207131c7f4 added ParsedDicomFile::LookupSubSequence() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4770 diff changeset	3393 }
4953 60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3394
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3395
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3396 bool FromDcmtkBridge::LookupStringValue(std::string& target,
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3397 DcmDataset& dataset,
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3398 const DicomTag& key)
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3399 {
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3400 DcmTagKey dcmkey(key.GetGroup(), key.GetElement());
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3401
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3402 const char* str = NULL;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3403 const Uint8* data = NULL;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3404 unsigned long size = 0;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3405
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3406 if (dataset.findAndGetString(dcmkey, str).good() &&
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3407 str != NULL)
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3408 {
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3409 target.assign(str);
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3410 return true;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3411 }
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3412 else if (dataset.findAndGetUint8Array(dcmkey, data, &size).good() &&
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3413 data != NULL &&
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3414 size > 0)
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3415 {
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3416 /**
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3417 * This special case is necessary for borderline DICOM files
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3418 * that have DICOM tags have the "UN" value representation. New
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3419 * in Orthanc 1.10.1.
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3420 * https://groups.google.com/g/orthanc-users/c/86fobx3ZyoM/m/KBG17un6AQAJ
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3421 **/
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3422 unsigned long l = 0;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3423 while (l < size &&
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3424 data[l] != 0)
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3425 {
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3426 l++;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3427 }
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3428
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3429 target.assign(reinterpret_cast<const char*>(data), l);
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3430 return true;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3431 }
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3432 else
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3433 {
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3434 return false;
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3435 }
60cb4b379485 added FromDcmtkBridge::LookupStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4951 diff changeset	3436 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3437 }
3730 ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	3438
ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	3439
ae31ba2b09a6 toolbox: LookupTransferSyntax() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3727 diff changeset	3440 #include "./FromDcmtkBridge_TransferSyntaxes.impl.h"

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 5287:c04230962098 am-experimental