comparison UnitTestsSources/DicomMapTests.cpp @ 1704:d2268c7a7ede db-changes

fix unit tests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Oct 2015 16:30:48 +0200
parents 9f66a12eb8fc
children ec66a16aa398
comparison
equal deleted inserted replaced
1703:b80e76dd1d56 1704:d2268c7a7ede
168 { 168 {
169 ok = true; 169 ok = true;
170 }*/ 170 }*/
171 171
172 // Exceptions for the Instance level 172 // Exceptions for the Instance level
173 if ((/* Accession number, from Image module */ 173 if (level == ResourceType_Instance &&
174 *it == DicomTag(0x0020, 0x0012) && 174 (*it == DicomTag(0x0020, 0x0012) || /* Accession number, from Image module */
175 level == ResourceType_Instance) || 175 *it == DicomTag(0x0054, 0x1330) || /* Image Index, from PET Image module */
176 (/* Image Index, from PET Image module */ 176 *it == DicomTag(0x0020, 0x0100) || /* Temporal Position Identifier, from MR Image module */
177 *it == DicomTag(0x0054, 0x1330) && 177 *it == DicomTag(0x0028, 0x0008) || /* Number of Frames, from Multi-frame module attributes, related to Image IOD */
178 level == ResourceType_Instance) || 178 *it == DICOM_TAG_IMAGE_POSITION_PATIENT))
179 (/* Temporal Position Identifier, from MR Image module */
180 *it == DicomTag(0x0020, 0x0100) &&
181 level == ResourceType_Instance) ||
182 (/* Number of Frames, from Multi-frame module attributes, related to Image IOD */
183 *it == DicomTag(0x0028, 0x0008) &&
184 level == ResourceType_Instance ))
185 { 179 {
186 ok = true; 180 ok = true;
187 } 181 }
188 182
189 if (!ok) 183 if (!ok)