orthanc: UnitTestsSources/FromDcmtkTests.cpp comparison

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3824:6762506ef4fb transcoding

reorganization of CheckCondition()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 10 Apr 2020 15:24:02 +0200
parents	897ca3103253
children	638906dcfe32

comparison

equal deleted inserted replaced

-:897ca3103253
+:6762506ef4fb
 {
 boost::mutex::scoped_lock lock(defaultTimeoutMutex_);
 defaultTimeout_ = seconds;
 }
 }
+};
-void CheckCondition(const OFCondition& cond,
-const std::string& command) const
+static void FillSopSequence(DcmDataset& dataset,
+const DcmTagKey& tag,
+const std::vector<std::string>& sopClassUids,
+const std::vector<std::string>& sopInstanceUids,
+const std::vector<StorageCommitmentFailureReason>& failureReasons,
+bool hasFailureReasons)
+{
+assert(sopClassUids.size() == sopInstanceUids.size() &&
+(hasFailureReasons ?
+failureReasons.size() == sopClassUids.size() :
+failureReasons.empty()));
+if (sopInstanceUids.empty())
+{
+// Add an empty sequence
+if (!dataset.insertEmptyElement(tag).good())
+{
+throw OrthancException(ErrorCode_InternalError);
+}
+}
+else
+{
+for (size_t i = 0; i < sopClassUids.size(); i++)
+{
+std::unique_ptr<DcmItem> item(new DcmItem);
+if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() ||
+!item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() ||
+(hasFailureReasons &&
+!item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) ||
+!dataset.insertSequenceItem(tag, item.release()).good())
+{
+throw OrthancException(ErrorCode_InternalError);
+}
+}
+}
+}
+class DicomAssociation : public boost::noncopyable
+{
+private:
+// This is the maximum number of presentation context IDs (the
+// number of odd integers between 1 and 255)
+// http://dicom.nema.org/medical/dicom/2019e/output/chtml/part08/sect_9.3.2.2.html
+static const size_t MAX_PROPOSED_PRESENTATIONS = 128;
+struct ProposedPresentationContext
+{
+std::string                    abstractSyntax_;
+std::set<DicomTransferSyntax>  transferSyntaxes_;
+};
+typedef std::map<std::string, std::map<DicomTransferSyntax, uint8_t> >  AcceptedPresentationContexts;
+DicomAssociationRole                      role_;
+bool                                      isOpen_;
+std::vector<ProposedPresentationContext>  proposed_;
+AcceptedPresentationContexts              accepted_;
+T_ASC_Network*                            net_;
+T_ASC_Parameters*                         params_;
+T_ASC_Association*                        assoc_;
+void Initialize()
+{
+role_ = DicomAssociationRole_Default;
+isOpen_ = false;
+net_ = NULL;
+params_ = NULL;
+assoc_ = NULL;
+// Must be after "isOpen_ = false"
+ClearPresentationContexts();
+}
+void CheckConnecting(const DicomAssociationParameters& parameters,
+const OFCondition& cond)
+{
+try
+{
+CheckCondition(cond, parameters, "connecting");
+}
+catch (OrthancException&)
+{
+CloseInternal();
+throw;
+}
+}
+void CloseInternal()
+{
+if (assoc_ != NULL)
+{
+ASC_releaseAssociation(assoc_);
+ASC_destroyAssociation(&assoc_);
+assoc_ = NULL;
+params_ = NULL;
+}
+else
+{
+if (params_ != NULL)
+{
+ASC_destroyAssociationParameters(&params_);
+params_ = NULL;
+}
+}
+if (net_ != NULL)
+{
+ASC_dropNetwork(&net_);
+net_ = NULL;
+}
+accepted_.clear();
+isOpen_ = false;
+}
+void AddAccepted(const std::string& abstractSyntax,
+DicomTransferSyntax syntax,
+uint8_t presentationContextId)
+{
+AcceptedPresentationContexts::iterator found = accepted_.find(abstractSyntax);
+if (found == accepted_.end())
+{
+std::map<DicomTransferSyntax, uint8_t> syntaxes;
+syntaxes[syntax] = presentationContextId;
+accepted_[abstractSyntax] = syntaxes;
+}
+else
+{
+if (found->second.find(syntax) != found->second.end())
+{
+LOG(WARNING) << "The same transfer syntax ("
+<< GetTransferSyntaxUid(syntax)
+<< ") was accepted twice for the same abstract syntax UID ("
+<< abstractSyntax << ")";
+}
+else
+{
+found->second[syntax] = presentationContextId;
+}
+}
+}
+public:
+DicomAssociation()
+{
+Initialize();
+}
+~DicomAssociation()
+{
+try
+{
+Close();
+}
+catch (OrthancException&)
+{
+// Don't throw exception in destructors
+}
+}
+bool IsOpen() const
+{
+return isOpen_;
+}
+void SetRole(DicomAssociationRole role)
+{
+if (role_ != role)
+{
+Close();
+role_ = role;
+}
+}
+void ClearPresentationContexts()
+{
+Close();
+proposed_.clear();
+proposed_.reserve(MAX_PROPOSED_PRESENTATIONS);
+}
+void Open(const DicomAssociationParameters& parameters)
+{
+if (isOpen_)
+{
+return;  // Already open
+}
+// Timeout used during association negociation and ASC_releaseAssociation()
+uint32_t acseTimeout = parameters.GetTimeout();
+if (acseTimeout == 0)
+{
+/**
+* Timeout is disabled. Global timeout (seconds) for
+* connecting to remote hosts.  Default value is -1 which
+* selects infinite timeout, i.e. blocking connect().
+**/
+dcmConnectionTimeout.set(-1);
+acseTimeout = 10;
+}
+else
+{
+dcmConnectionTimeout.set(acseTimeout);
+}
+T_ASC_SC_ROLE dcmtkRole;
+switch (role_)
+{
+case DicomAssociationRole_Default:
+dcmtkRole = ASC_SC_ROLE_DEFAULT;
+break;
+case DicomAssociationRole_Scu:
+dcmtkRole = ASC_SC_ROLE_SCU;
+break;
+case DicomAssociationRole_Scp:
+dcmtkRole = ASC_SC_ROLE_SCP;
+break;
+default:
+throw OrthancException(ErrorCode_ParameterOutOfRange);
+}
+assert(net_ == NULL &&
+params_ == NULL &&
+assoc_ == NULL);
+if (proposed_.empty())
+{
+throw OrthancException(ErrorCode_BadSequenceOfCalls,
+"No presentation context was proposed");
+}
+LOG(INFO) << "Opening a DICOM SCU connection from AET \""
+<< parameters.GetLocalApplicationEntityTitle()
+<< "\" to AET \"" << parameters.GetRemoteApplicationEntityTitle()
+<< "\" on host " << parameters.GetRemoteHost()
+<< ":" << parameters.GetRemotePort()
+<< " (manufacturer: " << EnumerationToString(parameters.GetRemoteManufacturer()) << ")";
+CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ acseTimeout, &net_));
+CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU));
+// Set this application's title and the called application's title in the params
+CheckConnecting(parameters, ASC_setAPTitles(
+params_, parameters.GetLocalApplicationEntityTitle().c_str(),
+parameters.GetRemoteApplicationEntityTitle().c_str(), NULL));
+// Set the network addresses of the local and remote entities
+char localHost[HOST_NAME_MAX];
+gethostname(localHost, HOST_NAME_MAX - 1);
+char remoteHostAndPort[HOST_NAME_MAX];
+#ifdef _MSC_VER
+_snprintf
+#else
+snprintf
+#endif
+(remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d",
+parameters.GetRemoteHost().c_str(), parameters.GetRemotePort());
+CheckConnecting(parameters, ASC_setPresentationAddresses(params_, localHost, remoteHostAndPort));
+// Set various options
+CheckConnecting(parameters, ASC_setTransportLayerType(params_, /*opt_secureConnection*/ false));
+// Setup the list of proposed presentation contexts
+unsigned int presentationContextId = 1;
+for (size_t i = 0; i < proposed_.size(); i++)
+{
+assert(presentationContextId <= 255);
+const char* abstractSyntax = proposed_[i].abstractSyntax_.c_str();
+const std::set<DicomTransferSyntax>& source = proposed_[i].transferSyntaxes_;
+std::vector<const char*> transferSyntaxes;
+transferSyntaxes.reserve(source.size());
+for (std::set<DicomTransferSyntax>::const_iterator
+it = source.begin(); it != source.end(); ++it)
+{
+transferSyntaxes.push_back(GetTransferSyntaxUid(*it));
+}
+assert(!transferSyntaxes.empty());
+CheckConnecting(parameters, ASC_addPresentationContext(
+params_, presentationContextId, abstractSyntax,
+&transferSyntaxes[0], transferSyntaxes.size(), dcmtkRole));
+presentationContextId += 2;
+}
+// Do the association
+CheckConnecting(parameters, ASC_requestAssociation(net_, params_, &assoc_));
+isOpen_ = true;
+// Inspect the accepted transfer syntaxes
+LST_HEAD **l = &params_->DULparams.acceptedPresentationContext;
+if (*l != NULL)
+{
+DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
+LST_Position(l, (LST_NODE*)pc);
+while (pc)
+{
+if (pc->result == ASC_P_ACCEPTANCE)
+{
+DicomTransferSyntax transferSyntax;
+if (LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
+{
+AddAccepted(pc->abstractSyntax, transferSyntax, pc->presentationContextID);
+}
+else
+{
+LOG(WARNING) << "Unknown transfer syntax received from AET \""
+<< parameters.GetRemoteApplicationEntityTitle()
+<< "\": " << pc->acceptedTransferSyntax;
+}
+}
+pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
+}
+}
+if (accepted_.empty())
+{
+throw OrthancException(ErrorCode_NoPresentationContext,
+"Unable to negotiate a presentation context with AET \"" +
+parameters.GetRemoteApplicationEntityTitle() + "\"");
+}
+}
+void Close()
+{
+if (isOpen_)
+{
+CloseInternal();
+}
+}
+bool LookupAcceptedPresentationContext(std::map<DicomTransferSyntax, uint8_t>& target,
+const std::string& abstractSyntax) const
+{
+if (!IsOpen())
+{
+throw OrthancException(ErrorCode_BadSequenceOfCalls, "Connection not opened");
+}
+AcceptedPresentationContexts::const_iterator found = accepted_.find(abstractSyntax);
+if (found == accepted_.end())
+{
+return false;
+}
+else
+{
+target = found->second;
+return true;
+}
+}
+void ProposeGenericPresentationContext(const std::string& abstractSyntax)
+{
+std::set<DicomTransferSyntax> ts;
+ts.insert(DicomTransferSyntax_LittleEndianImplicit);
+ts.insert(DicomTransferSyntax_LittleEndianExplicit);
+ts.insert(DicomTransferSyntax_BigEndianExplicit);  // Retired
+ProposePresentationContext(abstractSyntax, ts);
+}
+void ProposePresentationContext(const std::string& abstractSyntax,
+DicomTransferSyntax transferSyntax)
+{
+std::set<DicomTransferSyntax> ts;
+ts.insert(transferSyntax);
+ProposePresentationContext(abstractSyntax, ts);
+}
+size_t GetRemainingPropositions() const
+{
+assert(proposed_.size() <= MAX_PROPOSED_PRESENTATIONS);
+return MAX_PROPOSED_PRESENTATIONS - proposed_.size();
+}
+void ProposePresentationContext(const std::string& abstractSyntax,
+const std::set<DicomTransferSyntax>& transferSyntaxes)
+{
+if (transferSyntaxes.empty())
+{
+throw OrthancException(ErrorCode_ParameterOutOfRange,
+"No transfer syntax provided");
+}
+if (proposed_.size() >= MAX_PROPOSED_PRESENTATIONS)
+{
+throw OrthancException(ErrorCode_ParameterOutOfRange,
+"Too many proposed presentation contexts");
+}
+if (IsOpen())
+{
+Close();
+}
+ProposedPresentationContext context;
+context.abstractSyntax_ = abstractSyntax;
+context.transferSyntaxes_ = transferSyntaxes;
+proposed_.push_back(context);
+}
+T_ASC_Association& GetDcmtkAssociation() const
+{
+if (isOpen_)
+{
+assert(assoc_ != NULL);
+return *assoc_;
+}
+else
+{
+throw OrthancException(ErrorCode_BadSequenceOfCalls,
+"The connection is not open");
+}
+}
+T_ASC_Network& GetDcmtkNetwork() const
+{
+if (isOpen_)
+{
+assert(net_ != NULL);
+return *net_;
+}
+else
+{
+throw OrthancException(ErrorCode_BadSequenceOfCalls,
+"The connection is not open");
+}
+}
+static void CheckCondition(const OFCondition& cond,
+const DicomAssociationParameters& parameters,
+const std::string& command)
 {
 if (cond.bad())
 {
 // Reformat the error message from DCMTK by turning multiline
 // errors into a single line
 info += ")";
 }
 throw OrthancException(ErrorCode_NetworkProtocol,
 "DicomUserConnection - " + command + " to AET \"" +
-GetRemoteApplicationEntityTitle() + "\": " + info);
+parameters.GetRemoteApplicationEntityTitle() +
-}
+"\": " + info);
 }
-};
+}
-static void FillSopSequence(DcmDataset& dataset,
-const DcmTagKey& tag,
-const std::vector<std::string>& sopClassUids,
-const std::vector<std::string>& sopInstanceUids,
-const std::vector<StorageCommitmentFailureReason>& failureReasons,
-bool hasFailureReasons)
-{
-assert(sopClassUids.size() == sopInstanceUids.size() &&
-(hasFailureReasons ?
-failureReasons.size() == sopClassUids.size() :
-failureReasons.empty()));
-if (sopInstanceUids.empty())
-{
-// Add an empty sequence
-if (!dataset.insertEmptyElement(tag).good())
-{
-throw OrthancException(ErrorCode_InternalError);
-}
-}
-else
-{
-for (size_t i = 0; i < sopClassUids.size(); i++)
-{
-std::unique_ptr<DcmItem> item(new DcmItem);
-if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() ||
-!item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() ||
-(hasFailureReasons &&
-!item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) ||
-!dataset.insertSequenceItem(tag, item.release()).good())
-{
-throw OrthancException(ErrorCode_InternalError);
-}
-}
-}
-}
-class DicomAssociation : public boost::noncopyable
-{
-private:
-// This is the maximum number of presentation context IDs (the
-// number of odd integers between 1 and 255)
-// http://dicom.nema.org/medical/dicom/2019e/output/chtml/part08/sect_9.3.2.2.html
-static const size_t MAX_PROPOSED_PRESENTATIONS = 128;
-struct ProposedPresentationContext
-{
-std::string                    abstractSyntax_;
-std::set<DicomTransferSyntax>  transferSyntaxes_;
-};
-typedef std::map<std::string, std::map<DicomTransferSyntax, uint8_t> >  AcceptedPresentationContexts;
-DicomAssociationRole                      role_;
-bool                                      isOpen_;
-std::vector<ProposedPresentationContext>  proposed_;
-AcceptedPresentationContexts              accepted_;
-T_ASC_Network*                            net_;
-T_ASC_Parameters*                         params_;
-T_ASC_Association*                        assoc_;
-void Initialize()
-{
-role_ = DicomAssociationRole_Default;
-isOpen_ = false;
-net_ = NULL;
-params_ = NULL;
-assoc_ = NULL;
-// Must be after "isOpen_ = false"
-ClearPresentationContexts();
-}
-void CheckConnecting(const DicomAssociationParameters& parameters,
-const OFCondition& cond)
-{
-try
-{
-parameters.CheckCondition(cond, "connecting");
-}
-catch (OrthancException&)
-{
-CloseInternal();
-throw;
-}
-}
-void CloseInternal()
-{
-if (assoc_ != NULL)
-{
-ASC_releaseAssociation(assoc_);
-ASC_destroyAssociation(&assoc_);
-assoc_ = NULL;
-params_ = NULL;
-}
-else
-{
-if (params_ != NULL)
-{
-ASC_destroyAssociationParameters(&params_);
-params_ = NULL;
-}
-}
-if (net_ != NULL)
-{
-ASC_dropNetwork(&net_);
-net_ = NULL;
-}
-accepted_.clear();
-isOpen_ = false;
-}
-void AddAccepted(const std::string& abstractSyntax,
-DicomTransferSyntax syntax,
-uint8_t presentationContextId)
-{
-AcceptedPresentationContexts::iterator found = accepted_.find(abstractSyntax);
-if (found == accepted_.end())
-{
-std::map<DicomTransferSyntax, uint8_t> syntaxes;
-syntaxes[syntax] = presentationContextId;
-accepted_[abstractSyntax] = syntaxes;
-}
-else
-{
-if (found->second.find(syntax) != found->second.end())
-{
-LOG(WARNING) << "The same transfer syntax ("
-<< GetTransferSyntaxUid(syntax)
-<< ") was accepted twice for the same abstract syntax UID ("
-<< abstractSyntax << ")";
-}
-else
-{
-found->second[syntax] = presentationContextId;
-}
-}
-}
-public:
-DicomAssociation()
-{
-Initialize();
-}
-~DicomAssociation()
-{
-try
-{
-Close();
-}
-catch (OrthancException&)
-{
-// Don't throw exception in destructors
-}
-}
-bool IsOpen() const
-{
-return isOpen_;
-}
-void SetRole(DicomAssociationRole role)
-{
-if (role_ != role)
-{
-Close();
-role_ = role;
-}
-}
-void ClearPresentationContexts()
-{
-Close();
-proposed_.clear();
-proposed_.reserve(MAX_PROPOSED_PRESENTATIONS);
-}
-void Open(const DicomAssociationParameters& parameters)
-{
-if (isOpen_)
-{
-return;  // Already open
-}
-// Timeout used during association negociation and ASC_releaseAssociation()
-uint32_t acseTimeout = parameters.GetTimeout();
-if (acseTimeout == 0)
-{
-/**
-* Timeout is disabled. Global timeout (seconds) for
-* connecting to remote hosts.  Default value is -1 which
-* selects infinite timeout, i.e. blocking connect().
-**/
-dcmConnectionTimeout.set(-1);
-acseTimeout = 10;
-}
-else
-{
-dcmConnectionTimeout.set(acseTimeout);
-}
-T_ASC_SC_ROLE dcmtkRole;
-switch (role_)
-{
-case DicomAssociationRole_Default:
-dcmtkRole = ASC_SC_ROLE_DEFAULT;
-break;
-case DicomAssociationRole_Scu:
-dcmtkRole = ASC_SC_ROLE_SCU;
-break;
-case DicomAssociationRole_Scp:
-dcmtkRole = ASC_SC_ROLE_SCP;
-break;
-default:
-throw OrthancException(ErrorCode_ParameterOutOfRange);
-}
-assert(net_ == NULL &&
-params_ == NULL &&
-assoc_ == NULL);
-if (proposed_.empty())
-{
-throw OrthancException(ErrorCode_BadSequenceOfCalls,
-"No presentation context was proposed");
-}
-LOG(INFO) << "Opening a DICOM SCU connection from AET \""
-<< parameters.GetLocalApplicationEntityTitle()
-<< "\" to AET \"" << parameters.GetRemoteApplicationEntityTitle()
-<< "\" on host " << parameters.GetRemoteHost()
-<< ":" << parameters.GetRemotePort()
-<< " (manufacturer: " << EnumerationToString(parameters.GetRemoteManufacturer()) << ")";
-CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ acseTimeout, &net_));
-CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU));
-// Set this application's title and the called application's title in the params
-CheckConnecting(parameters, ASC_setAPTitles(
-params_, parameters.GetLocalApplicationEntityTitle().c_str(),
-parameters.GetRemoteApplicationEntityTitle().c_str(), NULL));
-// Set the network addresses of the local and remote entities
-char localHost[HOST_NAME_MAX];
-gethostname(localHost, HOST_NAME_MAX - 1);
-char remoteHostAndPort[HOST_NAME_MAX];
-#ifdef _MSC_VER
-_snprintf
-#else
-snprintf
-#endif
-(remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d",
-parameters.GetRemoteHost().c_str(), parameters.GetRemotePort());
-CheckConnecting(parameters, ASC_setPresentationAddresses(params_, localHost, remoteHostAndPort));
-// Set various options
-CheckConnecting(parameters, ASC_setTransportLayerType(params_, /*opt_secureConnection*/ false));
-// Setup the list of proposed presentation contexts
-unsigned int presentationContextId = 1;
-for (size_t i = 0; i < proposed_.size(); i++)
-{
-assert(presentationContextId <= 255);
-const char* abstractSyntax = proposed_[i].abstractSyntax_.c_str();
-const std::set<DicomTransferSyntax>& source = proposed_[i].transferSyntaxes_;
-std::vector<const char*> transferSyntaxes;
-transferSyntaxes.reserve(source.size());
-for (std::set<DicomTransferSyntax>::const_iterator
-it = source.begin(); it != source.end(); ++it)
-{
-transferSyntaxes.push_back(GetTransferSyntaxUid(*it));
-}
-assert(!transferSyntaxes.empty());
-CheckConnecting(parameters, ASC_addPresentationContext(
-params_, presentationContextId, abstractSyntax,
-&transferSyntaxes[0], transferSyntaxes.size(), dcmtkRole));
-presentationContextId += 2;
-}
-// Do the association
-CheckConnecting(parameters, ASC_requestAssociation(net_, params_, &assoc_));
-isOpen_ = true;
-// Inspect the accepted transfer syntaxes
-LST_HEAD **l = &params_->DULparams.acceptedPresentationContext;
-if (*l != NULL)
-{
-DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
-LST_Position(l, (LST_NODE*)pc);
-while (pc)
-{
-if (pc->result == ASC_P_ACCEPTANCE)
-{
-DicomTransferSyntax transferSyntax;
-if (LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
-{
-AddAccepted(pc->abstractSyntax, transferSyntax, pc->presentationContextID);
-}
-else
-{
-LOG(WARNING) << "Unknown transfer syntax received from AET \""
-<< parameters.GetRemoteApplicationEntityTitle()
-<< "\": " << pc->acceptedTransferSyntax;
-}
-}
-pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
-}
-}
-if (accepted_.empty())
-{
-throw OrthancException(ErrorCode_NoPresentationContext,
-"Unable to negotiate a presentation context with AET \"" +
-parameters.GetRemoteApplicationEntityTitle() + "\"");
-}
-}
-void Close()
-{
-if (isOpen_)
-{
-CloseInternal();
-}
-}
-bool LookupAcceptedPresentationContext(std::map<DicomTransferSyntax, uint8_t>& target,
-const std::string& abstractSyntax) const
-{
-if (!IsOpen())
-{
-throw OrthancException(ErrorCode_BadSequenceOfCalls, "Connection not opened");
-}
-AcceptedPresentationContexts::const_iterator found = accepted_.find(abstractSyntax);
-if (found == accepted_.end())
-{
-return false;
-}
-else
-{
-target = found->second;
-return true;
-}
-}
-void ProposeGenericPresentationContext(const std::string& abstractSyntax)
-{
-std::set<DicomTransferSyntax> ts;
-ts.insert(DicomTransferSyntax_LittleEndianImplicit);
-ts.insert(DicomTransferSyntax_LittleEndianExplicit);
-ts.insert(DicomTransferSyntax_BigEndianExplicit);  // Retired
-ProposePresentationContext(abstractSyntax, ts);
-}
-void ProposePresentationContext(const std::string& abstractSyntax,
-DicomTransferSyntax transferSyntax)
-{
-std::set<DicomTransferSyntax> ts;
-ts.insert(transferSyntax);
-ProposePresentationContext(abstractSyntax, ts);
-}
-size_t GetRemainingPropositions() const
-{
-assert(proposed_.size() <= MAX_PROPOSED_PRESENTATIONS);
-return MAX_PROPOSED_PRESENTATIONS - proposed_.size();
-}
-void ProposePresentationContext(const std::string& abstractSyntax,
-const std::set<DicomTransferSyntax>& transferSyntaxes)
-{
-if (transferSyntaxes.empty())
-{
-throw OrthancException(ErrorCode_ParameterOutOfRange,
-"No transfer syntax provided");
-}
-if (proposed_.size() >= MAX_PROPOSED_PRESENTATIONS)
-{
-throw OrthancException(ErrorCode_ParameterOutOfRange,
-"Too many proposed presentation contexts");
-}
-if (IsOpen())
-{
-Close();
-}
-ProposedPresentationContext context;
-context.abstractSyntax_ = abstractSyntax;
-context.transferSyntaxes_ = transferSyntaxes;
-proposed_.push_back(context);
-}
-T_ASC_Association& GetDcmtkAssociation() const
-{
-if (isOpen_)
-{
-assert(assoc_ != NULL);
-return *assoc_;
-}
-else
-{
-throw OrthancException(ErrorCode_BadSequenceOfCalls,
-"The connection is not open");
-}
-}
-T_ASC_Network& GetDcmtkNetwork() const
-{
-if (isOpen_)
-{
-assert(net_ != NULL);
-return *net_;
-}
-else
-{
-throw OrthancException(ErrorCode_BadSequenceOfCalls,
-"The connection is not open");
-}
-}
 static void ReportStorageCommitment(const DicomAssociationParameters& parameters,
 const std::string& transactionUid,
 const std::vector<std::string>& sopClassUids,
 const std::vector<std::string>& sopInstanceUids,
 if (statusDetail)
 {
 delete statusDetail;
 }
-parameters_.CheckCondition(cond, "C-FIND");
+DicomAssociation::CheckCondition(cond, parameters_, "C-FIND");
 /**
 * New in Orthanc 1.6.0: Deal with failures during C-FIND.
 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_C.4.html#table_C.4-1
 if (responseIdentifiers)
 {
 delete responseIdentifiers;
 }
-parameters_.CheckCondition(cond, "C-MOVE");
+DicomAssociation::CheckCondition(cond, parameters_, "C-MOVE");
 /**
 * New in Orthanc 1.6.0: Deal with failures during C-MOVE.
 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_C.4.2.html#table_C.4-2
 bool Echo()
 {
 association_.Open(parameters_);
 DIC_US status;
-parameters_.CheckCondition(
+DicomAssociation::CheckCondition(
 DIMSE_echoUser(&association_.GetDcmtkAssociation(),
 association_.GetDcmtkAssociation().nextMsgID++,
 /*opt_blockMode*/ (parameters_.HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
 /*opt_dimse_timeout*/ parameters_.GetTimeout(),
 &status, NULL),
-"C-ECHO");
+parameters_, "C-ECHO");
 return status == STATUS_Success;
 }

Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3824:6762506ef4fb transcoding