Mercurial > hg > orthanc

changeset 1704:d2268c7a7ede db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix unit tests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Oct 2015 16:30:48 +0200
parents b80e76dd1d56
children 77d3e3a13c10 275780da54ae
files UnitTestsSources/DicomMapTests.cpp
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/UnitTestsSources/DicomMapTests.cpp	Tue Oct 13 16:10:35 2015 +0200
+++ b/UnitTestsSources/DicomMapTests.cpp	Tue Oct 13 16:30:48 2015 +0200
@@ -170,18 +170,12 @@
       }*/
 
     // Exceptions for the Instance level
-    if ((/* Accession number, from Image module */
-          *it == DicomTag(0x0020, 0x0012) && 
-          level == ResourceType_Instance) ||
-        (/* Image Index, from PET Image module */
-          *it == DicomTag(0x0054, 0x1330) && 
-          level == ResourceType_Instance) ||
-        (/* Temporal Position Identifier, from MR Image module */
-          *it == DicomTag(0x0020, 0x0100) && 
-          level == ResourceType_Instance) ||
-        (/* Number of Frames, from Multi-frame module attributes, related to Image IOD */
-          *it == DicomTag(0x0028, 0x0008) && 
-          level == ResourceType_Instance ))
+    if (level == ResourceType_Instance &&
+        (*it == DicomTag(0x0020, 0x0012) ||  /* Accession number, from Image module */
+         *it == DicomTag(0x0054, 0x1330) ||  /* Image Index, from PET Image module */
+         *it == DicomTag(0x0020, 0x0100) ||  /* Temporal Position Identifier, from MR Image module */
+         *it == DicomTag(0x0028, 0x0008) ||  /* Number of Frames, from Multi-frame module attributes, related to Image IOD */
+         *it == DICOM_TAG_IMAGE_POSITION_PATIENT))
     {
       ok = true;
     }