Mercurial > hg > orthanc
view OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.cpp @ 5911:bfae0fc2ea1b get-scu-test
Started to work on handling errors as warnings when trying to store instances whose SOPClassUID has not been accepted during the negotiation. Work to be finalized later
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Mon, 09 Dec 2024 10:07:19 +0100 |
parents | 8329d28611ad |
children |
line wrap: on
line source
/** * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2023 Osimis S.A., Belgium * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ #include "DicomGetScuJob.h" #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" #include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include <dcmtk/dcmnet/dimse.h> #include <algorithm> #include "../../../OrthancFramework/Sources/Logging.h" static const char* const LOCAL_AET = "LocalAet"; static const char* const QUERY = "Query"; static const char* const QUERY_FORMAT = "QueryFormat"; // New in 1.9.5 static const char* const REMOTE = "Remote"; static const char* const TIMEOUT = "Timeout"; namespace Orthanc { static void AddToQuery(DicomFindAnswers& query, const DicomMap& item) { query.Add(item); /** * Compatibility with Orthanc <= 1.9.4: Remove the * "SpecificCharacterSet" (0008,0005) tag that is automatically * added if creating a ParsedDicomFile object from a DicomMap. **/ query.GetAnswer(query.GetSize() - 1).Remove(DICOM_TAG_SPECIFIC_CHARACTER_SET); } // this method is used to implement the retrieve part of a Q&R // it keeps only the main dicom tags from the C-Find answer void DicomRetrieveScuBaseJob::AddFindAnswer(const DicomMap& answer) { DicomMap item; item.CopyTagIfExists(answer, DICOM_TAG_QUERY_RETRIEVE_LEVEL); item.CopyTagIfExists(answer, DICOM_TAG_PATIENT_ID); item.CopyTagIfExists(answer, DICOM_TAG_STUDY_INSTANCE_UID); item.CopyTagIfExists(answer, DICOM_TAG_SERIES_INSTANCE_UID); item.CopyTagIfExists(answer, DICOM_TAG_SOP_INSTANCE_UID); item.CopyTagIfExists(answer, DICOM_TAG_ACCESSION_NUMBER); AddToQuery(query_, item); AddCommand(new Command(*this, answer)); } void DicomRetrieveScuBaseJob::AddFindAnswer(QueryRetrieveHandler& query, size_t i) { DicomMap answer; query.GetAnswer(answer, i); AddFindAnswer(answer); } // this method is used to implement a C-Move // it keeps all tags from the C-Move query void DicomRetrieveScuBaseJob::AddQuery(const DicomMap& query) { AddToQuery(query_, query); AddCommand(new Command(*this, query)); } void DicomRetrieveScuBaseJob::SetLocalAet(const std::string& aet) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetLocalApplicationEntityTitle(aet); } } void DicomRetrieveScuBaseJob::SetRemoteModality(const RemoteModalityParameters& remote) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetRemoteModality(remote); } } void DicomRetrieveScuBaseJob::SetTimeout(uint32_t seconds) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetTimeout(seconds); } } void DicomRetrieveScuBaseJob::Stop(JobStopReason reason) { connection_.reset(); } void DicomRetrieveScuBaseJob::SetQueryFormat(DicomToJsonFormat format) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { queryFormat_ = format; } } void DicomRetrieveScuBaseJob::GetPublicContent(Json::Value& value) const { SetOfCommandsJob::GetPublicContent(value); value[LOCAL_AET] = parameters_.GetLocalApplicationEntityTitle(); value["RemoteAet"] = parameters_.GetRemoteModality().GetApplicationEntityTitle(); value[QUERY] = Json::objectValue; query_.ToJson(value[QUERY], queryFormat_); } DicomRetrieveScuBaseJob::DicomRetrieveScuBaseJob(ServerContext& context, const Json::Value& serialized) : SetOfCommandsJob(new Unserializer(*this), serialized), context_(context), parameters_(DicomAssociationParameters::UnserializeJob(serialized)), query_(true), queryFormat_(DicomToJsonFormat_Short), nbRemainingSubOperations_(0), nbCompletedSubOperations_(0), nbFailedSubOperations_(0), nbWarningSubOperations_(0) { if (serialized.isMember(QUERY)) { const Json::Value& query = serialized[QUERY]; if (query.type() == Json::arrayValue) { for (Json::Value::ArrayIndex i = 0; i < query.size(); i++) { DicomMap item; FromDcmtkBridge::FromJson(item, query[i]); AddToQuery(query_, item); } } } if (serialized.isMember(QUERY_FORMAT)) { queryFormat_ = StringToDicomToJsonFormat(SerializationToolbox::ReadString(serialized, QUERY_FORMAT)); } } bool DicomRetrieveScuBaseJob::Serialize(Json::Value& target) const { if (!SetOfCommandsJob::Serialize(target)) { return false; } else { parameters_.SerializeJob(target); // "Short" is for compatibility with Orthanc <= 1.9.4 target[QUERY] = Json::objectValue; query_.ToJson(target[QUERY], DicomToJsonFormat_Short); target[QUERY_FORMAT] = EnumerationToString(queryFormat_); return true; } } void DicomRetrieveScuBaseJob::OnProgressUpdated(uint16_t nbRemainingSubOperations, uint16_t nbCompletedSubOperations, uint16_t nbFailedSubOperations, uint16_t nbWarningSubOperations) { boost::mutex::scoped_lock lock(progressMutex_); nbRemainingSubOperations_ = nbRemainingSubOperations; nbCompletedSubOperations_ = nbCompletedSubOperations; nbFailedSubOperations_ = nbFailedSubOperations; nbWarningSubOperations_ = nbWarningSubOperations; } float DicomRetrieveScuBaseJob::GetProgress() const { boost::mutex::scoped_lock lock(progressMutex_); uint32_t totalOperations = nbRemainingSubOperations_ + nbCompletedSubOperations_ + nbFailedSubOperations_ + nbWarningSubOperations_; if (totalOperations == 0) { return 0.0f; } LOG(INFO) << "---------" << nbRemainingSubOperations_ << " " << nbCompletedSubOperations_; return float(nbCompletedSubOperations_ + nbFailedSubOperations_ + nbWarningSubOperations_) / float(totalOperations); } }