Mercurial > hg > orthanc
annotate Core/DicomParsing/DicomDirWriter.cpp @ 2421:d0fe5ec7eb05
playing with dicomdir
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sun, 08 Oct 2017 11:13:56 +0200 |
parents | 7284093111b0 |
children | b340f0a9022c |
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 |
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2143
diff
changeset
|
5 * Copyright (C) 2017 Osimis, 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 |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
107 #include "../Logging.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
108 #include "../OrthancException.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
109 #include "../TemporaryFile.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
110 #include "../Toolbox.h" |
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
111 #include "../SystemToolbox.h" |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
112 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
113 #include <dcmtk/dcmdata/dcdicdir.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
114 #include <dcmtk/dcmdata/dcmetinf.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
115 #include <dcmtk/dcmdata/dcdeftag.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 #include <dcmtk/dcmdata/dcuid.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 #include <dcmtk/dcmdata/dcddirif.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 #include <dcmtk/dcmdata/dcvrui.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 #include <dcmtk/dcmdata/dcsequen.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 #include <dcmtk/dcmdata/dcostrmf.h> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 #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
|
122 #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
|
123 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
124 #include <memory> |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 namespace Orthanc |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
127 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
128 class DicomDirWriter::PImpl |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
129 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
130 private: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
131 std::string fileSetId_; |
2140 | 132 TemporaryFile file_; |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
133 std::auto_ptr<DcmDicomDir> dir_; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
134 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
135 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
|
136 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
|
137 Index index_; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
138 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
139 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
140 DcmDicomDir& GetDicomDir() |
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 if (dir_.get() == NULL) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
143 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
144 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
|
145 fileSetId_.c_str())); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
146 //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
|
147 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
148 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
149 return *dir_; |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
153 DcmDirectoryRecord& GetRoot() |
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 return GetDicomDir().getRootRecord(); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 } |
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 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
159 static bool GetUtf8TagValue(std::string& result, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
160 DcmItem& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
161 Encoding encoding, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
162 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
163 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
164 DcmElement* element = NULL; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
165 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
166 if (source.findAndGetElement(key, element).good()) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
167 { |
1893 | 168 char* s = NULL; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
169 if (element->isLeaf() && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
170 element->getString(s).good() && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
171 s != NULL) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
172 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
173 result = Toolbox::ConvertToUtf8(s, encoding); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
174 return true; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
175 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
176 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
177 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
178 result.clear(); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
179 return false; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
180 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
181 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
182 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
183 static void SetTagValue(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
184 const DcmTagKey& key, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
185 const std::string& valueUtf8) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
186 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
187 std::string s = Toolbox::ConvertFromUtf8(valueUtf8, Encoding_Ascii); |
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 if (!target.putAndInsertString(key, s.c_str()).good()) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
190 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
191 throw OrthancException(ErrorCode_InternalError); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
192 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
193 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
194 |
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 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
197 static bool CopyString(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
198 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
199 Encoding encoding, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
200 const DcmTagKey& key, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
201 bool optional, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
202 bool copyEmpty) |
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 if (optional && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
205 !source.tagExistsWithValue(key) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
206 !(copyEmpty && source.tagExists(key))) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
207 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
208 return false; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
209 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
210 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
211 std::string value; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
212 bool found = GetUtf8TagValue(value, source, encoding, key); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
213 |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
214 if (!found) |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
215 { |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
216 // 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
|
217 // results in an invalid DICOM file |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
218 value.clear(); |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
219 } |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
220 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
221 SetTagValue(target, key, value); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
222 return found; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
223 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
224 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
225 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
226 static void CopyStringType1(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
227 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
228 Encoding encoding, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
229 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
230 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
231 CopyString(target, source, encoding, key, false, false); |
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 CopyStringType1C(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, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
237 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
238 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
239 CopyString(target, source, encoding, key, true, false); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
240 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
241 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
242 static void CopyStringType2(DcmDirectoryRecord& target, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
243 DcmDataset& source, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
244 Encoding encoding, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
245 const DcmTagKey& key) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
246 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
247 CopyString(target, source, encoding, key, false, true); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
248 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
249 |
2421
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
250 static void CopyStringType3(DcmDirectoryRecord& target, |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
251 DcmDataset& source, |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
252 Encoding encoding, |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
253 const DcmTagKey& key) |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
254 { |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
255 CopyString(target, source, encoding, key, true, true); |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
256 } |
d0fe5ec7eb05
playing with dicomdir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
257 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
258 |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
259 public: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
260 PImpl() : fileSetId_("ORTHANC_MEDIA") |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
261 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
262 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
263 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
264 void FillPatient(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
265 DcmDataset& dicom, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
266 Encoding encoding) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
267 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
268 // cf. "DicomDirInterface::buildPatientRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
269 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
270 CopyStringType1C(record, dicom, encoding, DCM_PatientID); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
271 CopyStringType2(record, dicom, encoding, DCM_PatientName); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
272 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
273 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
274 void FillStudy(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
275 DcmDataset& dicom, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
276 Encoding encoding) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
277 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
278 // cf. "DicomDirInterface::buildStudyRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
279 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
280 std::string nowDate, nowTime; |
2140 | 281 SystemToolbox::GetNowDicom(nowDate, nowTime); |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
282 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
283 std::string studyDate; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
284 if (!GetUtf8TagValue(studyDate, dicom, encoding, DCM_StudyDate) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
285 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_SeriesDate) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
286 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_AcquisitionDate) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
287 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_ContentDate)) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
288 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
289 studyDate = nowDate; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
290 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
291 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
292 std::string studyTime; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
293 if (!GetUtf8TagValue(studyTime, dicom, encoding, DCM_StudyTime) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
294 !GetUtf8TagValue(studyTime, dicom, encoding, DCM_SeriesTime) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
295 !GetUtf8TagValue(studyTime, dicom, encoding, DCM_AcquisitionTime) && |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
296 !GetUtf8TagValue(studyTime, dicom, encoding, DCM_ContentTime)) |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
297 { |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
298 studyTime = nowTime; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
299 } |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
300 |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
301 /* copy attribute values from dataset to study record */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
302 SetTagValue(record, DCM_StudyDate, studyDate); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
303 SetTagValue(record, DCM_StudyTime, studyTime); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
304 CopyStringType2(record, dicom, encoding, DCM_StudyDescription); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
305 CopyStringType1(record, dicom, encoding, DCM_StudyInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
306 /* use type 1C instead of 1 in order to avoid unwanted overwriting */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
307 CopyStringType1C(record, dicom, encoding, DCM_StudyID); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
308 CopyStringType2(record, dicom, encoding, DCM_AccessionNumber); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
309 } |
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 void FillSeries(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
312 DcmDataset& dicom, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
313 Encoding encoding) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
314 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
315 // cf. "DicomDirInterface::buildSeriesRecord()" |
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 /* copy attribute values from dataset to series record */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
318 CopyStringType1(record, dicom, encoding, DCM_Modality); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
319 CopyStringType1(record, dicom, encoding, DCM_SeriesInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
320 /* use type 1C instead of 1 in order to avoid unwanted overwriting */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
321 CopyStringType1C(record, dicom, encoding, DCM_SeriesNumber); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
322 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
323 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
324 void FillInstance(DcmDirectoryRecord& record, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
325 DcmDataset& dicom, |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
326 Encoding encoding, |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
327 DcmMetaInfo& metaInfo, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
328 const char* path) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
329 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
330 // cf. "DicomDirInterface::buildImageRecord()" |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
331 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
332 /* copy attribute values from dataset to image record */ |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
333 CopyStringType1(record, dicom, encoding, DCM_InstanceNumber); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
334 //CopyElementType1C(record, dicom, encoding, DCM_ImageType); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
335 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
336 // 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
|
337 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
338 std::string sopClassUid, sopInstanceUid, transferSyntaxUid; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
339 if (!GetUtf8TagValue(sopClassUid, dicom, encoding, DCM_SOPClassUID) || |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
340 !GetUtf8TagValue(sopInstanceUid, dicom, encoding, DCM_SOPInstanceUID) || |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
341 !GetUtf8TagValue(transferSyntaxUid, metaInfo, encoding, DCM_TransferSyntaxUID)) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
342 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
343 throw OrthancException(ErrorCode_BadFileFormat); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
344 } |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
345 |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
346 SetTagValue(record, DCM_ReferencedFileID, path); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
347 SetTagValue(record, DCM_ReferencedSOPClassUIDInFile, sopClassUid); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
348 SetTagValue(record, DCM_ReferencedSOPInstanceUIDInFile, sopInstanceUid); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
349 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
|
350 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
351 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
352 |
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 bool CreateResource(DcmDirectoryRecord*& target, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
355 ResourceType level, |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
356 ParsedDicomFile& dicom, |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
357 const char* filename, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
358 const char* path) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
359 { |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
360 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset(); |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
361 Encoding encoding = dicom.GetEncoding(); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
362 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
363 bool found; |
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
364 std::string id; |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
365 E_DirRecType type; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
366 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
367 switch (level) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
368 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
369 case ResourceType_Patient: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
370 found = GetUtf8TagValue(id, dataset, encoding, DCM_PatientID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
371 type = ERT_Patient; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
372 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
373 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
374 case ResourceType_Study: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
375 found = GetUtf8TagValue(id, dataset, encoding, DCM_StudyInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
376 type = ERT_Study; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
377 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
378 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
379 case ResourceType_Series: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
380 found = GetUtf8TagValue(id, dataset, encoding, DCM_SeriesInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
381 type = ERT_Series; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
382 break; |
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 case ResourceType_Instance: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
385 found = GetUtf8TagValue(id, dataset, encoding, DCM_SOPInstanceUID); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
386 type = ERT_Image; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
387 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
388 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
389 default: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
390 throw OrthancException(ErrorCode_InternalError); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
391 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
392 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
393 if (!found) |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
394 { |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
395 throw OrthancException(ErrorCode_BadFileFormat); |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
398 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
|
399 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
|
400 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
401 if (it != index_.end()) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
402 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
403 target = it->second; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
404 return false; // Already existing |
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 std::auto_ptr<DcmDirectoryRecord> record(new DcmDirectoryRecord(type, NULL, filename)); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
408 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
409 switch (level) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
410 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
411 case ResourceType_Patient: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
412 FillPatient(*record, dataset, encoding); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
413 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
414 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
415 case ResourceType_Study: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
416 FillStudy(*record, dataset, encoding); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
417 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
418 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
419 case ResourceType_Series: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
420 FillSeries(*record, dataset, encoding); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
421 break; |
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 case ResourceType_Instance: |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
424 FillInstance(*record, dataset, encoding, *dicom.GetDcmtkObject().getMetaInfo(), path); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
425 break; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
426 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
427 default: |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
428 throw OrthancException(ErrorCode_InternalError); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
429 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
430 |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
431 CopyStringType1C(*record, dataset, encoding, DCM_SpecificCharacterSet); |
1121
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
432 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
433 target = record.get(); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
434 GetRoot().insertSub(record.release()); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
435 index_[key] = target; |
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 return true; // Newly created |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
438 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
439 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
440 void Read(std::string& s) |
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 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
|
443 EET_UndefinedLength /*encodingType*/, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
444 EGL_withoutGL /*groupLength*/).good()) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
445 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
446 throw OrthancException(ErrorCode_InternalError); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
447 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
448 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
449 file_.Read(s); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
450 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
451 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
452 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
|
453 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
454 dir_.reset(NULL); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
455 fileSetId_ = id; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
456 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
457 }; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
458 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
459 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
460 DicomDirWriter::DicomDirWriter() : pimpl_(new PImpl) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
461 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
462 } |
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 DicomDirWriter::~DicomDirWriter() |
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 if (pimpl_) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
467 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
468 delete pimpl_; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
469 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
470 } |
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 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
|
473 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
474 pimpl_->SetFileSetId(id); |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
475 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
476 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
477 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
|
478 const std::string& filename, |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
479 ParsedDicomFile& dicom) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
480 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
481 std::string path; |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
482 if (directory.empty()) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
483 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
484 path = filename; |
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 else |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
487 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
488 if (directory[directory.length() - 1] == '/' || |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
489 directory[directory.length() - 1] == '\\') |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
490 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
491 throw OrthancException(ErrorCode_ParameterOutOfRange); |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
494 path = directory + '\\' + filename; |
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 |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
497 DcmDirectoryRecord* instance; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
498 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
|
499 if (isNewInstance) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
500 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
501 DcmDirectoryRecord* series; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
502 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
|
503 series->insertSub(instance); |
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 (isNewSeries) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
506 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
507 DcmDirectoryRecord* study; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
508 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
|
509 study->insertSub(series); |
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 if (isNewStudy) |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
512 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
513 DcmDirectoryRecord* patient; |
1885
5be57564ffc4
refactoring dicomdir generation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1788
diff
changeset
|
514 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
|
515 patient->insertSub(study); |
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 } |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
518 } |
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 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
|
522 { |
82567bac5e25
Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
523 pimpl_->Read(target); |
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 } |