Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 80:6212bf978584
status of series
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 Sep 2012 15:18:12 +0200 |
parents | b8dfde8d64e8 |
children | e759f777cb72 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomUserConnection.cpp Thu Sep 20 13:47:54 2012 +0200 +++ b/OrthancServer/DicomProtocol/DicomUserConnection.cpp Thu Sep 20 15:18:12 2012 +0200 @@ -355,8 +355,8 @@ DicomMap s; fields.ExtractStudyInformation(s); - s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); - s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); + s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID); + s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER); Find(result, FindRootModel_Study, s); } @@ -368,9 +368,9 @@ DicomMap s; fields.ExtractSeriesInformation(s); - s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); - s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); - s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); + s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID); + s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER); + s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID); Find(result, FindRootModel_Series, s); } @@ -382,10 +382,10 @@ DicomMap s; fields.ExtractInstanceInformation(s); - s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); - s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); - s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); - s.CopyTagIfExists(fields, DicomTag::SERIES_INSTANCE_UID); + s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID); + s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER); + s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID); + s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID); Find(result, FindRootModel_Instance, s); } @@ -594,8 +594,8 @@ const DicomMap& findResult) { DicomMap simplified; - simplified.SetValue(DicomTag::STUDY_INSTANCE_UID, findResult.GetValue(DicomTag::STUDY_INSTANCE_UID)); - simplified.SetValue(DicomTag::SERIES_INSTANCE_UID, findResult.GetValue(DicomTag::SERIES_INSTANCE_UID)); + simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID)); + simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID)); Move(targetAet, simplified); } @@ -604,8 +604,8 @@ const std::string& seriesUid) { DicomMap map; - map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); - map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); + map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid); + map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid); Move(targetAet, map); } @@ -613,9 +613,9 @@ const DicomMap& findResult) { DicomMap simplified; - simplified.SetValue(DicomTag::STUDY_INSTANCE_UID, findResult.GetValue(DicomTag::STUDY_INSTANCE_UID)); - simplified.SetValue(DicomTag::SERIES_INSTANCE_UID, findResult.GetValue(DicomTag::SERIES_INSTANCE_UID)); - simplified.SetValue(DicomTag::SOP_INSTANCE_UID, findResult.GetValue(DicomTag::SOP_INSTANCE_UID)); + simplified.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, findResult.GetValue(DICOM_TAG_STUDY_INSTANCE_UID)); + simplified.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SERIES_INSTANCE_UID)); + simplified.SetValue(DICOM_TAG_SOP_INSTANCE_UID, findResult.GetValue(DICOM_TAG_SOP_INSTANCE_UID)); Move(targetAet, simplified); } @@ -625,9 +625,9 @@ const std::string& instanceUid) { DicomMap map; - map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); - map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); - map.SetValue(DicomTag::SOP_INSTANCE_UID, instanceUid); + map.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid); + map.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid); + map.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid); Move(targetAet, map); }