comparison UnitTestsSources/DicomMapTests.cpp @ 1849:6394a2f8f1e1

test main dicom tags at series level
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 01 Dec 2015 13:41:48 +0100
parents e39716f71d67
children 68854412c7bc
comparison
equal deleted inserted replaced
1848:e39716f71d67 1849:6394a2f8f1e1
170 *it == DicomTag(0x0032, 0x1060))) /* RequestedProcedureDescription, from Requested Procedure module, related to Study */ 170 *it == DicomTag(0x0032, 0x1060))) /* RequestedProcedureDescription, from Requested Procedure module, related to Study */
171 { 171 {
172 ok = true; 172 ok = true;
173 } 173 }
174 174
175 // Exceptions for the Series level
176 if (level == ResourceType_Series &&
177 (*it == DicomTag(0x0008, 0x0070) || /* Manufacturer, from General Equipment Module */
178 *it == DicomTag(0x0008, 0x1010) || /* StationName, from General Equipment Module */
179 *it == DicomTag(0x0018, 0x0024) || /* SequenceName, from MR Image Module (SIMPLIFICATION => Series) */
180 *it == DicomTag(0x0018, 0x1090) || /* CardiacNumberOfImages, from MR Image Module (SIMPLIFICATION => Series) */
181 *it == DicomTag(0x0020, 0x0037) || /* ImageOrientationPatient, from Image Plane Module (SIMPLIFICATION => Series) */
182 *it == DicomTag(0x0020, 0x0105) || /* NumberOfTemporalPositions, from MR Image Module (SIMPLIFICATION => Series) */
183 *it == DicomTag(0x0020, 0x1002) || /* ImagesInAcquisition, from General Image Module (SIMPLIFICATION => Series) */
184 *it == DicomTag(0x0054, 0x0081) || /* NumberOfSlices, from PET Series module */
185 *it == DicomTag(0x0054, 0x0101) || /* NumberOfTimeSlices, from PET Series module */
186 *it == DicomTag(0x0054, 0x1000))) /* SeriesType, from PET Series module */
187 {
188 ok = true;
189 }
190
175 // Exceptions for the Instance level 191 // Exceptions for the Instance level
176 if (level == ResourceType_Instance && 192 if (level == ResourceType_Instance &&
177 (*it == DicomTag(0x0020, 0x0012) || /* AccessionNumber, from General Image module */ 193 (*it == DicomTag(0x0020, 0x0012) || /* AccessionNumber, from General Image module */
178 *it == DicomTag(0x0054, 0x1330) || /* ImageIndex, from PET Image module */ 194 *it == DicomTag(0x0054, 0x1330) || /* ImageIndex, from PET Image module */
179 *it == DicomTag(0x0020, 0x0100) || /* TemporalPositionIdentifier, from MR Image module */ 195 *it == DicomTag(0x0020, 0x0100) || /* TemporalPositionIdentifier, from MR Image module */
197 213
198 TEST(DicomMap, Modules) 214 TEST(DicomMap, Modules)
199 { 215 {
200 TestModule(ResourceType_Patient, DicomModule_Patient); 216 TestModule(ResourceType_Patient, DicomModule_Patient);
201 TestModule(ResourceType_Study, DicomModule_Study); 217 TestModule(ResourceType_Study, DicomModule_Study);
202 //TestModule(ResourceType_Series, DicomModule_Series); // TODO 218 TestModule(ResourceType_Series, DicomModule_Series); // TODO
203 TestModule(ResourceType_Instance, DicomModule_Instance); 219 TestModule(ResourceType_Instance, DicomModule_Instance);
204 } 220 }