Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancFindRequestHandler.cpp @ 4204:318c16cfccab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Sep 2020 16:18:01 +0200
parents 1ec3e1e18f50
children 5a3374b6e707
comparison
equal deleted inserted replaced
4203:4d42408da117 4204:318c16cfccab
536 defaultPrivateCreator_ = lock.GetConfiguration().GetDefaultPrivateCreator(); 536 defaultPrivateCreator_ = lock.GetConfiguration().GetDefaultPrivateCreator();
537 retrieveAet_ = lock.GetConfiguration().GetOrthancAET(); 537 retrieveAet_ = lock.GetConfiguration().GetOrthancAET();
538 } 538 }
539 } 539 }
540 540
541 virtual bool IsDicomAsJsonNeeded() const 541 virtual bool IsDicomAsJsonNeeded() const ORTHANC_OVERRIDE
542 { 542 {
543 // Ask the "DICOM-as-JSON" attachment only if sequences are to 543 // Ask the "DICOM-as-JSON" attachment only if sequences are to
544 // be returned OR if "query_" contains non-main DICOM tags! 544 // be returned OR if "query_" contains non-main DICOM tags!
545 545
546 DicomMap withoutSpecialTags; 546 DicomMap withoutSpecialTags;
562 562
563 return (!sequencesToReturn_.empty() || 563 return (!sequencesToReturn_.empty() ||
564 !withoutSpecialTags.HasOnlyMainDicomTags()); 564 !withoutSpecialTags.HasOnlyMainDicomTags());
565 } 565 }
566 566
567 virtual void MarkAsComplete() 567 virtual void MarkAsComplete() ORTHANC_OVERRIDE
568 { 568 {
569 answers_.SetComplete(true); 569 answers_.SetComplete(true);
570 } 570 }
571 571
572 virtual void Visit(const std::string& publicId, 572 virtual void Visit(const std::string& publicId,
573 const std::string& instanceId, 573 const std::string& instanceId,
574 const DicomMap& mainDicomTags, 574 const DicomMap& mainDicomTags,
575 const Json::Value* dicomAsJson) 575 const Json::Value* dicomAsJson) ORTHANC_OVERRIDE
576 { 576 {
577 std::unique_ptr<DicomMap> counters(ComputeCounters(context_, instanceId, level_, query_)); 577 std::unique_ptr<DicomMap> counters(ComputeCounters(context_, instanceId, level_, query_));
578 578
579 AddAnswer(answers_, mainDicomTags, dicomAsJson, queryAsArray_, sequencesToReturn_, 579 AddAnswer(answers_, mainDicomTags, dicomAsJson, queryAsArray_, sequencesToReturn_,
580 counters.get(), defaultPrivateCreator_, privateCreators_, retrieveAet_); 580 counters.get(), defaultPrivateCreator_, privateCreators_, retrieveAet_);