Mercurial > hg > orthanc
annotate Core/DicomParsing/DicomDirWriter.cpp @ 3792:6dba4fa8a6cb
remove universal wildcard on StudyDate in OrthancExplorer
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 26 Mar 2020 07:19:30 +0100 |
parents | 2a170a8f1faf |
children |
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 | 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 |
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3217
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
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 * 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
|
25 * 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
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
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 * You should have received a copy of the GNU General Public License |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 |
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 /*========================================================================= |
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 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
|
40 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 Program: DCMTK 3.6.0 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 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
|
43 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 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
|
45 All rights reserved. |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 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
|
48 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 OFFIS e.V. |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 R&D Division Health |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 Escherweg 2 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 26121 Oldenburg, Germany |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 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
|
55 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
|
56 are met: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 - 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
|
59 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
|
60 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 - 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
|
62 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
|
63 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
|
64 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 - 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
|
66 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
|
67 without specific prior written permission. |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 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
|
70 "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
|
71 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
|
72 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
|
73 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
|
74 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
|
75 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
|
76 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
|
77 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
|
78 (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
|
79 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
|
80 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 =========================================================================*/ |
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 |
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 /*** |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
86 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
87 Validation: |
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 # sudo apt-get install dicom3tools |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
90 # dciodvfy DICOMDIR 2>&1 | less |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
91 # dcentvfy DICOMDIR 2>&1 | less |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
92 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
93 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
|
94 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
95 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
|
96 http://www.microdicom.com/ |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
97 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
98 ***/ |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
99 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
100 |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
101 #include "../PrecompiledHeaders.h" |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
102 #include "DicomDirWriter.h" |
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 "FromDcmtkBridge.h" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
105 #include "ToDcmtkBridge.h" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
106 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
107 #include "../Compatibility.h" |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
108 #include "../Logging.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
109 #include "../OrthancException.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
110 #include "../TemporaryFile.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
111 #include "../Toolbox.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
112 #include "../SystemToolbox.h" |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
113 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
114 #include <dcmtk/dcmdata/dcdicdir.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
115 #include <dcmtk/dcmdata/dcmetinf.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 #include <dcmtk/dcmdata/dcdeftag.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 #include <dcmtk/dcmdata/dcuid.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 #include <dcmtk/dcmdata/dcddirif.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 #include <dcmtk/dcmdata/dcvrui.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 #include <dcmtk/dcmdata/dcsequen.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 #include <dcmtk/dcmdata/dcostrmf.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 #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
|
123 #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
|
124 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 #include <memory> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
127 namespace Orthanc |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
128 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
129 class DicomDirWriter::PImpl |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
130 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 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
|
135 TemporaryFile file_; |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
136 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
|
137 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
138 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
|
139 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
|
140 Index index_; |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
143 DcmDicomDir& GetDicomDir() |
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 if (dir_.get() == NULL) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
146 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
147 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
|
148 fileSetId_.c_str())); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
149 //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
|
150 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
151 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
152 return *dir_; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
153 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
154 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
155 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 DcmDirectoryRecord& GetRoot() |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
157 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
158 return GetDicomDir().getRootRecord(); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
159 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
160 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
161 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
162 static bool GetUtf8TagValue(std::string& result, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
163 DcmItem& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
164 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
165 bool hasCodeExtensions, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
166 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
167 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
168 DcmElement* element = NULL; |
2571
a84ce82fd55b
Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
169 result.clear(); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
170 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
171 if (source.findAndGetElement(key, element).good()) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
172 { |
1893 | 173 char* s = NULL; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
174 if (element->isLeaf() && |
2571
a84ce82fd55b
Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
175 element->getString(s).good()) |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
176 { |
2571
a84ce82fd55b
Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
177 if (s != NULL) |
a84ce82fd55b
Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
178 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
179 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
|
180 } |
a84ce82fd55b
Fix generation of DICOMDIR if PatientID is empty
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2475
diff
changeset
|
181 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
182 return true; |
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 } |
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 return false; |
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 |
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 static void SetTagValue(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
191 const DcmTagKey& key, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
192 const std::string& valueUtf8) |
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 std::string s = Toolbox::ConvertFromUtf8(valueUtf8, Encoding_Ascii); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
195 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
196 if (!target.putAndInsertString(key, s.c_str()).good()) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
197 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
198 throw OrthancException(ErrorCode_InternalError); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
199 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
200 } |
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 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
203 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
204 static bool CopyString(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
205 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
206 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
207 bool hasCodeExtensions, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
208 const DcmTagKey& key, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
209 bool optional, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
210 bool copyEmpty) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
211 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
212 if (optional && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
213 !source.tagExistsWithValue(key) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
214 !(copyEmpty && source.tagExists(key))) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
215 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
216 return false; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
217 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
218 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
219 std::string value; |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
220 bool found = GetUtf8TagValue(value, source, encoding, hasCodeExtensions, key); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
221 |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
222 if (!found) |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
223 { |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
224 // 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
|
225 // results in an invalid DICOM file |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
226 value.clear(); |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
227 } |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
228 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
229 SetTagValue(target, key, value); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
230 return found; |
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 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
234 static void CopyStringType1(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
235 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
236 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
237 bool hasCodeExtensions, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
238 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
239 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
240 CopyString(target, source, encoding, hasCodeExtensions, key, false, false); |
1885
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 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
243 static void CopyStringType1C(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
244 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
245 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
246 bool hasCodeExtensions, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
247 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
248 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
249 CopyString(target, source, encoding, hasCodeExtensions, key, true, false); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
250 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
251 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
252 static void CopyStringType2(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
253 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
254 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
255 bool hasCodeExtensions, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
256 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
257 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
258 CopyString(target, source, encoding, hasCodeExtensions, key, false, true); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
259 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
260 |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
261 static void CopyStringType3(DcmDirectoryRecord& target, |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
262 DcmDataset& source, |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
263 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
264 bool hasCodeExtensions, |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
265 const DcmTagKey& key) |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
266 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
267 CopyString(target, source, encoding, hasCodeExtensions, key, true, true); |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
268 } |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
269 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
270 |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
271 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
|
272 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
|
273 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
|
274 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
|
275 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
|
276 { |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
277 } |
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
|
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 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
|
280 { |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
281 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
|
282 } |
2422
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
283 |
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
|
284 |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
285 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
|
286 { |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
287 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
|
288 } |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
289 |
2422
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
290 void EnableExtendedSopClass(bool enable) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
291 { |
2422
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
292 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
|
293 { |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
294 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
|
295 << "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
|
296 } |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
297 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
298 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
|
299 } |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
300 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
301 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
|
302 { |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
303 return extendedSopClass_; |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
304 } |
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 void FillPatient(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
307 DcmDataset& dicom, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
308 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
309 bool hasCodeExtensions) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
310 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
311 // cf. "DicomDirInterface::buildPatientRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
312 |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
313 CopyStringType1C(record, dicom, encoding, hasCodeExtensions, DCM_PatientID); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
314 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
|
315 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
316 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
317 void FillStudy(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
318 DcmDataset& dicom, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
319 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
320 bool hasCodeExtensions) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
321 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
322 // cf. "DicomDirInterface::buildStudyRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
323 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
324 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
|
325 SystemToolbox::GetNowDicom(nowDate, nowTime, utc_); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
326 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
327 std::string studyDate; |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
328 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
|
329 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_SeriesDate) && |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
330 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_AcquisitionDate) && |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
331 !GetUtf8TagValue(studyDate, dicom, encoding, hasCodeExtensions, DCM_ContentDate)) |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
332 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
333 studyDate = nowDate; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
334 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
335 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
336 std::string studyTime; |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
337 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
|
338 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_SeriesTime) && |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
339 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_AcquisitionTime) && |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
340 !GetUtf8TagValue(studyTime, dicom, encoding, hasCodeExtensions, DCM_ContentTime)) |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
341 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
342 studyTime = nowTime; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
343 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
344 |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
345 /* copy attribute values from dataset to study record */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
346 SetTagValue(record, DCM_StudyDate, studyDate); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
347 SetTagValue(record, DCM_StudyTime, studyTime); |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
348 CopyStringType2(record, dicom, encoding, hasCodeExtensions, DCM_StudyDescription); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
349 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
|
350 /* 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
|
351 CopyStringType1C(record, dicom, encoding, hasCodeExtensions, DCM_StudyID); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
352 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
|
353 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
354 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
355 void FillSeries(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
356 DcmDataset& dicom, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
357 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
358 bool hasCodeExtensions) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
359 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
360 // cf. "DicomDirInterface::buildSeriesRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
361 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
362 /* 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
|
363 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_Modality); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
364 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
|
365 /* 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
|
366 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
|
367 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
368 // 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
|
369 // 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
|
370 // 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
|
371 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
|
372 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
373 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
|
374 } |
1121
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
377 void FillInstance(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
378 DcmDataset& dicom, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
379 Encoding encoding, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
380 bool hasCodeExtensions, |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
381 DcmMetaInfo& metaInfo, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
382 const char* path) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
383 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
384 // cf. "DicomDirInterface::buildImageRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
385 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
386 /* 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
|
387 CopyStringType1(record, dicom, encoding, hasCodeExtensions, DCM_InstanceNumber); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
388 //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
|
389 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
390 // 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
|
391 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
392 std::string sopClassUid, sopInstanceUid, transferSyntaxUid; |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
393 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
|
394 !GetUtf8TagValue(sopInstanceUid, dicom, encoding, hasCodeExtensions, DCM_SOPInstanceUID) || |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
395 !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
|
396 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
397 throw OrthancException(ErrorCode_BadFileFormat); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
398 } |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
399 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
400 SetTagValue(record, DCM_ReferencedFileID, path); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
401 SetTagValue(record, DCM_ReferencedSOPClassUIDInFile, sopClassUid); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
402 SetTagValue(record, DCM_ReferencedSOPInstanceUIDInFile, sopInstanceUid); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
403 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
|
404 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
405 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
406 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
407 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
408 bool CreateResource(DcmDirectoryRecord*& target, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
409 ResourceType level, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
410 ParsedDicomFile& dicom, |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
411 const char* filename, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
412 const char* path) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
413 { |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
414 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset(); |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
415 |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
416 bool hasCodeExtensions; |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
417 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
|
418 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
419 bool found; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
420 std::string id; |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
421 E_DirRecType type; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
422 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
423 switch (level) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
424 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
425 case ResourceType_Patient: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
426 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
|
427 { |
554832246eaa
Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
428 // 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
|
429 // (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
|
430 id = ""; |
554832246eaa
Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
431 } |
554832246eaa
Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
432 |
554832246eaa
Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
433 found = true; |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
434 type = ERT_Patient; |
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_Study: |
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_StudyInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
439 type = ERT_Study; |
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 case ResourceType_Series: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
443 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
|
444 type = ERT_Series; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
445 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
446 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
447 case ResourceType_Instance: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
448 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
|
449 type = ERT_Image; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
450 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
451 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
452 default: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
453 throw OrthancException(ErrorCode_InternalError); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
454 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
455 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
456 if (!found) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
457 { |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
458 throw OrthancException(ErrorCode_BadFileFormat); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
459 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
460 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
461 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
|
462 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
|
463 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
464 if (it != index_.end()) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
465 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
466 target = it->second; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
467 return false; // Already existing |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
468 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
469 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
470 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
|
471 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
472 switch (level) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
473 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
474 case ResourceType_Patient: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
475 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
|
476 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
477 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
478 case ResourceType_Study: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
479 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
|
480 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
481 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
482 case ResourceType_Series: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
483 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
|
484 break; |
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 case ResourceType_Instance: |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
487 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
|
488 break; |
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 default: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
491 throw OrthancException(ErrorCode_InternalError); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
492 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
493 |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3107
diff
changeset
|
494 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
|
495 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
496 target = record.get(); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
497 GetRoot().insertSub(record.release()); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
498 index_[key] = target; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
499 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
500 return true; // Newly created |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
503 void Read(std::string& s) |
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 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
|
506 EET_UndefinedLength /*encodingType*/, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
507 EGL_withoutGL /*groupLength*/).good()) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
508 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
509 throw OrthancException(ErrorCode_InternalError); |
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 file_.Read(s); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
513 } |
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 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
|
516 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
517 dir_.reset(NULL); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
518 fileSetId_ = id; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
519 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
520 }; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
521 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
522 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
523 DicomDirWriter::DicomDirWriter() : pimpl_(new PImpl) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
524 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
525 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
526 |
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
|
527 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
|
528 { |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
529 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
|
530 } |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
531 |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
532 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
|
533 { |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
534 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
|
535 } |
8cc3ca64a534
Orthanc now uses UTC (universal time) instead of local time in its database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
536 |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
537 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
|
538 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
539 pimpl_->SetFileSetId(id); |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
542 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
|
543 const std::string& filename, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
544 ParsedDicomFile& dicom) |
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 std::string path; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
547 if (directory.empty()) |
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 = 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 else |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
552 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
553 if (directory[directory.length() - 1] == '/' || |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
554 directory[directory.length() - 1] == '\\') |
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 throw OrthancException(ErrorCode_ParameterOutOfRange); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
557 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
558 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
559 path = directory + '\\' + filename; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
560 } |
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* instance; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
563 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
|
564 if (isNewInstance) |
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 DcmDirectoryRecord* series; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
567 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
|
568 series->insertSub(instance); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
569 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
570 if (isNewSeries) |
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 DcmDirectoryRecord* study; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
573 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
|
574 study->insertSub(series); |
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 if (isNewStudy) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
577 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
578 DcmDirectoryRecord* patient; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
579 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
|
580 patient->insertSub(study); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
581 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
582 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
583 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
584 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
585 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
586 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
|
587 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
588 pimpl_->Read(target); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
589 } |
2422
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
590 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
591 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
592 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
|
593 { |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
594 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
|
595 } |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
596 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
597 |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
598 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
|
599 { |
b340f0a9022c
New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2421
diff
changeset
|
600 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
|
601 } |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
602 } |