orthanc: OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp annotate

annotate OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp @ 4543:5b1b46f3fcca Orthanc-1.7.3

close branch

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 02 Mar 2021 16:52:24 +0100
parents	bf7b9edf6b81
children	d2f79a475b51

rev	line source
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * the License, or (at your option) any later version.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	15 * Lesser General Public License for more details.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * <http://www.gnu.org/licenses/>.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 #include "../PrecompiledHeaders.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "DicomStoreUserConnection.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	26 #include "../DicomParsing/FromDcmtkBridge.h"
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	27 #include "../DicomParsing/ParsedDicomFile.h"
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	28 #include "../Logging.h"
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	29 #include "../OrthancException.h"
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	30 #include "DicomAssociation.h"
e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	31
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	32 #include <dcmtk/dcmdata/dcdeftag.h>
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	33
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 namespace Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 bool DicomStoreUserConnection::ProposeStorageClass(const std::string& sopClassUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 const std::set<DicomTransferSyntax>& syntaxes)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	40 // Default transfer syntax for DICOM
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	41 const bool addLittleEndianImplicit = (
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	42 proposeUncompressedSyntaxes_ &&
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	43 syntaxes.find(DicomTransferSyntax_LittleEndianImplicit) == syntaxes.end());
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	44
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	45 const bool addLittleEndianExplicit = (
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	46 proposeUncompressedSyntaxes_ &&
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	47 syntaxes.find(DicomTransferSyntax_LittleEndianExplicit) == syntaxes.end());
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	48
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	49 const bool addBigEndianExplicit = (
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	50 proposeUncompressedSyntaxes_ &&
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	51 proposeRetiredBigEndian_ &&
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	52 syntaxes.find(DicomTransferSyntax_BigEndianExplicit) == syntaxes.end());
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	53
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 size_t requiredCount = syntaxes.size();
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	55 if (addLittleEndianImplicit)
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	56 {
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	57 requiredCount += 1;
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	58 }
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	59
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	60 if (addLittleEndianExplicit \|\|
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	61 addBigEndianExplicit)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 requiredCount += 1;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	66 if (association_->GetRemainingPropositions() <= requiredCount)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 return false; // Not enough room
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 }
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	70 else
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	72 for (std::set<DicomTransferSyntax>::const_iterator
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	73 it = syntaxes.begin(); it != syntaxes.end(); ++it)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	75 association_->ProposePresentationContext(sopClassUid, *it);
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	76 proposedOriginalClasses_.insert(std::make_pair(sopClassUid, *it));
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 }
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	78
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	79 if (addLittleEndianImplicit)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 {
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	81 association_->ProposePresentationContext(sopClassUid, DicomTransferSyntax_LittleEndianImplicit);
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	82 proposedOriginalClasses_.insert(std::make_pair(sopClassUid, DicomTransferSyntax_LittleEndianImplicit));
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	85 if (addLittleEndianExplicit \|\|
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	86 addBigEndianExplicit)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	88 std::set<DicomTransferSyntax> uncompressed;
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	89
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	90 if (addLittleEndianExplicit)
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	91 {
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	92 uncompressed.insert(DicomTransferSyntax_LittleEndianExplicit);
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	93 }
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	94
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	95 if (addBigEndianExplicit)
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	96 {
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	97 uncompressed.insert(DicomTransferSyntax_BigEndianExplicit);
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	98 }
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	99
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	100 association_->ProposePresentationContext(sopClassUid, uncompressed);
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	101
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	102 assert(!uncompressed.empty());
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	103 if (addLittleEndianExplicit ^ addBigEndianExplicit)
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	104 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	105 // Only one transfer syntax was proposed for this presentation context
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	106 assert(uncompressed.size() == 1);
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	107 proposedOriginalClasses_.insert(std::make_pair(sopClassUid, *uncompressed.begin()));
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	108 }
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	111 return true;
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	112 }
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 bool DicomStoreUserConnection::LookupPresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 uint8_t& presentationContextId,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 const std::string& sopClassUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 DicomTransferSyntax transferSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 typedef std::map<DicomTransferSyntax, uint8_t> PresentationContexts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 PresentationContexts pc;
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	124 if (association_->IsOpen() &&
e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	125 association_->LookupAcceptedPresentationContext(pc, sopClassUid))
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 PresentationContexts::const_iterator found = pc.find(transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 if (found != pc.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 presentationContextId = found->second;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 return true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 return false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	137
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	138
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	139 DicomStoreUserConnection::DicomStoreUserConnection(
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 const DicomAssociationParameters& params) :
3874 2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	141 parameters_(params),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	142 association_(new DicomAssociation),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	143 proposeCommonClasses_(true),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	144 proposeUncompressedSyntaxes_(true),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	145 proposeRetiredBigEndian_(false)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	150 void DicomStoreUserConnection::RegisterStorageClass(const std::string& sopClassUid,
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	151 DicomTransferSyntax syntax)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	153 RegisteredClasses::iterator found = registeredClasses_.find(sopClassUid);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	155 if (found == registeredClasses_.end())
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 ts.insert(syntax);
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	159 registeredClasses_[sopClassUid] = ts;
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 found->second.insert(syntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	168 void DicomStoreUserConnection::LookupParameters(std::string& sopClassUid,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	169 std::string& sopInstanceUid,
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	170 DicomTransferSyntax& transferSyntax,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	171 DcmFileFormat& dicom)
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	172 {
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	173 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	174 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	175 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	176 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	177
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	178 OFString a, b;
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	179 if (!dicom.getDataset()->findAndGetOFString(DCM_SOPClassUID, a).good() \|\|
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	180 !dicom.getDataset()->findAndGetOFString(DCM_SOPInstanceUID, b).good())
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	181 {
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	182 throw OrthancException(ErrorCode_NoSopClassOrInstance,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	183 "Unable to determine the SOP class/instance for C-STORE with AET " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	184 parameters_.GetRemoteModality().GetApplicationEntityTitle());
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	185 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	186
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	187 sopClassUid.assign(a.c_str());
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	188 sopInstanceUid.assign(b.c_str());
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	189
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	190 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(transferSyntax, dicom))
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	191 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	192 throw OrthancException(ErrorCode_InternalError,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	193 "Unknown transfer syntax from DCMTK");
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	194 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	195 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	196
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	197
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 bool DicomStoreUserConnection::NegotiatePresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 uint8_t& presentationContextId,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 const std::string& sopClassUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 DicomTransferSyntax transferSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 * Step 1: Check whether this presentation context is already
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	205 * available in the previously negotiated assocation.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 if (LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax))
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 return true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 // The association must be re-negotiated
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	214 if (association_->IsOpen())
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	215 {
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	216 LOG(INFO) << "Re-negotiating DICOM association with "
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	217 << parameters_.GetRemoteModality().GetApplicationEntityTitle();
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	218
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	219 if (proposedOriginalClasses_.find(std::make_pair(sopClassUid, transferSyntax)) !=
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	220 proposedOriginalClasses_.end())
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	221 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	222 LOG(INFO) << "The remote modality has already rejected SOP class UID \""
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	223 << sopClassUid << "\" with transfer syntax \""
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	224 << GetTransferSyntaxUid(transferSyntax) << "\", don't renegotiate";
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	225 return false;
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	226 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	227 }
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	228
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	229 association_->ClearPresentationContexts();
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	230 proposedOriginalClasses_.clear();
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	231 RegisterStorageClass(sopClassUid, transferSyntax); // (*)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	233
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 * Step 2: Propose at least the mandatory SOP class.
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	239 RegisteredClasses::const_iterator mandatory = registeredClasses_.find(sopClassUid);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	241 if (mandatory == registeredClasses_.end() \|\|
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 mandatory->second.find(transferSyntax) == mandatory->second.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	244 // Should never fail because of (*)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 if (!ProposeStorageClass(sopClassUid, mandatory->second))
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 // Should never happen in real life: There are no more than
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 // 128 transfer syntaxes in DICOM!
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 throw OrthancException(ErrorCode_InternalError,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 "Too many transfer syntaxes for SOP class UID: " + sopClassUid);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 * Step 3: Propose all the previously spotted SOP classes, as
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	260 * registered through the "RegisterStorageClass()" method.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	263 for (RegisteredClasses::const_iterator it = registeredClasses_.begin();
a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	264 it != registeredClasses_.end(); ++it)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 if (it->first != sopClassUid)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 ProposeStorageClass(it->first, it->second);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 * Step 4: As long as there is room left in the proposed
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 * presentation contexts, propose the uncompressed transfer syntaxes
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 * for the most common SOP classes, as can be found in the
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 * "dcmShortSCUStorageSOPClassUIDs" array from DCMTK. The
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 * preferred transfer syntax is "LittleEndianImplicit".
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 if (proposeCommonClasses_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	283 // The method "ProposeStorageClass()" will automatically add
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	284 // "LittleEndianImplicit"
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs; i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 std::string c(dcmShortSCUStorageSOPClassUIDs[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 if (c != sopClassUid &&
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	292 registeredClasses_.find(c) == registeredClasses_.end())
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 ProposeStorageClass(c, ts);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 * Step 5: Open the association, and check whether the pair (SOP
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 * class UID, transfer syntax) was accepted by the remote host.
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	305 association_->Open(parameters_);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 return LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 }
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	308
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	309
3881 f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	310 void DicomStoreUserConnection::Store(std::string& sopClassUid,
f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	311 std::string& sopInstanceUid,
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	312 DcmFileFormat& dicom,
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	313 bool hasMoveOriginator,
3881 f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	314 const std::string& moveOriginatorAET,
f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	315 uint16_t moveOriginatorID)
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	316 {
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	317 DicomTransferSyntax transferSyntax;
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	318 LookupParameters(sopClassUid, sopInstanceUid, transferSyntax, dicom);
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	319
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	320 uint8_t presID;
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	321 if (!NegotiatePresentationContext(presID, sopClassUid, transferSyntax))
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	322 {
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	323 throw OrthancException(ErrorCode_NetworkProtocol,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	324 "No valid presentation context was negotiated for "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	325 "SOP class UID [" + sopClassUid + "] and transfer "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	326 "syntax [" + GetTransferSyntaxUid(transferSyntax) + "] "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	327 "while sending to modality [" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	328 parameters_.GetRemoteModality().GetApplicationEntityTitle() + "]");
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	329 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	330
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	331 // Prepare the transmission of data
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	332 T_DIMSE_C_StoreRQ request;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	333 memset(&request, 0, sizeof(request));
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	334 request.MessageID = association_->GetDcmtkAssociation().nextMsgID++;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	335 strncpy(request.AffectedSOPClassUID, sopClassUid.c_str(), DIC_UI_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	336 request.Priority = DIMSE_PRIORITY_MEDIUM;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	337 request.DataSetType = DIMSE_DATASET_PRESENT;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	338 strncpy(request.AffectedSOPInstanceUID, sopInstanceUid.c_str(), DIC_UI_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	339
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	340 if (hasMoveOriginator)
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	341 {
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	342 strncpy(request.MoveOriginatorApplicationEntityTitle,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	343 moveOriginatorAET.c_str(), DIC_AE_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	344 request.opts = O_STORE_MOVEORIGINATORAETITLE;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	345
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	346 request.MoveOriginatorID = moveOriginatorID; // The type DIC_US is an alias for uint16_t
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	347 request.opts \|= O_STORE_MOVEORIGINATORID;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	348 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	349
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	350 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	351 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	352 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	353 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	354
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	355 // Finally conduct transmission of data
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	356 T_DIMSE_C_StoreRSP response;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	357 DcmDataset* statusDetail = NULL;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	358 DicomAssociation::CheckCondition(
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	359 DIMSE_storeUser(&association_->GetDcmtkAssociation(), presID, &request,
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	360 NULL, dicom.getDataset(), /progressCallback/ NULL, NULL,
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	361 /opt_blockMode/ (GetParameters().HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	362 /opt_dimse_timeout/ GetParameters().GetTimeout(),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	363 &response, &statusDetail, NULL),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	364 GetParameters(), "C-STORE");
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	365
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	366 if (statusDetail != NULL)
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	367 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	368 delete statusDetail;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	369 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	370
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	371 /**
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	372 * New in Orthanc 1.6.0: Deal with failures during C-STORE.
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	373 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_B.2.3.html#table_B.2-1
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	374 **/
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	375
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	376 if (response.DimseStatus != 0x0000 && // Success
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	377 response.DimseStatus != 0xB000 && // Warning - Coercion of Data Elements
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	378 response.DimseStatus != 0xB007 && // Warning - Data Set does not match SOP Class
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	379 response.DimseStatus != 0xB006) // Warning - Elements Discarded
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	380 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	381 char buf[16];
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	382 sprintf(buf, "%04X", response.DimseStatus);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	383 throw OrthancException(ErrorCode_NetworkProtocol,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	384 "C-STORE SCU to AET \"" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	385 GetParameters().GetRemoteModality().GetApplicationEntityTitle() +
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	386 "\" has failed with DIMSE status 0x" + buf);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	387 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	388 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	389
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	390
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	391 void DicomStoreUserConnection::Store(std::string& sopClassUid,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	392 std::string& sopInstanceUid,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	393 const void* buffer,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	394 size_t size,
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	395 bool hasMoveOriginator,
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	396 const std::string& moveOriginatorAET,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	397 uint16_t moveOriginatorID)
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	398 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	399 std::unique_ptr<DcmFileFormat> dicom(
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	400 FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size));
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	401
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	402 if (dicom.get() == NULL)
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	403 {
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	404 throw OrthancException(ErrorCode_InternalError);
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	405 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	406
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	407 Store(sopClassUid, sopInstanceUid, *dicom, hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	408 }
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	409
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	410
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	411 void DicomStoreUserConnection::LookupTranscoding(std::set<DicomTransferSyntax>& acceptedSyntaxes,
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	412 const std::string& sopClassUid,
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	413 DicomTransferSyntax sourceSyntax)
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	414 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	415 acceptedSyntaxes.clear();
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	416
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	417 // Make sure a negotiation has already occurred for this transfer
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	418 // syntax. We don't use the return code: Transcoding is possible
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	419 // even if the "sourceSyntax" is not supported.
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	420 uint8_t presID;
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	421 NegotiatePresentationContext(presID, sopClassUid, sourceSyntax);
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	422
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	423 std::map<DicomTransferSyntax, uint8_t> contexts;
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	424 if (association_->LookupAcceptedPresentationContext(contexts, sopClassUid))
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	425 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	426 for (std::map<DicomTransferSyntax, uint8_t>::const_iterator
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	427 it = contexts.begin(); it != contexts.end(); ++it)
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	428 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	429 acceptedSyntaxes.insert(it->first);
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	430 }
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	431 }
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	432 }
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	433
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	434
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	435 void DicomStoreUserConnection::Transcode(std::string& sopClassUid /* out */,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	436 std::string& sopInstanceUid /* out */,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	437 IDicomTranscoder& transcoder,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	438 const void* buffer,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	439 size_t size,
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	440 bool hasMoveOriginator,
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	441 const std::string& moveOriginatorAET,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	442 uint16_t moveOriginatorID)
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	443 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	444 std::unique_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size));
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	445 if (dicom.get() == NULL \|\|
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	446 dicom->getDataset() == NULL)
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	447 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	448 throw OrthancException(ErrorCode_NullPointer);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	449 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	450
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	451 DicomTransferSyntax inputSyntax;
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	452 LookupParameters(sopClassUid, sopInstanceUid, inputSyntax, *dicom);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	453
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	454 std::set<DicomTransferSyntax> accepted;
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	455 LookupTranscoding(accepted, sopClassUid, inputSyntax);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	456
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	457 if (accepted.find(inputSyntax) != accepted.end())
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	458 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	459 // No need for transcoding
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	460 Store(sopClassUid, sopInstanceUid, *dicom,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	461 hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	462 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	463 else
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	464 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	465 // Transcoding is needed
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	466 std::set<DicomTransferSyntax> uncompressedSyntaxes;
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	467
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	468 if (accepted.find(DicomTransferSyntax_LittleEndianImplicit) != accepted.end())
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	469 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	470 uncompressedSyntaxes.insert(DicomTransferSyntax_LittleEndianImplicit);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	471 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	472
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	473 if (accepted.find(DicomTransferSyntax_LittleEndianExplicit) != accepted.end())
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	474 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	475 uncompressedSyntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	476 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	477
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	478 if (accepted.find(DicomTransferSyntax_BigEndianExplicit) != accepted.end())
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	479 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	480 uncompressedSyntaxes.insert(DicomTransferSyntax_BigEndianExplicit);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	481 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	482
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	483 IDicomTranscoder::DicomImage source;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	484 source.AcquireParsed(dicom.release());
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	485 source.SetExternalBuffer(buffer, size);
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	486
5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	487 const std::string sourceUid = IDicomTranscoder::GetSopInstanceUid(source.GetParsed());
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	488
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	489 IDicomTranscoder::DicomImage transcoded;
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	490 if (transcoder.Transcode(transcoded, source, uncompressedSyntaxes, false))
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	491 {
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	492 if (sourceUid != IDicomTranscoder::GetSopInstanceUid(transcoded.GetParsed()))
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	493 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	494 throw OrthancException(ErrorCode_Plugin, "The transcoder has changed the SOP "
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	495 "instance UID while transcoding to an uncompressed transfer syntax");
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	496 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	497 else
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	498 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	499 DicomTransferSyntax transcodedSyntax;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	500
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	501 // Sanity check
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	502 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(transcodedSyntax, transcoded.GetParsed()) \|\|
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	503 accepted.find(transcodedSyntax) == accepted.end())
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	504 {
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	505 throw OrthancException(ErrorCode_InternalError);
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	506 }
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	507 else
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	508 {
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	509 Store(sopClassUid, sopInstanceUid, transcoded.GetParsed(),
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	510 hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	511 }
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	512 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	513 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	514 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	515 }
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp @ 4543:5b1b46f3fcca Orthanc-1.7.3