Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 77:b8dfde8d64e8
new dicom tags
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 Sep 2012 13:41:18 +0200 |
parents | a70bb32802ae |
children | 6212bf978584 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomUserConnection.cpp Mon Sep 17 17:32:33 2012 +0200 +++ b/OrthancServer/DicomProtocol/DicomUserConnection.cpp Thu Sep 20 13:41:18 2012 +0200 @@ -370,7 +370,7 @@ s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); - s.CopyTagIfExists(fields, DicomTag::STUDY_UID); + s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); Find(result, FindRootModel_Series, s); } @@ -384,8 +384,8 @@ s.CopyTagIfExists(fields, DicomTag::PATIENT_ID); s.CopyTagIfExists(fields, DicomTag::ACCESSION_NUMBER); - s.CopyTagIfExists(fields, DicomTag::STUDY_UID); - s.CopyTagIfExists(fields, DicomTag::SERIES_UID); + s.CopyTagIfExists(fields, DicomTag::STUDY_INSTANCE_UID); + s.CopyTagIfExists(fields, DicomTag::SERIES_INSTANCE_UID); Find(result, FindRootModel_Instance, s); } @@ -594,8 +594,8 @@ const DicomMap& findResult) { DicomMap simplified; - simplified.SetValue(DicomTag::STUDY_UID, findResult.GetValue(DicomTag::STUDY_UID)); - simplified.SetValue(DicomTag::SERIES_UID, findResult.GetValue(DicomTag::SERIES_UID)); + simplified.SetValue(DicomTag::STUDY_INSTANCE_UID, findResult.GetValue(DicomTag::STUDY_INSTANCE_UID)); + simplified.SetValue(DicomTag::SERIES_INSTANCE_UID, findResult.GetValue(DicomTag::SERIES_INSTANCE_UID)); Move(targetAet, simplified); } @@ -604,8 +604,8 @@ const std::string& seriesUid) { DicomMap map; - map.SetValue(DicomTag::STUDY_UID, studyUid); - map.SetValue(DicomTag::SERIES_UID, seriesUid); + map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); + map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); Move(targetAet, map); } @@ -613,9 +613,9 @@ const DicomMap& findResult) { DicomMap simplified; - simplified.SetValue(DicomTag::STUDY_UID, findResult.GetValue(DicomTag::STUDY_UID)); - simplified.SetValue(DicomTag::SERIES_UID, findResult.GetValue(DicomTag::SERIES_UID)); - simplified.SetValue(DicomTag::INSTANCE_UID, findResult.GetValue(DicomTag::INSTANCE_UID)); + 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)); Move(targetAet, simplified); } @@ -625,9 +625,9 @@ const std::string& instanceUid) { DicomMap map; - map.SetValue(DicomTag::STUDY_UID, studyUid); - map.SetValue(DicomTag::SERIES_UID, seriesUid); - map.SetValue(DicomTag::INSTANCE_UID, instanceUid); + map.SetValue(DicomTag::STUDY_INSTANCE_UID, studyUid); + map.SetValue(DicomTag::SERIES_INSTANCE_UID, seriesUid); + map.SetValue(DicomTag::SOP_INSTANCE_UID, instanceUid); Move(targetAet, map); }