comparison OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 5180:d2626a062809

fix DicomMap::SetupFindXXXTemplate() methods
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 25 Mar 2023 11:21:09 +0100
parents 1e406c23b352
children 0ea402b4d901
comparison
equal deleted inserted replaced
5179:1e406c23b352 5180:d2626a062809
1074 * configuration option that was introduced in Orthanc 1.11.0. 1074 * configuration option that was introduced in Orthanc 1.11.0.
1075 **/ 1075 **/
1076 1076
1077 { 1077 {
1078 DicomMap m; 1078 DicomMap m;
1079 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
1080 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
1081
1079 DicomMap::SetupFindPatientTemplate(m); 1082 DicomMap::SetupFindPatientTemplate(m);
1080 std::set<DicomTag> tags; 1083 std::set<DicomTag> tags;
1081 m.GetTags(tags); 1084 m.GetTags(tags);
1082 1085
1083 // This corresponds to the values of DEFAULT_PATIENT_MAIN_DICOM_TAGS 1086 // This corresponds to the values of DEFAULT_PATIENT_MAIN_DICOM_TAGS
1090 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_SEX, "nope", false)); 1093 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_SEX, "nope", false));
1091 } 1094 }
1092 1095
1093 { 1096 {
1094 DicomMap m; 1097 DicomMap m;
1098 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
1099 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
1100
1095 DicomMap::SetupFindStudyTemplate(m); 1101 DicomMap::SetupFindStudyTemplate(m);
1096 std::set<DicomTag> tags; 1102 std::set<DicomTag> tags;
1097 m.GetTags(tags); 1103 m.GetTags(tags);
1098 1104
1099 // This corresponds to the values of DEFAULT_STUDY_MAIN_DICOM_TAGS 1105 // This corresponds to the values of DEFAULT_STUDY_MAIN_DICOM_TAGS
1109 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_TIME, "nope", false)); 1115 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_TIME, "nope", false));
1110 } 1116 }
1111 1117
1112 { 1118 {
1113 DicomMap m; 1119 DicomMap m;
1120 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
1121 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
1122
1114 DicomMap::SetupFindSeriesTemplate(m); 1123 DicomMap::SetupFindSeriesTemplate(m);
1115 std::set<DicomTag> tags; 1124 std::set<DicomTag> tags;
1116 m.GetTags(tags); 1125 m.GetTags(tags);
1117 1126
1118 // This corresponds to the values of DEFAULT_SERIES_MAIN_DICOM_TAGS 1127 // This corresponds to the values of DEFAULT_SERIES_MAIN_DICOM_TAGS
1133 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_TIME, "nope", false)); 1142 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_TIME, "nope", false));
1134 } 1143 }
1135 1144
1136 { 1145 {
1137 DicomMap m; 1146 DicomMap m;
1147 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
1148 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
1149
1138 DicomMap::SetupFindInstanceTemplate(m); 1150 DicomMap::SetupFindInstanceTemplate(m);
1139 std::set<DicomTag> tags; 1151 std::set<DicomTag> tags;
1140 m.GetTags(tags); 1152 m.GetTags(tags);
1141 1153
1142 // This corresponds to the values of DEFAULT_INSTANCE_MAIN_DICOM_TAGS 1154 // This corresponds to the values of DEFAULT_INSTANCE_MAIN_DICOM_TAGS