Mercurial > hg > orthanc
annotate Core/DicomNetworking/DicomStoreUserConnection.cpp @ 3875:ea1d32861cfc transcoding
moving timeout from DicomAssocation to DicomAssociationParameters
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 04 May 2020 14:49:31 +0200 |
parents | 2effa961f67f |
children | a18b34dec94a |
rev | line source |
---|---|
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
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 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 * |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #include "DicomStoreUserConnection.h" |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
37 #include "../DicomParsing/FromDcmtkBridge.h" |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
38 #include "../DicomParsing/ParsedDicomFile.h" |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
39 #include "../Logging.h" |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
40 #include "../OrthancException.h" |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
41 #include "DicomAssociation.h" |
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
42 |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
43 #include <dcmtk/dcmdata/dcdeftag.h> |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
44 |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 namespace Orthanc |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 bool DicomStoreUserConnection::ProposeStorageClass(const std::string& sopClassUid, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 const std::set<DicomTransferSyntax>& syntaxes) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
51 // Default transfer syntax for DICOM |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
52 const bool addLittleEndianImplicit = ( |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
53 proposeUncompressedSyntaxes_ && |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
54 syntaxes.find(DicomTransferSyntax_LittleEndianImplicit) == syntaxes.end()); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
55 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
56 const bool addLittleEndianExplicit = ( |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
57 proposeUncompressedSyntaxes_ && |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
58 syntaxes.find(DicomTransferSyntax_LittleEndianExplicit) == syntaxes.end()); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
59 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
60 const bool addBigEndianExplicit = ( |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
61 proposeUncompressedSyntaxes_ && |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
62 proposeRetiredBigEndian_ && |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
63 syntaxes.find(DicomTransferSyntax_BigEndianExplicit) == syntaxes.end()); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
64 |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 size_t requiredCount = syntaxes.size(); |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
66 if (addLittleEndianImplicit) |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
67 { |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
68 requiredCount += 1; |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
69 } |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
70 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
71 if (addLittleEndianExplicit || |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
72 addBigEndianExplicit) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 requiredCount += 1; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
77 if (association_->GetRemainingPropositions() <= requiredCount) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
78 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
79 return false; // Not enough room |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
80 } |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
81 else |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
82 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
83 for (std::set<DicomTransferSyntax>::const_iterator |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
84 it = syntaxes.begin(); it != syntaxes.end(); ++it) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
85 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
86 association_->ProposePresentationContext(sopClassUid, *it); |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
87 } |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
88 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
89 if (addLittleEndianImplicit) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
90 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
91 std::set<DicomTransferSyntax> uncompressed; |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
92 uncompressed.insert(DicomTransferSyntax_LittleEndianImplicit); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
93 association_->ProposePresentationContext(sopClassUid, uncompressed); |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
94 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
95 |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
96 if (addLittleEndianExplicit || |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
97 addBigEndianExplicit) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
98 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
99 std::set<DicomTransferSyntax> uncompressed; |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
100 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
101 if (addLittleEndianExplicit) |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
102 { |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
103 uncompressed.insert(DicomTransferSyntax_LittleEndianExplicit); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
104 } |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
105 |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
106 if (addBigEndianExplicit) |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
107 { |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
108 uncompressed.insert(DicomTransferSyntax_BigEndianExplicit); |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
109 } |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
110 |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
111 association_->ProposePresentationContext(sopClassUid, uncompressed); |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
112 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
113 |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
114 return true; |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
115 } |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 bool DicomStoreUserConnection::LookupPresentationContext( |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 uint8_t& presentationContextId, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 const std::string& sopClassUid, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 DicomTransferSyntax transferSyntax) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
124 typedef std::map<DicomTransferSyntax, uint8_t> PresentationContexts; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 PresentationContexts pc; |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
127 if (association_->IsOpen() && |
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
128 association_->LookupAcceptedPresentationContext(pc, sopClassUid)) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
129 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
130 PresentationContexts::const_iterator found = pc.find(transferSyntax); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
131 if (found != pc.end()) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
132 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
133 presentationContextId = found->second; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
134 return true; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
135 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
136 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
137 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
138 return false; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
139 } |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
140 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
141 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
142 DicomStoreUserConnection::DicomStoreUserConnection( |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
143 const DicomAssociationParameters& params) : |
3874
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3868
diff
changeset
|
144 parameters_(params), |
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3868
diff
changeset
|
145 association_(new DicomAssociation), |
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3868
diff
changeset
|
146 proposeCommonClasses_(true), |
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3868
diff
changeset
|
147 proposeUncompressedSyntaxes_(true), |
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3868
diff
changeset
|
148 proposeRetiredBigEndian_(false) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
149 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
150 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
151 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
152 |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
153 void DicomStoreUserConnection::RegisterStorageClass(const std::string& sopClassUid, |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
154 DicomTransferSyntax syntax) |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
155 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 StorageClasses::iterator found = storageClasses_.find(sopClassUid); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
157 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
158 if (found == storageClasses_.end()) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
159 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
160 std::set<DicomTransferSyntax> ts; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
161 ts.insert(syntax); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
162 storageClasses_[sopClassUid] = ts; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
163 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
164 else |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
165 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
166 found->second.insert(syntax); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
167 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
168 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
169 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
170 |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
171 void DicomStoreUserConnection::LookupParameters(std::string& sopClassUid, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
172 std::string& sopInstanceUid, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
173 DicomTransferSyntax& transferSyntax, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
174 DcmDataset& dataset) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
175 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
176 OFString a, b; |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
177 if (!dataset.findAndGetOFString(DCM_SOPClassUID, a).good() || |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
178 !dataset.findAndGetOFString(DCM_SOPInstanceUID, b).good()) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
179 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
180 throw OrthancException(ErrorCode_NoSopClassOrInstance, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
181 "Unable to determine the SOP class/instance for C-STORE with AET " + |
3875
ea1d32861cfc
moving timeout from DicomAssocation to DicomAssociationParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3874
diff
changeset
|
182 parameters_.GetRemoteModality().GetApplicationEntityTitle()); |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
183 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
184 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
185 sopClassUid.assign(a.c_str()); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
186 sopInstanceUid.assign(b.c_str()); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
187 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
188 if (!FromDcmtkBridge::LookupOrthancTransferSyntax( |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
189 transferSyntax, dataset.getOriginalXfer())) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
190 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
191 throw OrthancException(ErrorCode_InternalError, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
192 "Unknown transfer syntax from DCMTK"); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
193 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
194 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
195 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
196 |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
197 bool DicomStoreUserConnection::NegotiatePresentationContext( |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
198 uint8_t& presentationContextId, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
199 const std::string& sopClassUid, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
200 DicomTransferSyntax transferSyntax) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
201 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
202 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
203 * Step 1: Check whether this presentation context is already |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
204 * available in the previously negociated assocation. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
205 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
206 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
207 if (LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax)) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
208 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
209 return true; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
210 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
211 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
212 // The association must be re-negotiated |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
213 if (association_->IsOpen()) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
214 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
215 LOG(INFO) << "Re-negociating DICOM association with " |
3875
ea1d32861cfc
moving timeout from DicomAssocation to DicomAssociationParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3874
diff
changeset
|
216 << parameters_.GetRemoteModality().GetApplicationEntityTitle(); |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
217 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
218 |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
219 association_->ClearPresentationContexts(); |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
220 RegisterStorageClass(sopClassUid, transferSyntax); |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
221 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
222 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
223 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
224 * Step 2: Propose at least the mandatory SOP class. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
225 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
226 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
227 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
228 StorageClasses::const_iterator mandatory = storageClasses_.find(sopClassUid); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
229 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
230 if (mandatory == storageClasses_.end() || |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
231 mandatory->second.find(transferSyntax) == mandatory->second.end()) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
232 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
233 throw OrthancException(ErrorCode_InternalError); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
234 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
235 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
236 if (!ProposeStorageClass(sopClassUid, mandatory->second)) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
237 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
238 // Should never happen in real life: There are no more than |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
239 // 128 transfer syntaxes in DICOM! |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
240 throw OrthancException(ErrorCode_InternalError, |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
241 "Too many transfer syntaxes for SOP class UID: " + sopClassUid); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
242 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
243 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
244 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
245 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
246 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
247 * Step 3: Propose all the previously spotted SOP classes, as |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
248 * registered through the "RegisterStorageClass()" method. |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
249 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
250 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
251 for (StorageClasses::const_iterator it = storageClasses_.begin(); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
252 it != storageClasses_.end(); ++it) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
253 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
254 if (it->first != sopClassUid) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
255 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
256 ProposeStorageClass(it->first, it->second); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
257 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
258 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
259 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
260 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
261 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
262 * Step 4: As long as there is room left in the proposed |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
263 * presentation contexts, propose the uncompressed transfer syntaxes |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
264 * for the most common SOP classes, as can be found in the |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
265 * "dcmShortSCUStorageSOPClassUIDs" array from DCMTK. The |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
266 * preferred transfer syntax is "LittleEndianImplicit". |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
267 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
268 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
269 if (proposeCommonClasses_) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
270 { |
3868
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
271 // The method "ProposeStorageClass()" will automatically add |
d5be23fc0106
better negotiation of transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3862
diff
changeset
|
272 // "LittleEndianImplicit" |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
273 std::set<DicomTransferSyntax> ts; |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
274 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
275 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs; i++) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
276 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
277 std::string c(dcmShortSCUStorageSOPClassUIDs[i]); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
278 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
279 if (c != sopClassUid && |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
280 storageClasses_.find(c) == storageClasses_.end()) |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
281 { |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
282 ProposeStorageClass(c, ts); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
283 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
284 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
285 } |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
286 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
287 |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
288 /** |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
289 * Step 5: Open the association, and check whether the pair (SOP |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
290 * class UID, transfer syntax) was accepted by the remote host. |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
291 **/ |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
292 |
3826
e82bd07c384e
putting DicomAssociation behind pimpl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3825
diff
changeset
|
293 association_->Open(parameters_); |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
294 return LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax); |
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
295 } |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
296 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
297 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
298 void DicomStoreUserConnection::Store(std::string& sopClassUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
299 std::string& sopInstanceUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
300 DcmDataset& dataset, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
301 const std::string& moveOriginatorAET, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
302 uint16_t moveOriginatorID) |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
303 { |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
304 DicomTransferSyntax transferSyntax; |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
305 LookupParameters(sopClassUid, sopInstanceUid, transferSyntax, dataset); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
306 |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
307 uint8_t presID; |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
308 if (!NegotiatePresentationContext(presID, sopClassUid, transferSyntax)) |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
309 { |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
310 throw OrthancException(ErrorCode_NetworkProtocol, |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
311 "No valid presentation context was negotiated for " |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
312 "SOP class UID [" + sopClassUid + "] and transfer " |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
313 "syntax [" + GetTransferSyntaxUid(transferSyntax) + "] " |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
314 "while sending to modality [" + |
3875
ea1d32861cfc
moving timeout from DicomAssocation to DicomAssociationParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3874
diff
changeset
|
315 parameters_.GetRemoteModality().GetApplicationEntityTitle() + "]"); |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
316 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
317 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
318 // Prepare the transmission of data |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
319 T_DIMSE_C_StoreRQ request; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
320 memset(&request, 0, sizeof(request)); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
321 request.MessageID = association_->GetDcmtkAssociation().nextMsgID++; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
322 strncpy(request.AffectedSOPClassUID, sopClassUid.c_str(), DIC_UI_LEN); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
323 request.Priority = DIMSE_PRIORITY_MEDIUM; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
324 request.DataSetType = DIMSE_DATASET_PRESENT; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
325 strncpy(request.AffectedSOPInstanceUID, sopInstanceUid.c_str(), DIC_UI_LEN); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
326 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
327 if (!moveOriginatorAET.empty()) |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
328 { |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
329 strncpy(request.MoveOriginatorApplicationEntityTitle, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
330 moveOriginatorAET.c_str(), DIC_AE_LEN); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
331 request.opts = O_STORE_MOVEORIGINATORAETITLE; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
332 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
333 request.MoveOriginatorID = moveOriginatorID; // The type DIC_US is an alias for uint16_t |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
334 request.opts |= O_STORE_MOVEORIGINATORID; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
335 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
336 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
337 // Finally conduct transmission of data |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
338 T_DIMSE_C_StoreRSP response; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
339 DcmDataset* statusDetail = NULL; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
340 DicomAssociation::CheckCondition( |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
341 DIMSE_storeUser(&association_->GetDcmtkAssociation(), presID, &request, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
342 NULL, &dataset, /*progressCallback*/ NULL, NULL, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
343 /*opt_blockMode*/ (GetParameters().HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
344 /*opt_dimse_timeout*/ GetParameters().GetTimeout(), |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
345 &response, &statusDetail, NULL), |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
346 GetParameters(), "C-STORE"); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
347 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
348 if (statusDetail != NULL) |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
349 { |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
350 delete statusDetail; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
351 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
352 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
353 /** |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
354 * New in Orthanc 1.6.0: Deal with failures during C-STORE. |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
355 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_B.2.3.html#table_B.2-1 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
356 **/ |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
357 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
358 if (response.DimseStatus != 0x0000 && // Success |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
359 response.DimseStatus != 0xB000 && // Warning - Coercion of Data Elements |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
360 response.DimseStatus != 0xB007 && // Warning - Data Set does not match SOP Class |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
361 response.DimseStatus != 0xB006) // Warning - Elements Discarded |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
362 { |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
363 char buf[16]; |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
364 sprintf(buf, "%04X", response.DimseStatus); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
365 throw OrthancException(ErrorCode_NetworkProtocol, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
366 "C-STORE SCU to AET \"" + |
3875
ea1d32861cfc
moving timeout from DicomAssocation to DicomAssociationParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3874
diff
changeset
|
367 GetParameters().GetRemoteModality().GetApplicationEntityTitle() + |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
368 "\" has failed with DIMSE status 0x" + buf); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
369 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
370 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
371 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
372 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
373 void DicomStoreUserConnection::Store(std::string& sopClassUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
374 std::string& sopInstanceUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
375 ParsedDicomFile& parsed, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
376 const std::string& moveOriginatorAET, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
377 uint16_t moveOriginatorID) |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
378 { |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
379 if (parsed.GetDcmtkObject().getDataset() == NULL) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
380 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
381 throw OrthancException(ErrorCode_InternalError); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
382 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
383 |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
384 Store(sopClassUid, sopInstanceUid, *parsed.GetDcmtkObject().getDataset(), |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
385 moveOriginatorAET, moveOriginatorID); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
386 } |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
387 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
388 |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
389 void DicomStoreUserConnection::Store(std::string& sopClassUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
390 std::string& sopInstanceUid, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
391 const void* buffer, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
392 size_t size, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
393 const std::string& moveOriginatorAET, |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
394 uint16_t moveOriginatorID) |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
395 { |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
396 std::unique_ptr<DcmFileFormat> dicom( |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
397 FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size)); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
398 |
3862
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
399 if (dicom.get() == NULL || |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
400 dicom->getDataset() == NULL) |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
401 { |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
402 throw OrthancException(ErrorCode_InternalError); |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
403 } |
594263db316a
DicomModalityStoreJob now uses DicomStoreUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3831
diff
changeset
|
404 |
3831
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
405 Store(sopClassUid, sopInstanceUid, *dicom->getDataset(), |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
406 moveOriginatorAET, moveOriginatorID); |
83ea6939293d
starting DicomStoreUserConnection::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3826
diff
changeset
|
407 } |
3825
4570c57668a8
refactoring DicomUserConnection as Dicom[Control|Store]UserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
408 } |