diff Core/DicomNetworking/DicomControlUserConnection.cpp @ 3843:138d0dde41b5

end of replacements of DicomUserConnection by DicomControlUserConnection
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 Apr 2020 17:24:24 +0200
parents 447880856ce8
children 09798f2b985f
line wrap: on
line diff
--- a/Core/DicomNetworking/DicomControlUserConnection.cpp	Thu Apr 16 17:03:34 2020 +0200
+++ b/Core/DicomNetworking/DicomControlUserConnection.cpp	Thu Apr 16 17:24:24 2020 +0200
@@ -226,6 +226,7 @@
 
   void DicomControlUserConnection::SetupPresentationContexts()
   {
+    assert(association_.get() != NULL);
     association_->ProposeGenericPresentationContext(UID_VerificationSOPClass);
     association_->ProposeGenericPresentationContext(UID_FINDPatientRootQueryRetrieveInformationModel);
     association_->ProposeGenericPresentationContext(UID_FINDStudyRootQueryRetrieveInformationModel);
@@ -241,6 +242,7 @@
                                                 const char* level)
   {
     assert(isWorklist ^ (level != NULL));
+    assert(association_.get() != NULL);
 
     association_->Open(parameters_);
 
@@ -325,6 +327,7 @@
                                                 ResourceType level,
                                                 const DicomMap& fields)
   {
+    assert(association_.get() != NULL);
     association_->Open(parameters_);
 
     std::unique_ptr<ParsedDicomFile> query(
@@ -440,8 +443,16 @@
   }
     
 
+  void DicomControlUserConnection::Close()
+  {
+    assert(association_.get() != NULL);
+    association_->Close();
+  }
+
+
   bool DicomControlUserConnection::Echo()
   {
+    assert(association_.get() != NULL);
     association_->Open(parameters_);
 
     DIC_US status;