Mercurial > hg > orthanc

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3842:bdbe12aba99f 3843:138d0dde41b5
224 224
225 225
226 226
227 void DicomControlUserConnection::SetupPresentationContexts() 227 void DicomControlUserConnection::SetupPresentationContexts()
228 { 228 {
229 assert(association_.get() != NULL);
229 association_->ProposeGenericPresentationContext(UID_VerificationSOPClass); 230 association_->ProposeGenericPresentationContext(UID_VerificationSOPClass);
230 association_->ProposeGenericPresentationContext(UID_FINDPatientRootQueryRetrieveInformationModel); 231 association_->ProposeGenericPresentationContext(UID_FINDPatientRootQueryRetrieveInformationModel);
231 association_->ProposeGenericPresentationContext(UID_FINDStudyRootQueryRetrieveInformationModel); 232 association_->ProposeGenericPresentationContext(UID_FINDStudyRootQueryRetrieveInformationModel);
232 association_->ProposeGenericPresentationContext(UID_MOVEStudyRootQueryRetrieveInformationModel); 233 association_->ProposeGenericPresentationContext(UID_MOVEStudyRootQueryRetrieveInformationModel);
233 association_->ProposeGenericPresentationContext(UID_FINDModalityWorklistInformationModel); 234 association_->ProposeGenericPresentationContext(UID_FINDModalityWorklistInformationModel);
239 const char* sopClass, 240 const char* sopClass,
240 bool isWorklist, 241 bool isWorklist,
241 const char* level) 242 const char* level)
242 { 243 {
243 assert(isWorklist ^ (level != NULL)); 244 assert(isWorklist ^ (level != NULL));
245 assert(association_.get() != NULL);
244 246
245 association_->Open(parameters_); 247 association_->Open(parameters_);
246 248
247 FindPayload payload; 249 FindPayload payload;
248 payload.answers = &answers; 250 payload.answers = &answers;
323 325
324 void DicomControlUserConnection::MoveInternal(const std::string& targetAet, 326 void DicomControlUserConnection::MoveInternal(const std::string& targetAet,
325 ResourceType level, 327 ResourceType level,
326 const DicomMap& fields) 328 const DicomMap& fields)
327 { 329 {
330 assert(association_.get() != NULL);
328 association_->Open(parameters_); 331 association_->Open(parameters_);
329 332
330 std::unique_ptr<ParsedDicomFile> query( 333 std::unique_ptr<ParsedDicomFile> query(
331 ConvertQueryFields(fields, parameters_.GetRemoteManufacturer())); 334 ConvertQueryFields(fields, parameters_.GetRemoteManufacturer()));
332 DcmDataset* dataset = query->GetDcmtkObject().getDataset(); 335 DcmDataset* dataset = query->GetDcmtkObject().getDataset();
438 { 441 {
439 SetupPresentationContexts(); 442 SetupPresentationContexts();
440 } 443 }
441 444
442 445
446 void DicomControlUserConnection::Close()
447 {
448 assert(association_.get() != NULL);
449 association_->Close();
450 }
451
452
443 bool DicomControlUserConnection::Echo() 453 bool DicomControlUserConnection::Echo()
444 { 454 {
455 assert(association_.get() != NULL);
445 association_->Open(parameters_); 456 association_->Open(parameters_);
446 457
447 DIC_US status; 458 DIC_US status;
448 DicomAssociation::CheckCondition( 459 DicomAssociation::CheckCondition(
449 DIMSE_echoUser(&association_->GetDcmtkAssociation(), 460 DIMSE_echoUser(&association_->GetDcmtkAssociation(),