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

annotate OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp @ 4792:434843934307 storage-cache

Added a StorageCache in the StorageAccessor

author	Alain Mazy <am@osimis.io>
date	Thu, 30 Sep 2021 12:14:19 +0200
parents	2243f1bb909b
children	7053502fbf97

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
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4296 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
3825 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
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	34 #include <list>
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	35
3825 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 namespace Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 {
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	39 static void ProgressCallback(void * /callbackData/,
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	40 T_DIMSE_StoreProgress *progress,
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	41 T_DIMSE_C_StoreRQ * req)
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	42 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	43 if (req != NULL &&
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	44 progress->state == DIMSE_StoreBegin)
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	45 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	46 OFString str;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	47 CLOG(TRACE, DICOM) << "Sending Store Request:" << std::endl
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	48 << DIMSE_dumpMessage(str, *req, DIMSE_OUTGOING);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	49 }
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	50 }
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	51
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	52
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 bool DicomStoreUserConnection::ProposeStorageClass(const std::string& sopClassUid,
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	54 const std::set<DicomTransferSyntax>& sourceSyntaxes,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	55 bool hasPreferred,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	56 DicomTransferSyntax preferred)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	58 typedef std::list< std::set<DicomTransferSyntax> > GroupsOfSyntaxes;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	59
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	60 GroupsOfSyntaxes groups;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	61
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	62 // Firstly, add one group for each individual transfer syntax
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	63 for (std::set<DicomTransferSyntax>::const_iterator
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	64 it = sourceSyntaxes.begin(); it != sourceSyntaxes.end(); ++it)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	65 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	66 std::set<DicomTransferSyntax> group;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	67 group.insert(*it);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	68 groups.push_back(group);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	69 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	70
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	71 // Secondly, add one group with the preferred transfer syntax
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	72 if (hasPreferred &&
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	73 sourceSyntaxes.find(preferred) == sourceSyntaxes.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	74 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	75 std::set<DicomTransferSyntax> group;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	76 group.insert(preferred);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	77 groups.push_back(group);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	78 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	79
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	80 // Thirdly, add all the uncompressed transfer syntaxes as one single group
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	81 if (proposeUncompressedSyntaxes_)
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	82 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	83 static const size_t N = 3;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	84 static const DicomTransferSyntax UNCOMPRESSED_SYNTAXES[N] = {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	85 DicomTransferSyntax_LittleEndianImplicit,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	86 DicomTransferSyntax_LittleEndianExplicit,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	87 DicomTransferSyntax_BigEndianExplicit
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	88 };
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	89
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	90 std::set<DicomTransferSyntax> group;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	91
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	92 for (size_t i = 0; i < N; i++)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	93 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	94 DicomTransferSyntax syntax = UNCOMPRESSED_SYNTAXES[i];
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	95 if (sourceSyntaxes.find(syntax) == sourceSyntaxes.end() &&
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	96 (!hasPreferred \|\| preferred != syntax))
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	97 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	98 group.insert(syntax);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	99 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	100 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	101
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	102 if (!group.empty())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	103 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	104 groups.push_back(group);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	105 }
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	106 }
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	107
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	108 // Now, propose each of these groups of transfer syntaxes
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	109 if (association_->GetRemainingPropositions() <= groups.size())
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 return false; // Not enough room
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 }
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	113 else
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	115 for (GroupsOfSyntaxes::const_iterator it = groups.begin(); it != groups.end(); ++it)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	117 association_->ProposePresentationContext(sopClassUid, *it);
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	118
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	119 // Remember the syntaxes that were individually proposed, in
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	120 // order to avoid renegociation if they are seen again (**)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	121 if (it->size() == 1)
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	122 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	123 DicomTransferSyntax syntax = *it->begin();
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	124 proposedOriginalClasses_.insert(std::make_pair(sopClassUid, syntax));
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	125 }
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
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	128 return true;
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	129 }
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131
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 bool DicomStoreUserConnection::LookupPresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 uint8_t& presentationContextId,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 const std::string& sopClassUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 DicomTransferSyntax transferSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 typedef std::map<DicomTransferSyntax, uint8_t> PresentationContexts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 PresentationContexts pc;
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	141 if (association_->IsOpen() &&
e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	142 association_->LookupAcceptedPresentationContext(pc, sopClassUid))
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 PresentationContexts::const_iterator found = pc.find(transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 if (found != pc.end())
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 presentationContextId = found->second;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 return true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 return false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	154
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	155
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	156 DicomStoreUserConnection::DicomStoreUserConnection(
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 const DicomAssociationParameters& params) :
3874 2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	158 parameters_(params),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	159 association_(new DicomAssociation),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	160 proposeCommonClasses_(true),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	161 proposeUncompressedSyntaxes_(true),
2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3868 diff changeset	162 proposeRetiredBigEndian_(false)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 }
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	165
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	166 const DicomAssociationParameters &DicomStoreUserConnection::GetParameters() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	167 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	168 return parameters_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	169 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	170
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	171 void DicomStoreUserConnection::SetCommonClassesProposed(bool proposed)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	172 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	173 proposeCommonClasses_ = proposed;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	174 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	175
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	176 bool DicomStoreUserConnection::IsCommonClassesProposed() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	177 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	178 return proposeCommonClasses_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	179 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	180
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	181 void DicomStoreUserConnection::SetUncompressedSyntaxesProposed(bool proposed)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	182 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	183 proposeUncompressedSyntaxes_ = proposed;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	184 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	185
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	186 bool DicomStoreUserConnection::IsUncompressedSyntaxesProposed() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	187 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	188 return proposeUncompressedSyntaxes_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	189 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	190
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	191 void DicomStoreUserConnection::SetRetiredBigEndianProposed(bool propose)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	192 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	193 proposeRetiredBigEndian_ = propose;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	194 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	195
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	196 bool DicomStoreUserConnection::IsRetiredBigEndianProposed() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	197 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	198 return proposeRetiredBigEndian_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	199 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	200
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	202 void DicomStoreUserConnection::RegisterStorageClass(const std::string& sopClassUid,
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	203 DicomTransferSyntax syntax)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	205 RegisteredClasses::iterator found = registeredClasses_.find(sopClassUid);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	207 if (found == registeredClasses_.end())
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 ts.insert(syntax);
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	211 registeredClasses_[sopClassUid] = ts;
3825 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 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 found->second.insert(syntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	220 void DicomStoreUserConnection::LookupParameters(std::string& sopClassUid,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	221 std::string& sopInstanceUid,
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	222 DicomTransferSyntax& transferSyntax,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	223 DcmFileFormat& dicom)
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	224 {
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	225 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	226 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	227 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	228 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	229
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	230 OFString a, b;
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	231 if (!dicom.getDataset()->findAndGetOFString(DCM_SOPClassUID, a).good() \|\|
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	232 !dicom.getDataset()->findAndGetOFString(DCM_SOPInstanceUID, b).good())
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	233 {
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	234 throw OrthancException(ErrorCode_NoSopClassOrInstance,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	235 "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	236 parameters_.GetRemoteModality().GetApplicationEntityTitle());
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	237 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	238
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	239 sopClassUid.assign(a.c_str());
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	240 sopInstanceUid.assign(b.c_str());
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	241
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	242 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(transferSyntax, dicom))
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	243 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	244 throw OrthancException(ErrorCode_InternalError,
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	245 "Unknown transfer syntax from DCMTK");
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	246 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	247 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	248
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	249
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 bool DicomStoreUserConnection::NegotiatePresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 uint8_t& presentationContextId,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 const std::string& sopClassUid,
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	253 DicomTransferSyntax transferSyntax,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	254 bool hasPreferred,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	255 DicomTransferSyntax preferred)
3825 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 * Step 1: Check whether this presentation context is already
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	259 * available in the previously negotiated assocation.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 if (LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax))
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 return true;
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 // The association must be re-negotiated
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	268 if (association_->IsOpen())
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	269 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	270 CLOG(INFO, DICOM) << "Re-negotiating DICOM association with "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	271 << parameters_.GetRemoteModality().GetApplicationEntityTitle();
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	272
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	273 // Don't renegociate if we know that the remote modality was
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	274 // already proposed this individual transfer syntax (**)
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	275 if (proposedOriginalClasses_.find(std::make_pair(sopClassUid, transferSyntax)) !=
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	276 proposedOriginalClasses_.end())
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	277 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	278 CLOG(INFO, DICOM) << "The remote modality has already rejected SOP class UID \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	279 << sopClassUid << "\" with transfer syntax \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	280 << GetTransferSyntaxUid(transferSyntax) << "\", don't renegotiate";
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	281 return false;
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	282 }
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	283 }
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	284
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	285 association_->ClearPresentationContexts();
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	286 proposedOriginalClasses_.clear();
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	287 RegisterStorageClass(sopClassUid, transferSyntax); // (*)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	289
3825 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 * 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	292 **/
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 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	295 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	296
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	297 if (mandatory == registeredClasses_.end() \|\|
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 mandatory->second.find(transferSyntax) == mandatory->second.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 {
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	300 // Should never fail because of (*)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	304 if (!ProposeStorageClass(sopClassUid, mandatory->second, hasPreferred, preferred))
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 // 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	307 // 128 transfer syntaxes in DICOM!
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 throw OrthancException(ErrorCode_InternalError,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 "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	310 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 * 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	316 * registered through the "RegisterStorageClass()" method.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	319 for (RegisteredClasses::const_iterator it = registeredClasses_.begin();
a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	320 it != registeredClasses_.end(); ++it)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 if (it->first != sopClassUid)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	324 ProposeStorageClass(it->first, it->second, hasPreferred, preferred);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 * 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	331 * presentation contexts, propose the uncompressed transfer syntaxes
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 * 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	333 * "dcmShortSCUStorageSOPClassUIDs" array from DCMTK. The
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 * preferred transfer syntax is "LittleEndianImplicit".
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 if (proposeCommonClasses_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 {
3868 d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	339 // The method "ProposeStorageClass()" will automatically add
d5be23fc0106 better negotiation of transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 3862 diff changeset	340 // "LittleEndianImplicit"
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs; i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 std::string c(dcmShortSCUStorageSOPClassUIDs[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 if (c != sopClassUid &&
3879 a18b34dec94a reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	348 registeredClasses_.find(c) == registeredClasses_.end())
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	350 ProposeStorageClass(c, ts, hasPreferred, preferred);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 * 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	358 * 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	359 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
3826 e82bd07c384e putting DicomAssociation behind pimpl Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	361 association_->Open(parameters_);
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 return LookupPresentationContext(presentationContextId, sopClassUid, transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 }
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	364
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	365
3881 f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	366 void DicomStoreUserConnection::Store(std::string& sopClassUid,
f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	367 std::string& sopInstanceUid,
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	368 DcmFileFormat& dicom,
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	369 bool hasMoveOriginator,
3881 f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	370 const std::string& moveOriginatorAET,
f23ab7829a8d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3880 diff changeset	371 uint16_t moveOriginatorID)
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	372 {
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	373 DicomTransferSyntax transferSyntax;
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	374 LookupParameters(sopClassUid, sopInstanceUid, transferSyntax, dicom);
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	375
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	376 uint8_t presID;
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	377 if (!NegotiatePresentationContext(presID, sopClassUid, transferSyntax, proposeUncompressedSyntaxes_,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	378 DicomTransferSyntax_LittleEndianExplicit))
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	379 {
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	380 throw OrthancException(ErrorCode_NetworkProtocol,
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	381 "No valid presentation context was negotiated for "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	382 "SOP class UID [" + sopClassUid + "] and transfer "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	383 "syntax [" + GetTransferSyntaxUid(transferSyntax) + "] "
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	384 "while sending to modality [" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	385 parameters_.GetRemoteModality().GetApplicationEntityTitle() + "]");
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	386 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	387
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	388 // Prepare the transmission of data
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	389 T_DIMSE_C_StoreRQ request;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	390 memset(&request, 0, sizeof(request));
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	391 request.MessageID = association_->GetDcmtkAssociation().nextMsgID++;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	392 strncpy(request.AffectedSOPClassUID, sopClassUid.c_str(), DIC_UI_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	393 request.Priority = DIMSE_PRIORITY_MEDIUM;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	394 request.DataSetType = DIMSE_DATASET_PRESENT;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	395 strncpy(request.AffectedSOPInstanceUID, sopInstanceUid.c_str(), DIC_UI_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	396
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	397 if (hasMoveOriginator)
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	398 {
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	399 strncpy(request.MoveOriginatorApplicationEntityTitle,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	400 moveOriginatorAET.c_str(), DIC_AE_LEN);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	401 request.opts = O_STORE_MOVEORIGINATORAETITLE;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	402
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	403 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	404 request.opts \|= O_STORE_MOVEORIGINATORID;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	405 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	406
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	407 if (dicom.getDataset() == NULL)
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	408 {
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	409 throw OrthancException(ErrorCode_InternalError);
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	410 }
904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	411
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	412 // Finally conduct transmission of data
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	413 T_DIMSE_C_StoreRSP response;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	414 DcmDataset* statusDetail = NULL;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	415 DicomAssociation::CheckCondition(
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	416 DIMSE_storeUser(&association_->GetDcmtkAssociation(), presID, &request,
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	417 NULL, dicom.getDataset(), ProgressCallback, NULL,
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	418 /opt_blockMode/ (GetParameters().HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	419 /opt_dimse_timeout/ GetParameters().GetTimeout(),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	420 &response, &statusDetail, NULL),
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	421 GetParameters(), "C-STORE");
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	422
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	423 if (statusDetail != NULL)
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	424 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	425 delete statusDetail;
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	426 }
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	427
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	428 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	429 OFString str;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	430 CLOG(TRACE, DICOM) << "Received Store Response:" << std::endl
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	431 << DIMSE_dumpMessage(str, response, DIMSE_INCOMING, NULL, presID);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	432 }
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	433
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	434 /**
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	435 * 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	436 * 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	437 **/
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	438
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	439 if (response.DimseStatus != 0x0000 && // Success
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	440 response.DimseStatus != 0xB000 && // Warning - Coercion of Data Elements
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	441 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	442 response.DimseStatus != 0xB006) // Warning - Elements Discarded
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	443 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	444 char buf[16];
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	445 sprintf(buf, "%04X", response.DimseStatus);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	446 throw OrthancException(ErrorCode_NetworkProtocol,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	447 "C-STORE SCU to AET \"" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	448 GetParameters().GetRemoteModality().GetApplicationEntityTitle() +
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	449 "\" has failed with DIMSE status 0x" + buf);
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	450 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	451 }
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	452
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	453
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	454 void DicomStoreUserConnection::Store(std::string& sopClassUid,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	455 std::string& sopInstanceUid,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	456 const void* buffer,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	457 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	458 bool hasMoveOriginator,
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	459 const std::string& moveOriginatorAET,
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	460 uint16_t moveOriginatorID)
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	461 {
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	462 std::unique_ptr<DcmFileFormat> dicom(
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	463 FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size));
83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	464
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	465 if (dicom.get() == NULL)
3862 594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	466 {
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	467 throw OrthancException(ErrorCode_InternalError);
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	468 }
594263db316a DicomModalityStoreJob now uses DicomStoreUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3831 diff changeset	469
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	470 Store(sopClassUid, sopInstanceUid, *dicom, hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
3831 83ea6939293d starting DicomStoreUserConnection::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3826 diff changeset	471 }
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	472
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	473
3882 904575738462 implemented IDicomTranscoder::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3881 diff changeset	474 void DicomStoreUserConnection::LookupTranscoding(std::set<DicomTransferSyntax>& acceptedSyntaxes,
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	475 const std::string& sopClassUid,
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	476 DicomTransferSyntax sourceSyntax,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	477 bool hasPreferred,
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	478 DicomTransferSyntax preferred)
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	479 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	480 acceptedSyntaxes.clear();
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	481
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	482 // Make sure a negotiation has already occurred for this transfer
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	483 // syntax. We don't use the return code: Transcoding is possible
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	484 // even if the "sourceSyntax" is not supported.
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	485 uint8_t presID;
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	486 NegotiatePresentationContext(presID, sopClassUid, sourceSyntax, hasPreferred, preferred);
3880 cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	487
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	488 std::map<DicomTransferSyntax, uint8_t> contexts;
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	489 if (association_->LookupAcceptedPresentationContext(contexts, sopClassUid))
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	490 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	491 for (std::map<DicomTransferSyntax, uint8_t>::const_iterator
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	492 it = contexts.begin(); it != contexts.end(); ++it)
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	493 {
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	494 acceptedSyntaxes.insert(it->first);
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	495 }
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	496 }
cdd0cb5ec4e4 DicomStoreUserConnection::LookupTranscoding() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3879 diff changeset	497 }
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	498
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	499
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	500 void DicomStoreUserConnection::Transcode(std::string& sopClassUid /* out */,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	501 std::string& sopInstanceUid /* out */,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	502 IDicomTranscoder& transcoder,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	503 const void* buffer,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	504 size_t size,
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	505 DicomTransferSyntax preferredTransferSyntax,
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3893 diff changeset	506 bool hasMoveOriginator,
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	507 const std::string& moveOriginatorAET,
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	508 uint16_t moveOriginatorID)
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	509 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	510 std::unique_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size));
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	511 if (dicom.get() == NULL \|\|
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	512 dicom->getDataset() == NULL)
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 throw OrthancException(ErrorCode_NullPointer);
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	515 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	516
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	517 DicomTransferSyntax sourceSyntax;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	518 LookupParameters(sopClassUid, sopInstanceUid, sourceSyntax, *dicom);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	519
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	520 std::set<DicomTransferSyntax> accepted;
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	521 LookupTranscoding(accepted, sopClassUid, sourceSyntax, true, preferredTransferSyntax);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	522
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	523 if (accepted.find(sourceSyntax) != accepted.end())
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	524 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	525 // 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	526 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	527 hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	528 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	529 else
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	530 {
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	531 // Transcoding is needed
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	532 IDicomTranscoder::DicomImage source;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	533 source.AcquireParsed(dicom.release());
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	534 source.SetExternalBuffer(buffer, size);
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	535
5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	536 const std::string sourceUid = IDicomTranscoder::GetSopInstanceUid(source.GetParsed());
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	537
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3907 diff changeset	538 IDicomTranscoder::DicomImage transcoded;
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	539 bool success = false;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	540 bool isDestructiveCompressionAllowed = false;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	541 std::set<DicomTransferSyntax> attemptedSyntaxes;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	542
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	543 if (accepted.find(preferredTransferSyntax) != accepted.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	544 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	545 // New in Orthanc 1.9.0: The preferred transfer syntax is
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	546 // accepted by the remote modality => transcode to this syntax
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	547 std::set<DicomTransferSyntax> targetSyntaxes;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	548 targetSyntaxes.insert(preferredTransferSyntax);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	549 attemptedSyntaxes.insert(preferredTransferSyntax);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	550
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	551 success = transcoder.Transcode(transcoded, source, targetSyntaxes, true);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	552 isDestructiveCompressionAllowed = true;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	553 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	554
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	555 if (!success)
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	556 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	557 // Transcode to either one of the uncompressed transfer
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	558 // syntaxes that are accepted by the remote modality
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	559
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	560 std::set<DicomTransferSyntax> targetSyntaxes;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	561
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	562 if (accepted.find(DicomTransferSyntax_LittleEndianImplicit) != accepted.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	563 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	564 targetSyntaxes.insert(DicomTransferSyntax_LittleEndianImplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	565 attemptedSyntaxes.insert(DicomTransferSyntax_LittleEndianImplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	566 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	567
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	568 if (accepted.find(DicomTransferSyntax_LittleEndianExplicit) != accepted.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	569 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	570 targetSyntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	571 attemptedSyntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	572 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	573
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	574 if (accepted.find(DicomTransferSyntax_BigEndianExplicit) != accepted.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	575 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	576 targetSyntaxes.insert(DicomTransferSyntax_BigEndianExplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	577 attemptedSyntaxes.insert(DicomTransferSyntax_BigEndianExplicit);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	578 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	579
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	580 if (!targetSyntaxes.empty())
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	581 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	582 success = transcoder.Transcode(transcoded, source, targetSyntaxes, false);
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	583 isDestructiveCompressionAllowed = false;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	584 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	585 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	586
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	587 if (success)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	588 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	589 std::string targetUid = IDicomTranscoder::GetSopInstanceUid(transcoded.GetParsed());
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	590 if (sourceUid != targetUid)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	591 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	592 if (isDestructiveCompressionAllowed)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	593 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	594 LOG(WARNING) << "Because of the use of a preferred transfer syntax that corresponds to "
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	595 << "a destructive compression, C-STORE SCU has hanged the SOP Instance UID "
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	596 << "of a DICOM instance from \"" << sourceUid << "\" to \"" << targetUid << "\"";
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	597 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	598 else
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	599 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	600 throw OrthancException(ErrorCode_Plugin, "The transcoder has changed the SOP "
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	601 "Instance UID while transcoding to an uncompressed transfer syntax");
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	602 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	603 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	604
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	605 DicomTransferSyntax transcodedSyntax;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	606
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	607 // Sanity check
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	608 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(transcodedSyntax, transcoded.GetParsed()) \|\|
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	609 accepted.find(transcodedSyntax) == accepted.end())
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	610 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	611 throw OrthancException(ErrorCode_InternalError);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	612 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	613 else
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	614 {
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	615 Store(sopClassUid, sopInstanceUid, transcoded.GetParsed(),
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	616 hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	617 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	618 }
4465 fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	619 else
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	620 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	621 std::string s;
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	622 for (std::set<DicomTransferSyntax>::const_iterator
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	623 it = attemptedSyntaxes.begin(); it != attemptedSyntaxes.end(); ++it)
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	624 {
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	625 s += " " + std::string(GetTransferSyntaxUid(*it));
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	626 }
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	627
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	628 throw OrthancException(ErrorCode_NotImplemented, "Cannot transcode from " +
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	629 std::string(GetTransferSyntaxUid(sourceSyntax)) +
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	630 " to one of [" + s + " ]");
fe774d8e904b New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	631 }
3893 7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	632 }
7a5fa8f307e9 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3882 diff changeset	633 }
4466 2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	634
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	635
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	636 void DicomStoreUserConnection::Transcode(std::string& sopClassUid /* out */,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	637 std::string& sopInstanceUid /* out */,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	638 IDicomTranscoder& transcoder,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	639 const void* buffer,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	640 size_t size,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	641 bool hasMoveOriginator,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	642 const std::string& moveOriginatorAET,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	643 uint16_t moveOriginatorID)
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	644 {
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	645 Transcode(sopClassUid, sopInstanceUid, transcoder, buffer, size, DicomTransferSyntax_LittleEndianExplicit,
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	646 hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
2243f1bb909b ABI compatibility for DicomStoreUserConnection::Transcode() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	647 }
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp @ 4792:434843934307 storage-cache