Mercurial > hg > orthanc
diff Core/DicomNetworking/DicomStoreUserConnection.cpp @ 3881:f23ab7829a8d transcoding
reorganization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 May 2020 10:35:39 +0200 |
parents | cdd0cb5ec4e4 |
children | 904575738462 |
line wrap: on
line diff
--- a/Core/DicomNetworking/DicomStoreUserConnection.cpp Mon May 04 22:10:55 2020 +0200 +++ b/Core/DicomNetworking/DicomStoreUserConnection.cpp Tue May 05 10:35:39 2020 +0200 @@ -178,7 +178,6 @@ void DicomStoreUserConnection::LookupParameters(std::string& sopClassUid, std::string& sopInstanceUid, - DicomTransferSyntax& transferSyntax, DcmDataset& dataset) { OFString a, b; @@ -192,13 +191,6 @@ sopClassUid.assign(a.c_str()); sopInstanceUid.assign(b.c_str()); - - if (!FromDcmtkBridge::LookupOrthancTransferSyntax( - transferSyntax, dataset.getOriginalXfer())) - { - throw OrthancException(ErrorCode_InternalError, - "Unknown transfer syntax from DCMTK"); - } } @@ -314,14 +306,20 @@ } - void DicomStoreUserConnection::StoreInternal(std::string& sopClassUid, - std::string& sopInstanceUid, - DcmDataset& dataset, - const std::string& moveOriginatorAET, - uint16_t moveOriginatorID) + void DicomStoreUserConnection::Store(std::string& sopClassUid, + std::string& sopInstanceUid, + DcmDataset& dataset, + const std::string& moveOriginatorAET, + uint16_t moveOriginatorID) { + LookupParameters(sopClassUid, sopInstanceUid, dataset); + DicomTransferSyntax transferSyntax; - LookupParameters(sopClassUid, sopInstanceUid, transferSyntax, dataset); + if (!FromDcmtkBridge::LookupOrthancTransferSyntax(transferSyntax, dataset)) + { + throw OrthancException(ErrorCode_InternalError, + "Unknown transfer syntax from DCMTK"); + } uint8_t presID; if (!NegotiatePresentationContext(presID, sopClassUid, transferSyntax)) @@ -405,8 +403,8 @@ throw OrthancException(ErrorCode_InternalError); } - StoreInternal(sopClassUid, sopInstanceUid, *dicom->getDataset(), - moveOriginatorAET, moveOriginatorID); + Store(sopClassUid, sopInstanceUid, *dicom->getDataset(), + moveOriginatorAET, moveOriginatorID); }