Mercurial > hg > orthanc

comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 2007:655489d9165d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomMap::ParseDicomMetaInformation()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 09 Jun 2016 15:46:33 +0200
parents 6301bbcbcaed
children fabf7820d1f1
comparison
equal deleted inserted replaced
2006:6301bbcbcaed 2007:655489d9165d
399 ORTHANC_MAXIMUM_TAG_LENGTH, 399 ORTHANC_MAXIMUM_TAG_LENGTH,
400 Configuration::GetDefaultEncoding()); 400 Configuration::GetDefaultEncoding());
401 401
402 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL)) 402 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
403 { 403 {
404 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level); 404 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level, false);
405 } 405 }
406 406
407 payload.answers->Add(m); 407 payload.answers->Add(m);
408 } 408 }
409 } 409 }
505 505
506 if (value != NULL && 506 if (value != NULL &&
507 !value->IsNull() && 507 !value->IsNull() &&
508 value->GetContent() == "*") 508 value->GetContent() == "*")
509 { 509 {
510 fix->SetValue(*it, ""); 510 fix->SetValue(*it, "", false);
511 } 511 }
512 } 512 }
513 } 513 }
514 514
515 return ToDcmtkBridge::Convert(*fix); 515 return ToDcmtkBridge::Convert(*fix);
1063 1063
1064 void DicomUserConnection::MovePatient(const std::string& targetAet, 1064 void DicomUserConnection::MovePatient(const std::string& targetAet,
1065 const std::string& patientId) 1065 const std::string& patientId)
1066 { 1066 {
1067 DicomMap query; 1067 DicomMap query;
1068 query.SetValue(DICOM_TAG_PATIENT_ID, patientId); 1068 query.SetValue(DICOM_TAG_PATIENT_ID, patientId, false);
1069 MoveInternal(targetAet, ResourceType_Patient, query); 1069 MoveInternal(targetAet, ResourceType_Patient, query);
1070 } 1070 }
1071 1071
1072 void DicomUserConnection::MoveStudy(const std::string& targetAet, 1072 void DicomUserConnection::MoveStudy(const std::string& targetAet,
1073 const std::string& studyUid) 1073 const std::string& studyUid)
1074 { 1074 {
1075 DicomMap query; 1075 DicomMap query;
1076 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid); 1076 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
1077 MoveInternal(targetAet, ResourceType_Study, query); 1077 MoveInternal(targetAet, ResourceType_Study, query);
1078 } 1078 }
1079 1079
1080 void DicomUserConnection::MoveSeries(const std::string& targetAet, 1080 void DicomUserConnection::MoveSeries(const std::string& targetAet,
1081 const std::string& studyUid, 1081 const std::string& studyUid,
1082 const std::string& seriesUid) 1082 const std::string& seriesUid)
1083 { 1083 {
1084 DicomMap query; 1084 DicomMap query;
1085 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid); 1085 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
1086 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid); 1086 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid, false);
1087 MoveInternal(targetAet, ResourceType_Series, query); 1087 MoveInternal(targetAet, ResourceType_Series, query);
1088 } 1088 }
1089 1089
1090 void DicomUserConnection::MoveInstance(const std::string& targetAet, 1090 void DicomUserConnection::MoveInstance(const std::string& targetAet,
1091 const std::string& studyUid, 1091 const std::string& studyUid,
1092 const std::string& seriesUid, 1092 const std::string& seriesUid,
1093 const std::string& instanceUid) 1093 const std::string& instanceUid)
1094 { 1094 {
1095 DicomMap query; 1095 DicomMap query;
1096 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid); 1096 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
1097 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid); 1097 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid, false);
1098 query.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid); 1098 query.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid, false);
1099 MoveInternal(targetAet, ResourceType_Instance, query); 1099 MoveInternal(targetAet, ResourceType_Instance, query);
1100 } 1100 }
1101 1101
1102 1102
1103 void DicomUserConnection::SetTimeout(uint32_t seconds) 1103 void DicomUserConnection::SetTimeout(uint32_t seconds)