Mercurial > hg > orthanc
comparison OrthancServer/Sources/ServerContext.cpp @ 5438:7a20ee948676 debug-telemis
Added a new 'Telemis' manufacturer for DicomModalities
author | Alain Mazy <am@osimis.io> |
---|---|
date | Wed, 22 Nov 2023 12:57:07 +0100 |
parents | 6f2b11bfee8d |
children | ac68a4383e51 |
comparison
equal
deleted
inserted
replaced
5437:85da6dcd0e08 | 5438:7a20ee948676 |
---|---|
1950 bool hasMoveOriginator, | 1950 bool hasMoveOriginator, |
1951 const std::string& moveOriginatorAet, | 1951 const std::string& moveOriginatorAet, |
1952 uint16_t moveOriginatorId) | 1952 uint16_t moveOriginatorId) |
1953 { | 1953 { |
1954 const void* data = dicom.empty() ? NULL : dicom.c_str(); | 1954 const void* data = dicom.empty() ? NULL : dicom.c_str(); |
1955 | 1955 const RemoteModalityParameters& modality = connection.GetParameters().GetRemoteModality(); |
1956 | |
1956 if (!transcodeDicomProtocol_ || | 1957 if (!transcodeDicomProtocol_ || |
1957 !connection.GetParameters().GetRemoteModality().IsTranscodingAllowed()) | 1958 !modality.IsTranscodingAllowed()) |
1958 { | 1959 { |
1959 connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(), | 1960 connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(), |
1960 hasMoveOriginator, moveOriginatorAet, moveOriginatorId); | 1961 hasMoveOriginator, moveOriginatorAet, moveOriginatorId, modality.IsAlwaysRenegotiate()); |
1961 } | 1962 } |
1962 else | 1963 else |
1963 { | 1964 { |
1964 connection.Transcode(sopClassUid, sopInstanceUid, *this, data, dicom.size(), preferredTransferSyntax_, | 1965 connection.Transcode(sopClassUid, sopInstanceUid, *this, data, dicom.size(), preferredTransferSyntax_, |
1965 hasMoveOriginator, moveOriginatorAet, moveOriginatorId); | 1966 hasMoveOriginator, moveOriginatorAet, moveOriginatorId, modality.IsAlwaysRenegotiate()); |
1966 } | 1967 } |
1967 } | 1968 } |
1968 | 1969 |
1969 | 1970 |
1970 bool ServerContext::TranscodeWithCache(std::string& target, | 1971 bool ServerContext::TranscodeWithCache(std::string& target, |