Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp @ 5100:9d51c000e91a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more verbose HTTPClient errors + avoid duplicate logging of same error
author Alain Mazy <am@osimis.io>
date Wed, 19 Oct 2022 12:40:14 +0200
parents 43e613a7756b
children 0ea402b4d901
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1893
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1130
diff changeset
4 * Department, University Hospital of Liege, Belgium
4870
43e613a7756b upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4831
diff changeset
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4831
diff changeset
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
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: 4044
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: 4044
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: 4044
diff changeset
11 * the License, or (at your option) any later version.
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful, but
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
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: 4044
diff changeset
16 * Lesser General Public License for more details.
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
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: 4044
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: 4044
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: 4044
diff changeset
20 * <http://www.gnu.org/licenses/>.
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 **/
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 /*=========================================================================
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 This file is based on portions of the following project:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 Program: DCMTK 3.6.0
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 Module: http://dicom.offis.de/dcmtk.php.en
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 Copyright (C) 1994-2011, OFFIS e.V.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 All rights reserved.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 This software and supporting documentation were developed by
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 OFFIS e.V.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 R&D Division Health
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 Escherweg 2
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 26121 Oldenburg, Germany
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 Redistribution and use in source and binary forms, with or without
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 modification, are permitted provided that the following conditions
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 are met:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 - Redistributions of source code must retain the above copyright
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 notice, this list of conditions and the following disclaimer.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 - Redistributions in binary form must reproduce the above copyright
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 notice, this list of conditions and the following disclaimer in the
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 documentation and/or other materials provided with the distribution.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 - Neither the name of OFFIS nor the names of its contributors may be
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 used to endorse or promote products derived from this software
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 without specific prior written permission.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 =========================================================================*/
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 /***
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 Validation:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 # sudo apt-get install dicom3tools
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 # dciodvfy DICOMDIR 2>&1 | less
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 # dcentvfy DICOMDIR 2>&1 | less
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 http://www.dclunie.com/dicom3tools/dciodvfy.html
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 DICOMDIR viewer working with Wine under Linux:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 http://www.microdicom.com/
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 ***/
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
91 #include "../PrecompiledHeaders.h"
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 #include "DicomDirWriter.h"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 #include "FromDcmtkBridge.h"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 #include "ToDcmtkBridge.h"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
97 #include "../Compatibility.h"
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
98 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
99 #include "../OrthancException.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
100 #include "../TemporaryFile.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
101 #include "../Toolbox.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
102 #include "../SystemToolbox.h"
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 #include <dcmtk/dcmdata/dcdicdir.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 #include <dcmtk/dcmdata/dcmetinf.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 #include <dcmtk/dcmdata/dcdeftag.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 #include <dcmtk/dcmdata/dcuid.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 #include <dcmtk/dcmdata/dcddirif.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 #include <dcmtk/dcmdata/dcvrui.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 #include <dcmtk/dcmdata/dcsequen.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 #include <dcmtk/dcmdata/dcostrmf.h>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 #include "dcmtk/dcmdata/dcvrda.h" /* for class DcmDate */
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 #include "dcmtk/dcmdata/dcvrtm.h" /* for class DcmTime */
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 #include <memory>
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 namespace Orthanc
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 class DicomDirWriter::PImpl
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 private:
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
122 bool utc_;
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
123 std::string fileSetId_;
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
124 bool extendedSopClass_;
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
125 TemporaryFile file_;
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
126 std::unique_ptr<DcmDicomDir> dir_;
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 typedef std::pair<ResourceType, std::string> IndexKey;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 typedef std::map<IndexKey, DcmDirectoryRecord* > Index;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 Index index_;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 DcmDicomDir& GetDicomDir()
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 if (dir_.get() == NULL)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 dir_.reset(new DcmDicomDir(file_.GetPath().c_str(),
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 fileSetId_.c_str()));
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
139 //SetTagValue(dir_->getRootRecord(), DCM_SpecificCharacterSet, GetDicomSpecificCharacterSet(Encoding_Utf8));
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 return *dir_;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 DcmDirectoryRecord& GetRoot()
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 return GetDicomDir().getRootRecord();
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
152 static bool GetUtf8TagValue(std::string& result,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
153 DcmItem& source,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
154 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
155 bool hasCodeExtensions,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
156 const DcmTagKey& key)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
157 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
158 DcmElement* element = NULL;
2571
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
159 result.clear();
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
160
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
161 if (source.findAndGetElement(key, element).good())
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
162 {
1893
d7f63122c7f3 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1885
diff changeset
163 char* s = NULL;
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
164 if (element->isLeaf() &&
2571
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
165 element->getString(s).good())
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
166 {
2571
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
167 if (s != NULL)
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
168 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
169 result = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
2571
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
170 }
a84ce82fd55b Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2475
diff changeset
171
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
172 return true;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
173 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
174 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
175
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
176 return false;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
177 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
178
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
179
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
180 static void SetTagValue(DcmDirectoryRecord& target,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
181 const DcmTagKey& key,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
182 const std::string& valueUtf8)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
183 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
184 std::string s = Toolbox::ConvertFromUtf8(valueUtf8, Encoding_Ascii);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
185
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
186 if (!target.putAndInsertString(key, s.c_str()).good())
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
187 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
188 throw OrthancException(ErrorCode_InternalError);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
189 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
190 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
191
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
192
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
193
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
194 static bool CopyString(DcmDirectoryRecord& target,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
195 DcmDataset& source,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
196 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
197 bool hasCodeExtensions,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
198 const DcmTagKey& key,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
199 bool optional,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
200 bool copyEmpty)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
201 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
202 if (optional &&
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
203 !source.tagExistsWithValue(key) &&
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
204 !(copyEmpty && source.tagExists(key)))
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
205 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
206 return false;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
207 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
208
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
209 std::string value;
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
210 bool found = GetUtf8TagValue(value, source, encoding, hasCodeExtensions, key);
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
211
2421
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
212 if (!found)
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
213 {
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
214 // We don't raise an exception if "!optional", even if this
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
215 // results in an invalid DICOM file
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
216 value.clear();
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
217 }
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
218
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
219 SetTagValue(target, key, value);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
220 return found;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
221 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
222
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
223
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
224 static void CopyStringType1(DcmDirectoryRecord& target,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
225 DcmDataset& source,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
226 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
227 bool hasCodeExtensions,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
228 const DcmTagKey& key)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
229 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
230 CopyString(target, source, encoding, hasCodeExtensions, key, false, false);
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
231 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
232
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
233 static void CopyStringType1C(DcmDirectoryRecord& target,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
234 DcmDataset& source,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
235 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
236 bool hasCodeExtensions,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
237 const DcmTagKey& key)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
238 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
239 CopyString(target, source, encoding, hasCodeExtensions, key, true, false);
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
240 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
241
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
242 static void CopyStringType2(DcmDirectoryRecord& target,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
243 DcmDataset& source,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
244 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
245 bool hasCodeExtensions,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
246 const DcmTagKey& key)
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
247 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
248 CopyString(target, source, encoding, hasCodeExtensions, key, false, true);
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
249 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
250
2421
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
251 static void CopyStringType3(DcmDirectoryRecord& target,
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
252 DcmDataset& source,
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
253 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
254 bool hasCodeExtensions,
2421
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
255 const DcmTagKey& key)
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
256 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
257 CopyString(target, source, encoding, hasCodeExtensions, key, true, true);
2421
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
258 }
d0fe5ec7eb05 playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
259
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
260
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 public:
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
262 PImpl() :
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
263 utc_(true), // By default, use UTC (universal time, not local time)
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
264 fileSetId_("ORTHANC_MEDIA"),
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
265 extendedSopClass_(false)
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
266 {
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
267 }
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
268
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
269 bool IsUtcUsed() const
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
270 {
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
271 return utc_;
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
272 }
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
273
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
274
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
275 void SetUtcUsed(bool utc)
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
276 {
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
277 utc_ = utc;
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
278 }
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
279
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
280 void EnableExtendedSopClass(bool enable)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 {
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
282 if (enable)
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
283 {
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
284 LOG(WARNING) << "Generating a DICOMDIR with type 3 attributes, "
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
285 << "which leads to an Extended SOP Class";
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
286 }
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
287
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
288 extendedSopClass_ = enable;
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
289 }
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
290
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
291 bool IsExtendedSopClass() const
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
292 {
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
293 return extendedSopClass_;
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 void FillPatient(DcmDirectoryRecord& record,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
297 DcmDataset& dicom,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
298 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
299 bool hasCodeExtensions)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 // cf. "DicomDirInterface::buildPatientRecord()"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
303 CopyStringType1C(record, dicom, encoding, hasCodeExtensions, DCM_PatientID);
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
304 CopyStringType2(record, dicom, encoding, hasCodeExtensions, DCM_PatientName);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 void FillStudy(DcmDirectoryRecord& record,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
308 DcmDataset& dicom,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
309 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
310 bool hasCodeExtensions)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 // cf. "DicomDirInterface::buildStudyRecord()"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
314 std::string nowDate, nowTime;
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
315 SystemToolbox::GetNowDicom(nowDate, nowTime, utc_);
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
316
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
317 std::string studyDate;
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
318 if (!GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_StudyDate) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
319 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_SeriesDate) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
320 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_AcquisitionDate) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
321 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_ContentDate))
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
322 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
323 studyDate = nowDate;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
324 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
325
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
326 std::string studyTime;
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
327 if (!GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_StudyTime) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
328 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_SeriesTime) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
329 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_AcquisitionTime) &&
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
330 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_ContentTime))
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
331 {
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
332 studyTime = nowTime;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
333 }
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
334
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 /* copy attribute values from dataset to study record */
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
336 SetTagValue(record, DCM_StudyDate, studyDate);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
337 SetTagValue(record, DCM_StudyTime, studyTime);
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
338 CopyStringType2(record, dicom, encoding, hasCodeExtensions, DCM_StudyDescription);
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
339 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_StudyInstanceUID);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
340 /* use type 1C instead of 1 in order to avoid unwanted overwriting */
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
341 CopyStringType1C(record, dicom, encoding, hasCodeExtensions, DCM_StudyID);
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
342 CopyStringType2(record, dicom, encoding, hasCodeExtensions, DCM_AccessionNumber);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
344
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
345 void FillSeries(DcmDirectoryRecord& record,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
346 DcmDataset& dicom,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
347 Encoding encoding,
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
348 bool hasCodeExtensions)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
350 // cf. "DicomDirInterface::buildSeriesRecord()"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
351
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352 /* copy attribute values from dataset to series record */
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
353 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_Modality);
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
354 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_SeriesInstanceUID);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355 /* use type 1C instead of 1 in order to avoid unwanted overwriting */
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
356 CopyStringType1C(record, dicom, encoding, hasCodeExtensions, DCM_SeriesNumber);
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
357
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
358 // Add extended (non-standard) type 3 tags, those are not generated by DCMTK
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
359 // http://dicom.nema.org/medical/Dicom/2016a/output/chtml/part02/sect_7.3.html
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
360 // https://groups.google.com/d/msg/orthanc-users/Y7LOvZMDeoc/9cp3kDgxAwAJ
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
361 if (extendedSopClass_)
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
362 {
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
363 CopyStringType3(record, dicom, encoding, hasCodeExtensions, DCM_SeriesDescription);
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
364 }
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
366
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 void FillInstance(DcmDirectoryRecord& record,
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
368 DcmDataset& dicom,
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
369 Encoding encoding,
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
370 bool hasCodeExtensions,
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
371 DcmMetaInfo& metaInfo,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 const char* path)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 // cf. "DicomDirInterface::buildImageRecord()"
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
375
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
376 /* copy attribute values from dataset to image record */
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
377 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_InstanceNumber);
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
378 //CopyElementType1C(record, dicom, encoding, hasCodeExtensions, DCM_ImageType);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
380 // REMOVED since 0.9.7: copyElementType1C(dicom, DCM_ReferencedImageSequence, record);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
382 std::string sopClassUid, sopInstanceUid, transferSyntaxUid;
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
383 if (!GetUtf8TagValue(sopClassUid, dicom, encoding, hasCodeExtensions, DCM_SOPClassUID) ||
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
384 !GetUtf8TagValue(sopInstanceUid, dicom, encoding, hasCodeExtensions, DCM_SOPInstanceUID) ||
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
385 !GetUtf8TagValue(transferSyntaxUid, metaInfo, encoding, hasCodeExtensions, DCM_TransferSyntaxUID))
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 throw OrthancException(ErrorCode_BadFileFormat);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 }
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
389
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
390 SetTagValue(record, DCM_ReferencedFileID, path);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
391 SetTagValue(record, DCM_ReferencedSOPClassUIDInFile, sopClassUid);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
392 SetTagValue(record, DCM_ReferencedSOPInstanceUIDInFile, sopInstanceUid);
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
393 SetTagValue(record, DCM_ReferencedTransferSyntaxUIDInFile, transferSyntaxUid);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
394 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398 bool CreateResource(DcmDirectoryRecord*& target,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 ResourceType level,
4203
4d42408da117 improving const-correctness in ParsedDicomFile
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4200
diff changeset
400 ParsedDicomFile& dicom,
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401 const char* filename,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402 const char* path)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 {
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
404 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset();
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
405
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
406 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
407 Encoding encoding = dicom.DetectEncoding(hasCodeExtensions);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
409 bool found;
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
410 std::string id;
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 E_DirRecType type;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413 switch (level)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415 case ResourceType_Patient:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
416 if (!GetUtf8TagValue(id, dataset, encoding, hasCodeExtensions, DCM_PatientID))
3107
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
417 {
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
418 // Be tolerant about missing patient ID. Fixes issue #124
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
419 // (GET /studies/ID/media fails for certain dicom file).
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
420 id = "";
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
421 }
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
422
554832246eaa Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
423 found = true;
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
424 type = ERT_Patient;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
425 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427 case ResourceType_Study:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
428 found = GetUtf8TagValue(id, dataset, encoding, hasCodeExtensions, DCM_StudyInstanceUID);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
429 type = ERT_Study;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
430 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
431
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
432 case ResourceType_Series:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
433 found = GetUtf8TagValue(id, dataset, encoding, hasCodeExtensions, DCM_SeriesInstanceUID);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
434 type = ERT_Series;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
435 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
436
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
437 case ResourceType_Instance:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
438 found = GetUtf8TagValue(id, dataset, encoding, hasCodeExtensions, DCM_SOPInstanceUID);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
439 type = ERT_Image;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
441
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
442 default:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
443 throw OrthancException(ErrorCode_InternalError);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
444 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
445
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
446 if (!found)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
447 {
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
448 throw OrthancException(ErrorCode_BadFileFormat);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
449 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
450
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
451 IndexKey key = std::make_pair(level, std::string(id.c_str()));
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
452 Index::iterator it = index_.find(key);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454 if (it != index_.end())
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456 target = it->second;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 return false; // Already existing
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
460 std::unique_ptr<DcmDirectoryRecord> record(new DcmDirectoryRecord(type, NULL, filename));
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
462 switch (level)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
463 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
464 case ResourceType_Patient:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
465 FillPatient(*record, dataset, encoding, hasCodeExtensions);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
466 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
467
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
468 case ResourceType_Study:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
469 FillStudy(*record, dataset, encoding, hasCodeExtensions);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
470 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
471
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
472 case ResourceType_Series:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
473 FillSeries(*record, dataset, encoding, hasCodeExtensions);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 case ResourceType_Instance:
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
477 FillInstance(*record, dataset, encoding, hasCodeExtensions, *dicom.GetDcmtkObject().getMetaInfo(), path);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 break;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 default:
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 throw OrthancException(ErrorCode_InternalError);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
483
3217
cf8cbeb35f33 preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3107
diff changeset
484 CopyStringType1C(*record, dataset, encoding, hasCodeExtensions, DCM_SpecificCharacterSet);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486 target = record.get();
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487 GetRoot().insertSub(record.release());
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
488 index_[key] = target;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
490 return true; // Newly created
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
491 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492
4471
b6818bbef7b8 patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
493 void Write(std::string& s)
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
494 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
495 if (!GetDicomDir().write(DICOMDIR_DEFAULT_TRANSFERSYNTAX,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
496 EET_UndefinedLength /*encodingType*/,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
497 EGL_withoutGL /*groupLength*/).good())
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 throw OrthancException(ErrorCode_InternalError);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
500 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502 file_.Read(s);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 void SetFileSetId(const std::string& id)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507 dir_.reset(NULL);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 fileSetId_ = id;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510 };
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
513 DicomDirWriter::DicomDirWriter() : pimpl_(new PImpl)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
514 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
515 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
516
2475
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
517 void DicomDirWriter::SetUtcUsed(bool utc)
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
518 {
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
519 pimpl_->SetUtcUsed(utc);
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
520 }
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
521
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
522 bool DicomDirWriter::IsUtcUsed() const
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
523 {
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
524 return pimpl_->IsUtcUsed();
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
525 }
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
526
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
527 void DicomDirWriter::SetFileSetId(const std::string& id)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
528 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
529 pimpl_->SetFileSetId(id);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
530 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
531
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
532 void DicomDirWriter::Add(const std::string& directory,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
533 const std::string& filename,
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
534 ParsedDicomFile& dicom)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
535 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
536 std::string path;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
537 if (directory.empty())
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
538 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
539 path = filename;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
540 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
541 else
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
542 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
543 if (directory[directory.length() - 1] == '/' ||
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
544 directory[directory.length() - 1] == '\\')
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
545 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
546 throw OrthancException(ErrorCode_ParameterOutOfRange);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
547 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
548
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
549 path = directory + '\\' + filename;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
550 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
551
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
552 DcmDirectoryRecord* instance;
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
553 bool isNewInstance = pimpl_->CreateResource(instance, ResourceType_Instance, dicom, filename.c_str(), path.c_str());
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
554 if (isNewInstance)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
555 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
556 DcmDirectoryRecord* series;
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
557 bool isNewSeries = pimpl_->CreateResource(series, ResourceType_Series, dicom, filename.c_str(), NULL);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
558 series->insertSub(instance);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
559
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
560 if (isNewSeries)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
561 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
562 DcmDirectoryRecord* study;
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
563 bool isNewStudy = pimpl_->CreateResource(study, ResourceType_Study, dicom, filename.c_str(), NULL);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
564 study->insertSub(series);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
565
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
566 if (isNewStudy)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
567 {
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
568 DcmDirectoryRecord* patient;
1885
5be57564ffc4 refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
569 pimpl_->CreateResource(patient, ResourceType_Patient, dicom, filename.c_str(), NULL);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
570 patient->insertSub(study);
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
571 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
572 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
573 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
574 }
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
575
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
576 void DicomDirWriter::Encode(std::string& target)
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
577 {
4471
b6818bbef7b8 patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
578 pimpl_->Write(target);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
579 }
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
580
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
581
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
582 void DicomDirWriter::EnableExtendedSopClass(bool enable)
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
583 {
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
584 pimpl_->EnableExtendedSopClass(enable);
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
585 }
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
586
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
587
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
588 bool DicomDirWriter::IsExtendedSopClass() const
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
589 {
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
590 return pimpl_->IsExtendedSopClass();
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2421
diff changeset
591 }
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
592 }