annotate OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 763:b5e6d2823115

dynamic negotiation of storage sop classes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Apr 2014 17:15:59 +0200
parents b79eda29896d
children 0a2f8c707c78
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
689
2d0a347e8cfc switch to 2014
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 666
diff changeset
3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Belgium
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
10 *
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
12 * program give permission to link the code of its release with the
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
19 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
21 * in the program, then also delete it here.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "DicomUserConnection.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
35 #include "../../Core/OrthancException.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include "../ToDcmtkBridge.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include "../FromDcmtkBridge.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <dcmtk/dcmdata/dcistrmb.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 #include <dcmtk/dcmdata/dcistrmf.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 #include <dcmtk/dcmdata/dcfilefo.h>
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
42 #include <dcmtk/dcmdata/dcmetinf.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 #include <dcmtk/dcmnet/diutil.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 #include <set>
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
46 #include <glog/logging.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 #ifdef _WIN32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 /**
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 * "The maximum length, in bytes, of the string returned in the buffer
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 * pointed to by the name parameter is dependent on the namespace provider,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 * but this string must be 256 bytes or less.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 * http://msdn.microsoft.com/en-us/library/windows/desktop/ms738527(v=vs.85).aspx
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 #define HOST_NAME_MAX 256
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 #endif
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
61 static const char* DEFAULT_PREFERRED_TRANSFER_SYNTAX = UID_LittleEndianImplicitTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
62
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
63 /**
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
64 * "If we have more than 64 storage SOP classes, tools such as
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
65 * storescu will fail because they attempt to negotiate two
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
66 * presentation contexts for each SOP class, and there is a total
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
67 * limit of 128 contexts for one association."
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
68 **/
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
69 static const unsigned int MAXIMUM_STORAGE_SOP_CLASSES = 64;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
70
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
71
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
72 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 struct DicomUserConnection::PImpl
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 // Connection state
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 T_ASC_Network* net_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 T_ASC_Parameters* params_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 T_ASC_Association* assoc_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 bool IsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 return assoc_ != NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 void CheckIsOpen() const;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
88 void Store(DcmInputStream& is, DicomUserConnection& connection);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 };
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 static void Check(const OFCondition& cond)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 if (cond.bad())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
96 throw OrthancException("DicomUserConnection: " + std::string(cond.text()));
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 void DicomUserConnection::PImpl::CheckIsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 if (!IsOpen())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
104 throw OrthancException("DicomUserConnection: First open the connection");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 void DicomUserConnection::CheckIsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 pimpl_->CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
115 static void RegisterStorageSOPClass(T_ASC_Parameters* params,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
116 unsigned int& presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
117 const std::string& sopClass,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
118 const char* asPreferred[],
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
119 std::vector<const char*>& asFallback)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
121 Check(ASC_addPresentationContext(params, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
122 sopClass.c_str(), asPreferred, 1));
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
123 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
124
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
125 if (asFallback.size() > 0)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
126 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
127 Check(ASC_addPresentationContext(params, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
128 sopClass.c_str(), &asFallback[0], asFallback.size()));
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
129 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
130 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 }
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
132
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
133
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
134 void DicomUserConnection::SetupPresentationContexts(const std::string& preferredTransferSyntax)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
136 // Flatten an array with the preferred transfer syntax
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
137 const char* asPreferred[1] = { preferredTransferSyntax.c_str() };
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
138
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
139 // Setup the fallback transfer syntaxes
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
140 std::set<std::string> fallbackSyntaxes;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
141 fallbackSyntaxes.insert(UID_LittleEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
142 fallbackSyntaxes.insert(UID_BigEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
143 fallbackSyntaxes.insert(UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
144 fallbackSyntaxes.erase(preferredTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
145
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
146 // Flatten an array with the fallback transfer syntaxes
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
147 std::vector<const char*> asFallback;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
148 asFallback.reserve(fallbackSyntaxes.size());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
149 for (std::set<std::string>::const_iterator
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
150 it = fallbackSyntaxes.begin(); it != fallbackSyntaxes.end(); ++it)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
151 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
152 asFallback.push_back(it->c_str());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
153 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
155 CheckStorageSOPClassesInvariant();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 unsigned int presentationContextId = 1;
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
157
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
158 for (std::list<std::string>::const_iterator it = reservedStorageSOPClasses_.begin();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
159 it != reservedStorageSOPClasses_.end(); it++)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
161 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
162 *it, asPreferred, asFallback);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
163 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
165 for (std::set<std::string>::const_iterator it = storageSOPClasses_.begin();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
166 it != storageSOPClasses_.end(); it++)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
167 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
168 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
169 *it, asPreferred, asFallback);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
170 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
171
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
172 for (std::set<std::string>::const_iterator it = defaultStorageSOPClasses_.begin();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
173 it != defaultStorageSOPClasses_.end(); it++)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
174 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
175 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
176 *it, asPreferred, asFallback);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
181 static bool IsGenericTransferSyntax(const std::string& syntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
182 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
183 return (syntax == UID_LittleEndianExplicitTransferSyntax ||
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
184 syntax == UID_BigEndianExplicitTransferSyntax ||
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
185 syntax == UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
186 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
187
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
188
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
189 void DicomUserConnection::PImpl::Store(DcmInputStream& is, DicomUserConnection& connection)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 DcmFileFormat dcmff;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 Check(dcmff.read(is, EXS_Unknown, EGL_noChange, DCM_MaxReadLength));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
196 // Determine the storage SOP class UID for this instance
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
197 static const DcmTagKey DCM_SOP_CLASS_UID(0x0008, 0x0016);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
198 OFString sopClassUid;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
199 if (dcmff.getDataset()->findAndGetOFString(DCM_SOP_CLASS_UID, sopClassUid).good())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
200 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
201 connection.AddStorageSOPClass(sopClassUid.c_str());
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
202 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
203
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
204 // Determine whether a new presentation context must be
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
205 // negotiated, depending on the transfer syntax of this instance
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
206 DcmXfer xfer(dcmff.getDataset()->getOriginalXfer());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
207 const std::string syntax(xfer.getXferID());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
208 bool isGeneric = IsGenericTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
209
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
210 if (isGeneric ^ IsGenericTransferSyntax(connection.GetPreferredTransferSyntax()))
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
211 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
212 // Making a generic-to-specific or specific-to-generic change of
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
213 // the transfer syntax. Renegotiate the connection.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
214 LOG(INFO) << "Change in the transfer syntax: the C-Store associated must be renegotiated";
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
215
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
216 if (isGeneric)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
217 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
218 connection.ResetPreferredTransferSyntax();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
219 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
220 else
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
221 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
222 connection.SetPreferredTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
223 }
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
224 }
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
225
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
226 if (!connection.IsOpen())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
227 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
228 LOG(INFO) << "Renegotiating a C-Store association due to a change in the parameters";
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
229 connection.Open();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
230 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
231
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 // Figure out which SOP class and SOP instance is encapsulated in the file
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 DIC_UI sopClass;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 DIC_UI sopInstance;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 if (!DU_findSOPClassAndInstanceInDataSet(dcmff.getDataset(), sopClass, sopInstance))
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
237 throw OrthancException("DicomUserConnection: Unable to find the SOP class and instance");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 int presID = ASC_findAcceptedPresentationContextID(assoc_, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 if (presID == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 const char *modalityName = dcmSOPClassUIDToModality(sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 if (!modalityName) modalityName = dcmFindNameOfUID(sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 if (!modalityName) modalityName = "unknown SOP class";
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
247 throw OrthancException("DicomUserConnection: No presentation context for modality " +
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
248 std::string(modalityName));
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 // Prepare the transmission of data
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 T_DIMSE_C_StoreRQ req;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 memset(&req, 0, sizeof(req));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 req.MessageID = assoc_->nextMsgID++;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 strcpy(req.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 strcpy(req.AffectedSOPInstanceUID, sopInstance);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 req.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 req.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 // Finally conduct transmission of data
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 T_DIMSE_C_StoreRSP rsp;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263 Check(DIMSE_storeUser(assoc_, presID, &req,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 NULL, dcmff.getDataset(), /*progressCallback*/ NULL, NULL,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 /*opt_blockMode*/ DIMSE_BLOCKING, /*opt_dimse_timeout*/ 0,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 &rsp, &statusDetail, NULL));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 if (statusDetail != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 delete statusDetail;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 static void FindCallback(
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 /* in */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 void *callbackData,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 T_DIMSE_C_FindRQ *request, /* original find request */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 int responseCount,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 T_DIMSE_C_FindRSP *response, /* pending response received */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 DcmDataset *responseIdentifiers /* pending response identifiers */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 )
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 {
657
5425bb6f1ea5 further cppcheck fixes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 656
diff changeset
284 DicomFindAnswers& answers = *reinterpret_cast<DicomFindAnswers*>(callbackData);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 if (responseIdentifiers != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 DicomMap m;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 FromDcmtkBridge::Convert(m, *responseIdentifiers);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290 answers.Add(m);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 void DicomUserConnection::Find(DicomFindAnswers& result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 FindRootModel model,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 const char* sopClass;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 std::auto_ptr<DcmDataset> dataset(ToDcmtkBridge::Convert(fields));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 switch (model)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
304 case FindRootModel_Patient:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
305 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "PATIENT");
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
306 sopClass = UID_FINDPatientRootQueryRetrieveInformationModel;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
308 // Accession number
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
309 if (!fields.HasTag(0x0008, 0x0050))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
310 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0050), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
312 // Patient ID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
313 if (!fields.HasTag(0x0010, 0x0020))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
314 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0010, 0x0020), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
316 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
318 case FindRootModel_Study:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
319 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "STUDY");
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
320 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
322 // Accession number
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
323 if (!fields.HasTag(0x0008, 0x0050))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
324 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0050), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
326 // Study instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
327 if (!fields.HasTag(0x0020, 0x000d))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
328 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000d), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
330 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
332 case FindRootModel_Series:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
333 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "SERIES");
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
334 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
336 // Accession number
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
337 if (!fields.HasTag(0x0008, 0x0050))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
338 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0050), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
340 // Study instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
341 if (!fields.HasTag(0x0020, 0x000d))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
342 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000d), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
344 // Series instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
345 if (!fields.HasTag(0x0020, 0x000e))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
346 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000e), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
347
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
348 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
350 case FindRootModel_Instance:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
351 if (manufacturer_ == ModalityManufacturer_ClearCanvas ||
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
352 manufacturer_ == ModalityManufacturer_Dcm4Chee)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
353 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
354 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
355 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
356 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
357 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "IMAGE");
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
358 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
359 else
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
360 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
361 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "INSTANCE");
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
362 }
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
363
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
364 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
366 // Accession number
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
367 if (!fields.HasTag(0x0008, 0x0050))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
368 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0050), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
370 // Study instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
371 if (!fields.HasTag(0x0020, 0x000d))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
372 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000d), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
374 // Series instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
375 if (!fields.HasTag(0x0020, 0x000e))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
376 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000e), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
377
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
378 // SOP Instance UID
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
379 if (!fields.HasTag(0x0008, 0x0018))
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
380 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0018), "");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
382 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
384 default:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
385 throw OrthancException(ErrorCode_ParameterOutOfRange);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389 int presID = ASC_findAcceptedPresentationContextID(pimpl_->assoc_, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 if (presID == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
392 throw OrthancException("DicomUserConnection: The C-FIND command is not supported by the distant AET");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
394
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395 T_DIMSE_C_FindRQ request;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396 memset(&request, 0, sizeof(request));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397 request.MessageID = pimpl_->assoc_->nextMsgID++;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398 strcpy(request.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 request.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 request.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402 T_DIMSE_C_FindRSP response;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404 OFCondition cond = DIMSE_findUser(pimpl_->assoc_, presID, &request, dataset.get(),
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 FindCallback, &result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406 /*opt_blockMode*/ DIMSE_BLOCKING, /*opt_dimse_timeout*/ 0,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 &response, &statusDetail);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
409 if (statusDetail)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
410 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 delete statusDetail;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414 Check(cond);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
416
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
417
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
418 void DicomUserConnection::FindPatient(DicomFindAnswers& result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
419 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
420 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
421 // Only keep the filters from "fields" that are related to the patient
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
422 DicomMap s;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
423 fields.ExtractPatientInformation(s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
424 Find(result, FindRootModel_Patient, s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
425 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427 void DicomUserConnection::FindStudy(DicomFindAnswers& result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
428 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
429 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
430 // Only keep the filters from "fields" that are related to the study
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
431 DicomMap s;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
432 fields.ExtractStudyInformation(s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
433
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
434 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
435 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
725
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
436 s.CopyTagIfExists(fields, DICOM_TAG_MODALITIES_IN_STUDY);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
437
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
438 Find(result, FindRootModel_Study, s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
439 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
441 void DicomUserConnection::FindSeries(DicomFindAnswers& result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
442 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
443 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
444 // Only keep the filters from "fields" that are related to the series
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
445 DicomMap s;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
446 fields.ExtractSeriesInformation(s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
447
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
448 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
449 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
450 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
451
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
452 Find(result, FindRootModel_Series, s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 void DicomUserConnection::FindInstance(DicomFindAnswers& result,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458 // Only keep the filters from "fields" that are related to the instance
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459 DicomMap s;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
460 fields.ExtractInstanceInformation(s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
462 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
463 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
464 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
465 s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
466
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
467 Find(result, FindRootModel_Instance, s);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
468 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
469
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
470
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
471 void DicomUserConnection::Move(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
472 const DicomMap& fields)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
473 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
477 std::auto_ptr<DcmDataset> dataset(ToDcmtkBridge::Convert(fields));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 int presID = ASC_findAcceptedPresentationContextID(pimpl_->assoc_, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 if (presID == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
483 throw OrthancException("DicomUserConnection: The C-MOVE command is not supported by the distant AET");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
484 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486 T_DIMSE_C_MoveRQ request;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487 memset(&request, 0, sizeof(request));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
488 request.MessageID = pimpl_->assoc_->nextMsgID++;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489 strcpy(request.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
490 request.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
491 request.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492 strncpy(request.MoveDestination, targetAet.c_str(), sizeof(DIC_AE) / sizeof(char));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
493
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
494 T_DIMSE_C_MoveRSP response;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
495 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
496 DcmDataset* responseIdentifiers = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
497 OFCondition cond = DIMSE_moveUser(pimpl_->assoc_, presID, &request, dataset.get(),
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 NULL, NULL,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 /*opt_blockMode*/ DIMSE_BLOCKING, /*opt_dimse_timeout*/ 0,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
500 pimpl_->net_, NULL, NULL,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 &response, &statusDetail, &responseIdentifiers);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503 if (statusDetail)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 delete statusDetail;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 if (responseIdentifiers)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510 delete responseIdentifiers;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
513 Check(cond);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
514 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
515
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
516
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
517 void DicomUserConnection::ResetStorageSOPClasses()
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
518 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
519 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
520
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
521 storageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
522 defaultStorageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
523
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
524 // Copy the short list of storage SOP classes from DCMTK, making
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
525 // room for the 4 SOP classes reserved for C-ECHO, C-FIND, C-MOVE.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
526
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
527 std::set<std::string> uncommon;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
528 uncommon.insert(UID_BlendingSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
529 uncommon.insert(UID_GrayscaleSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
530 uncommon.insert(UID_ColorSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
531 uncommon.insert(UID_PseudoColorSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
532
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
533 // Add the storage syntaxes for C-STORE
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
534 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs - 1; i++)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
535 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
536 if (uncommon.find(dcmShortSCUStorageSOPClassUIDs[i]) == uncommon.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
537 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
538 defaultStorageSOPClasses_.insert(dcmShortSCUStorageSOPClassUIDs[i]);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
539 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
540 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
541
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
542 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
543 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
544
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
545
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 519
diff changeset
546 DicomUserConnection::DicomUserConnection() :
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 519
diff changeset
547 pimpl_(new PImpl),
666
b8383ac0b227 fix cppcheck warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 662
diff changeset
548 preferredTransferSyntax_(DEFAULT_PREFERRED_TRANSFER_SYNTAX),
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 519
diff changeset
549 localAet_("STORESCU"),
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 519
diff changeset
550 distantAet_("ANY-SCP"),
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 519
diff changeset
551 distantHost_("127.0.0.1")
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
552 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
553 distantPort_ = 104;
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
554 manufacturer_ = ModalityManufacturer_Generic;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
555
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
556 pimpl_->net_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
557 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
558 pimpl_->assoc_ = NULL;
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
559
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
560 // SOP classes for C-ECHO, C-FIND and C-MOVE
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
561 reservedStorageSOPClasses_.push_back(UID_VerificationSOPClass);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
562 reservedStorageSOPClasses_.push_back(UID_FINDPatientRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
563 reservedStorageSOPClasses_.push_back(UID_FINDStudyRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
564 reservedStorageSOPClasses_.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
565
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
566 ResetStorageSOPClasses();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
567 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
568
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
569 DicomUserConnection::~DicomUserConnection()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
570 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
571 Close();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
572 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
573
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
574 void DicomUserConnection::SetLocalApplicationEntityTitle(const std::string& aet)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
575 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
576 if (localAet_ != aet)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
577 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
578 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
579 localAet_ = aet;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
580 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
581 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
582
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
583 void DicomUserConnection::SetDistantApplicationEntityTitle(const std::string& aet)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
584 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
585 if (distantAet_ != aet)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
586 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
587 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
588 distantAet_ = aet;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
589 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
590 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
591
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
592 void DicomUserConnection::SetDistantManufacturer(ModalityManufacturer manufacturer)
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
593 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
594 if (manufacturer_ != manufacturer)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
595 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
596 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
597 manufacturer_ = manufacturer;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
598 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
599 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
600
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
601 void DicomUserConnection::ResetPreferredTransferSyntax()
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
602 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
603 SetPreferredTransferSyntax(DEFAULT_PREFERRED_TRANSFER_SYNTAX);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
604 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
605
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
606 void DicomUserConnection::SetPreferredTransferSyntax(const std::string& preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
607 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
608 if (preferredTransferSyntax_ != preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
609 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
610 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
611 preferredTransferSyntax_ = preferredTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
612 }
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
613 }
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
614
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
615
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
616 void DicomUserConnection::SetDistantHost(const std::string& host)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
617 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
618 if (distantHost_ != host)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
619 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
620 if (host.size() > HOST_NAME_MAX - 10)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
621 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
622 throw OrthancException("Distant host name is too long");
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
623 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
624
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
625 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
626 distantHost_ = host;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
627 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
628 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
629
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
630 void DicomUserConnection::SetDistantPort(uint16_t port)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
631 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
632 if (distantPort_ != port)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
633 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
634 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
635 distantPort_ = port;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
636 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
637 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
638
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
639 void DicomUserConnection::Open()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
640 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
641 if (IsOpen())
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
642 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
643 // Don't reopen the connection
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
644 return;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
645 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
646
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
647 Check(ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ 30, &pimpl_->net_));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
648 Check(ASC_createAssociationParameters(&pimpl_->params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
649
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
650 // Set this application's title and the called application's title in the params
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
651 Check(ASC_setAPTitles(pimpl_->params_, localAet_.c_str(), distantAet_.c_str(), NULL));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
652
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
653 // Set the network addresses of the local and distant entities
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
654 char localHost[HOST_NAME_MAX];
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
655 gethostname(localHost, HOST_NAME_MAX - 1);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
656
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
657 char distantHostAndPort[HOST_NAME_MAX];
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
658
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
659 #ifdef _MSC_VER
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
660 _snprintf
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
661 #else
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
662 snprintf
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
663 #endif
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
664 (distantHostAndPort, HOST_NAME_MAX - 1, "%s:%d", distantHost_.c_str(), distantPort_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
665
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
666 Check(ASC_setPresentationAddresses(pimpl_->params_, localHost, distantHostAndPort));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
667
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
668 // Set various options
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
669 Check(ASC_setTransportLayerType(pimpl_->params_, /*opt_secureConnection*/ false));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
670
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
671 SetupPresentationContexts(preferredTransferSyntax_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
672
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
673 // Do the association
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
674 Check(ASC_requestAssociation(pimpl_->net_, pimpl_->params_, &pimpl_->assoc_));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
675
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
676 if (ASC_countAcceptedPresentationContexts(pimpl_->params_) == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
677 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
678 throw OrthancException("DicomUserConnection: No Acceptable Presentation Contexts");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
679 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
680 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
681
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
682 void DicomUserConnection::Close()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
683 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
684 if (pimpl_->assoc_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
685 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
686 ASC_releaseAssociation(pimpl_->assoc_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
687 ASC_destroyAssociation(&pimpl_->assoc_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
688 pimpl_->assoc_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
689 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
690 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
691 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
692 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
693 if (pimpl_->params_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
694 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
695 ASC_destroyAssociationParameters(&pimpl_->params_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
696 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
697 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
698 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
699
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
700 if (pimpl_->net_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
701 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
702 ASC_dropNetwork(&pimpl_->net_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
703 pimpl_->net_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
704 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
705 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
706
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
707 bool DicomUserConnection::IsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
708 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
709 return pimpl_->IsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
710 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
711
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
712 void DicomUserConnection::Store(const char* buffer, size_t size)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
713 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
714 // Prepare an input stream for the memory buffer
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
715 DcmInputBufferStream is;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
716 if (size > 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
717 is.setBuffer(buffer, size);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
718 is.setEos();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
719
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
720 pimpl_->Store(is, *this);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
721 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
722
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
723 void DicomUserConnection::Store(const std::string& buffer)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
724 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
725 if (buffer.size() > 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
726 Store(reinterpret_cast<const char*>(&buffer[0]), buffer.size());
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
727 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
728 Store(NULL, 0);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
729 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
730
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
731 void DicomUserConnection::StoreFile(const std::string& path)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
732 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
733 // Prepare an input stream for the file
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
734 DcmInputFileStream is(path.c_str());
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
735 pimpl_->Store(is, *this);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
736 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
737
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
738 bool DicomUserConnection::Echo()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
739 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
740 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
741 DIC_US status;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
742 Check(DIMSE_echoUser(pimpl_->assoc_, pimpl_->assoc_->nextMsgID++,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
743 /*opt_blockMode*/ DIMSE_BLOCKING, /*opt_dimse_timeout*/ 0,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
744 &status, NULL));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
745 return status == STATUS_Success;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
746 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
747
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
748
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
749 void DicomUserConnection::MoveSeries(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
750 const DicomMap& findResult)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
751 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
752 DicomMap simplified;
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
753 simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID));
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
754 simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID));
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
755 Move(targetAet, simplified);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
756 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
757
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
758 void DicomUserConnection::MoveSeries(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
759 const std::string& studyUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
760 const std::string& seriesUid)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
761 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
762 DicomMap map;
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
763 map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
764 map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
765 Move(targetAet, map);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
767
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
768 void DicomUserConnection::MoveInstance(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
769 const DicomMap& findResult)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
770 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
771 DicomMap simplified;
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
772 simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID));
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
773 simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID));
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
774 simplified.SetValue(DICOM_TAG_SOP_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SOP_INSTANCE_UID));
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
775 Move(targetAet, simplified);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
776 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
777
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
778 void DicomUserConnection::MoveInstance(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
779 const std::string& studyUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
780 const std::string& seriesUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
781 const std::string& instanceUid)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
782 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
783 DicomMap map;
80
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
784 map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
785 map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
6212bf978584 status of series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
786 map.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
787 Move(targetAet, map);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
788 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
789
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
790 void DicomUserConnection::SetConnectionTimeout(uint32_t seconds)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
791 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
792 dcmConnectionTimeout.set(seconds);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
793 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
794
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
795
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
796 void DicomUserConnection::CheckStorageSOPClassesInvariant() const
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
797 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
798 assert(storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
799 defaultStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
800 reservedStorageSOPClasses_.size() <= MAXIMUM_STORAGE_SOP_CLASSES);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
801 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
802
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
803 void DicomUserConnection::AddStorageSOPClass(const char* sop)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
804 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
805 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
806
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
807 if (storageSOPClasses_.find(sop) != storageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
808 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
809 // This storage SOP class is already explicitly registered. Do
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
810 // nothing.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
811 return;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
812 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
813
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
814 if (defaultStorageSOPClasses_.find(sop) != defaultStorageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
815 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
816 // This storage SOP class is not explicitly registered, but is
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
817 // used by default. Just register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
818 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
819 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
820
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
821 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
822 return;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
823 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
824
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
825 // This storage SOP class is neither explicitly, nor implicitly
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
826 // registered. Close the connection and register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
827
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
828 Close();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
829
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
830 if (reservedStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
831 storageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES) // (*)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
832 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
833 // The maximum number of SOP classes is reached
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
834 ResetStorageSOPClasses();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
835 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
836 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
837 else if (reservedStorageSOPClasses_.size() + storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
838 defaultStorageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
839 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
840 // Make room in the default storage syntaxes
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
841 assert(defaultStorageSOPClasses_.size() > 0); // Necessarily true because condition (*) is false
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
842 defaultStorageSOPClasses_.erase(*defaultStorageSOPClasses_.rbegin());
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
843 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
844
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
845 // Explicitly register the new storage syntax
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
846 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
847
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
848 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
849 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
850
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
851 }