Mercurial > hg > orthanc

comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 80:6212bf978584

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status of series
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Sep 2012 15:18:12 +0200
parents b8dfde8d64e8
children e759f777cb72
comparison
equal deleted inserted replaced
79:297bad4e1019 80:6212bf978584
353 { 353 {
354 // Only keep the filters from "fields" that are related to the study 354 // Only keep the filters from "fields" that are related to the study
355 DicomMap s; 355 DicomMap s;
356 fields.ExtractStudyInformation(s); 356 fields.ExtractStudyInformation(s);
357 357
358 s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); 358 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
359 s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); 359 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
360 360
361 Find(result, FindRootModel_Study, s); 361 Find(result, FindRootModel_Study, s);
362 } 362 }
363 363
364 void DicomUserConnection::FindSeries(DicomFindAnswers& result, 364 void DicomUserConnection::FindSeries(DicomFindAnswers& result,
366 { 366 {
367 // Only keep the filters from "fields" that are related to the series 367 // Only keep the filters from "fields" that are related to the series
368 DicomMap s; 368 DicomMap s;
369 fields.ExtractSeriesInformation(s); 369 fields.ExtractSeriesInformation(s);
370 370
371 s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); 371 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
372 s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); 372 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
373 s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); 373 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
374 374
375 Find(result, FindRootModel_Series, s); 375 Find(result, FindRootModel_Series, s);
376 } 376 }
377 377
378 void DicomUserConnection::FindInstance(DicomFindAnswers& result, 378 void DicomUserConnection::FindInstance(DicomFindAnswers& result,
380 { 380 {
381 // Only keep the filters from "fields" that are related to the instance 381 // Only keep the filters from "fields" that are related to the instance
382 DicomMap s; 382 DicomMap s;
383 fields.ExtractInstanceInformation(s); 383 fields.ExtractInstanceInformation(s);
384 384
385 s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); 385 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
386 s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); 386 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
387 s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); 387 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
388 s.CopyTagIfExists(fields, DicomTag::SERIES_INSTANCE_UID); 388 s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID);
389 389
390 Find(result, FindRootModel_Instance, s); 390 Find(result, FindRootModel_Instance, s);
391 } 391 }
392 392
393 393
592 592
593 void DicomUserConnection::MoveSeries(const std::string& targetAet, 593 void DicomUserConnection::MoveSeries(const std::string& targetAet,
594 const DicomMap& findResult) 594 const DicomMap& findResult)
595 { 595 {
596 DicomMap simplified; 596 DicomMap simplified;
597 simplified.SetValue(DicomTag::STUDY_INSTANCE_UID, findResult.GetValue(DicomTag::STUDY_INSTANCE_UID)); 597 simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID));
598 simplified.SetValue(DicomTag::SERIES_INSTANCE_UID, findResult.GetValue(DicomTag::SERIES_INSTANCE_UID)); 598 simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID));
599 Move(targetAet, simplified); 599 Move(targetAet, simplified);
600 } 600 }
601 601
602 void DicomUserConnection::MoveSeries(const std::string& targetAet, 602 void DicomUserConnection::MoveSeries(const std::string& targetAet,
603 const std::string& studyUid, 603 const std::string& studyUid,
604 const std::string& seriesUid) 604 const std::string& seriesUid)
605 { 605 {
606 DicomMap map; 606 DicomMap map;
607 map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); 607 map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
608 map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); 608 map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
609 Move(targetAet, map); 609 Move(targetAet, map);
610 } 610 }
611 611
612 void DicomUserConnection::MoveInstance(const std::string& targetAet, 612 void DicomUserConnection::MoveInstance(const std::string& targetAet,
613 const DicomMap& findResult) 613 const DicomMap& findResult)
614 { 614 {
615 DicomMap simplified; 615 DicomMap simplified;
616 simplified.SetValue(DicomTag::STUDY_INSTANCE_UID, findResult.GetValue(DicomTag::STUDY_INSTANCE_UID)); 616 simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID));
617 simplified.SetValue(DicomTag::SERIES_INSTANCE_UID, findResult.GetValue(DicomTag::SERIES_INSTANCE_UID)); 617 simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID));
618 simplified.SetValue(DicomTag::SOP_INSTANCE_UID, findResult.GetValue(DicomTag::SOP_INSTANCE_UID)); 618 simplified.SetValue(DICOM_TAG_SOP_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SOP_INSTANCE_UID));
619 Move(targetAet, simplified); 619 Move(targetAet, simplified);
620 } 620 }
621 621
622 void DicomUserConnection::MoveInstance(const std::string& targetAet, 622 void DicomUserConnection::MoveInstance(const std::string& targetAet,
623 const std::string& studyUid, 623 const std::string& studyUid,
624 const std::string& seriesUid, 624 const std::string& seriesUid,
625 const std::string& instanceUid) 625 const std::string& instanceUid)
626 { 626 {
627 DicomMap map; 627 DicomMap map;
628 map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); 628 map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
629 map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); 629 map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
630 map.SetValue(DicomTag::SOP_INSTANCE_UID, instanceUid); 630 map.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid);
631 Move(targetAet, map); 631 Move(targetAet, map);
632 } 632 }
633 633
634 void DicomUserConnection::SetConnectionTimeout(uint32_t seconds) 634 void DicomUserConnection::SetConnectionTimeout(uint32_t seconds)
635 { 635 {